diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html
index aee96bc10341..7971fec92d3b 100644
--- a/ADnD_2E_Revised/2ESheet.html
+++ b/ADnD_2E_Revised/2ESheet.html
@@ -9,34 +9,24 @@
         <h2 style="color: black;">Changes in <span name="attr_version"></span></h2>
         <div class="sheet-announce-items">
             <ul style="font-style:italic">
-                <li>Psionic Power - Telekinesis no longer adds a modifier for lifting an item weighing exactly 3 pounds</li>
-                <li>Psionic Power - Telekinesis now shows the attack modifier based on the items weight</li>
-                <li>Psionic Power - Life Draining refers to itself as a Power instead of a Devotion. Sage Advice #186</li>
-                <li>Endurance NWP for Dwarves is now free (cost 0 slots) instead of 1 as described in Complete Dwarves Handbook.</li>
-                <li>Added V, S components to all Quest spells from Tome of Magic p. 12</li>
-                <li>Updated casting spells from scroll notes clarifying that scrolls can be cast without restrictions</li>
-                <li>Updated spell learning notes to make it clear that <strong>read magic</strong> is not need to read spell books</li>
-                <li>Added new Tome of Magic sphere suggestion to Paladins, Rangers, and Druids sphere of influence</li>
-                <li>Added Priest casting level scaling for Paladins ensuring they cast as first level priest at level 9, their max casting level is 9</li>
-                <li>Added Priest casting level scaling for Rangers ensuring they cast as first level priest at level 8, their max casting level is 9</li>
-                <li>Added correction to Turn Undead notes that all creatures dwelling on the Outer Planes, not only undead, can be turned as Special creatures</li>
-                <li>Fixed Follower->Rogue Detect Magic roll button attribute name. It now correctly matches the title of shown in the mouse over text</li>
-                <li>Redesigned the rogue/thieving skills tab
-                    <ul>
-                        <li>All skills now have a single button for rolling them instead of 3</li>
-                        <li>All base skills now have descriptive text for success and failure</li>
-                        <li>Added %-sign to the roll template for Thieving skills</li>
-                        <li>All skills have gotten their calculations changed so that the misc modifier is included in the max 95% chance</li>
-                        <li>Find/Remove Traps, when rolled, ask for how it is used: Find, remove normal, remove invisible/magical trap</li>
-                        <li>Toggle to tell if you are a Ranger, allowing Move Silently and Hide in Shadows to max out at 99% instead of 95%</li>
-                        <li>If you are a Ranger, Move Silently and Hide in Shadows ask if you are in a non-natural surrounding and half your chance of success</li>
-                        <li>Added Dexterity, Aim, Balance skills armor adjustments notes</li>
-                        <li>Added Ranger skills armor adjustments notes</li>
-                        <li>Added ranger to the allowed armors for the rogue armor autofill</li>
-                        <li>All skills from PO: Skills & Powers, Dark Sun, and Sages & Specialists now use Roll templates when rolled</li>
-                        <li>Visibility setting have been added allowing for hidden rolls, so only the DM knows if the rogue made the check or not</li>
-                    </ul>
-                </li>
+                <li>Psionic Powers: Reordered to appear in the same order as presented in the books</li>
+                <li>Psionic Powers: Changed headings to match the books, i.e. Psychokinesis Sciences -> Psychokinetic Sciences</li>
+                <li>Psionic Powers: Fixed a lot of incorrect mouse over texts</li>
+                <li>Psionic Powers Core: Removed Roll modifier as the roll should never be modified. Update macros for this to take effect</li>
+                <li>Psionic Powers Core: Added Misc. modifier to power checks. Update macros for this to take effect</li>
+                <li>Character Revised Psionic Psychokinesis Devotion: Fixed first static row PSP cost field no longer share values with Telepathy Science, first static row PSP cost field</li>
+                <li>Static Follower Core Psionic Clairsentient Sciences: Fixed first macro not printing to the chat</li>
+                <li>Repeating Follower Core Psionic Psychoportive Sciences: Fixed third macro throwing error to the chat</li>
+                <li>Follower Core Psionic: Changed check roll to crit on the Power Score value instead of 1</li>
+                <li>Follower Psionic: Psionic Nonweapon proficiencies now outputs with a roll template</li>
+                <li>Follower Rogue: Changed the layout to be similar to the character sheet with all skills being visible at the same time</li>
+                <li>Follower Rogue: Added armor type selection and armor bonus/penalties modifiers autofill</li>
+                <li>Follower Rogue: Adding %-sign for roll template</li>
+                <li>Characters: Added missing %-sign for Find/Remove Traps, Move Silently, and Hide in Shadows</li>
+                <li>Saving throws now always fail on a natural one, no matter the modifiers. Sage Advice #216 p. 103</li>
+                <li>Nonweapon proficiencies now always fail on a natural 20. PHB p. 75</li>
+                <li>Nonweapon proficiencies now show how well you made your check</li>
+                <li>Nonweapon proficiencies now highlight a critical success</li>
             </ul>
             <hr>
             <p>
@@ -759,7 +749,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_partar" title="@{partar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_parmod" title="@{parmod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_parnotes" title="@{parnotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_parsave" title="%{parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{parmod})+(@{misc-mod})]] - [[@{partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_parsave" title="%{parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{parmod})+(@{misc-mod})]])-([[@{partar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -767,7 +757,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_poitar" title="@{poitar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_poimod" title="@{poimod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_poinotes" title="@{poinotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_poisave" title="%{poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{poimod})+(@{misc-mod})]] - [[@{poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_poisave" title="%{poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{poimod})+(@{misc-mod})]])-([[@{poitar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -775,7 +765,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_deatar" title="@{deatar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_deamod" title="@{deamod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_deanotes" title="@{deanotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_deasave" title="%{deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{deamod})+(@{misc-mod})]] - [[@{deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_deasave" title="%{deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{deamod})+(@{misc-mod})]])-([[@{deatar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -783,7 +773,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_rodtar" title="@{rodtar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_rodmod" title="@{rodmod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_rodnotes" title="@{rodnotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_rodsave" title="%{rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{rodmod})+(@{misc-mod})]] - [[@{rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_rodsave" title="%{rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{rodmod})+(@{misc-mod})]])-([[@{rodtar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -791,7 +781,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_statar" title="@{statar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_stamod" title="@{stamod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_stanotes" title="@{stanotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_stasave" title="%{stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{stamod})+(@{misc-mod})]] - [[@{statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_stasave" title="%{stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{stamod})+(@{misc-mod})]])-([[@{statar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -799,7 +789,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_wantar" title="@{wantar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_wanmod" title="@{wanmod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_wannotes" title="@{wannotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_wansave" title="%{wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{wanmod})+(@{misc-mod})]] - [[@{wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_wansave" title="%{wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{wanmod})+(@{misc-mod})]])-([[@{wantar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -807,7 +797,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_pettar" title="@{pettar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_petmod" title="@{petmod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_petnotes" title="@{petnotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_petsave" title="%{petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{petmod})+(@{misc-mod})]] - [[@{pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_petsave" title="%{petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{petmod})+(@{misc-mod})]])-([[@{pettar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -815,7 +805,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_poltar" title="@{poltar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_polmod" title="@{polmod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_polnotes" title="@{polnotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_polsave" title="%{polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{polmod})+(@{misc-mod})]] - [[@{poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_polsave" title="%{polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{polmod})+(@{misc-mod})]])-([[@{poltar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -823,7 +813,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_breathtar" title="@{breathtar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_breathmod" title="@{breathmod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_breathnotes" title="@{breathnotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_breathsave" title="%{breathsave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{breathmod})+(@{misc-mod})]] - [[@{breathtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_breathsave" title="%{breathsave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{breathmod})+(@{misc-mod})]])-([[@{breathtar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -831,7 +821,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_sptar" title="@{sptar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_spmod" title="@{spmod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_spnotes" title="@{spnotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_spsave" title="%{spsave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{spmod})+(@{misc-mod})]] - [[@{sptar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_spsave" title="%{spsave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{spmod})+(@{misc-mod})]])-([[@{sptar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                         </table>
@@ -848,7 +838,7 @@ <h4>Saving Throws</h4>
                                     <td><input type="text" name="attr_ftar" title="@{ftar}" class="sheet-short" placeholder="Target"/></td>
                                     <td><input type="text" name="attr_fmod" title="@{fmod}" class="sheet-table-dynamic" value="0"/></td>
                                     <td><input type="text" name="attr_fnotes" title="@{fnotes}" placeholder="Situational Modifiers"/>
-                                        <button type="roll" name="roll_fsave" title="%{fsave}" value="/w gm &{template:2Esave} {{savevs=Fear}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{fmod})+(@{misc-mod})]] - [[@{ftar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                        <button type="roll" name="roll_fsave" title="%{fsave}" value="/w gm &{template:2Esave} {{savevs=Fear}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{fmod})+(@{misc-mod})]])-([[@{ftar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                     </td>
                                 </tr>
                                 <tr>
@@ -856,7 +846,7 @@ <h4>Saving Throws</h4>
                                     <td><input type="text" name="attr_horrtar" title="@{horrtar}" class="sheet-short" placeholder="Target"/></td>
                                     <td><input type="text" name="attr_horrmod" title="@{horrmod}" class="sheet-table-dynamic" value="0"/></td>
                                     <td><input type="text" name="attr_horrnotes" title="@{horrnotes}" placeholder="Situational Modifiers"/>
-                                        <button type="roll" name="roll_horrsave" title="%{horrsave}" value="/w gm &{template:2Esave} {{savevs=Horror}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{horrmod})+(@{misc-mod})]] - [[@{horrtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                        <button type="roll" name="roll_horrsave" title="%{horrsave}" value="/w gm &{template:2Esave} {{savevs=Horror}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{horrmod})+(@{misc-mod})]])-([[@{horrtar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                     </td>
                                 </tr>
                                 <tr>
@@ -864,7 +854,7 @@ <h4>Saving Throws</h4>
                                     <td><input type="text" name="attr_madtar" title="@{madtar}" class="sheet-short" placeholder="Target"/></td>
                                     <td><input type="text" name="attr_madmod" title="@{madmod}" class="sheet-table-dynamic" value="0"/></td>
                                     <td><input type="text" name="attr_madnotes" title="@{madnotes}" placeholder="Situational Modifiers"/>
-                                        <button type="roll" name="roll_madsave" title="%{madsave}" value="/w gm &{template:2Esave} {{savevs=Madness}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{madmod})+(@{misc-mod})]] - [[@{madtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                        <button type="roll" name="roll_madsave" title="%{madsave}" value="/w gm &{template:2Esave} {{savevs=Madness}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{madmod})+(@{misc-mod})]])-([[@{madtar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                     </td>
                                 </tr>
                             </table>
@@ -2619,7 +2609,8 @@ <h4>Skills & Powers / Dark Sun / Sages & Specialists</h4>
                     <!--  Invisible header row to keep the spacing of all the cells  -->
                     <tr class="sheet-collapse">
                         <td>Find/Remove Traps</td>
-                        <td colspan="9"></td>
+                        <td colspan="8"></td>
+                        <td><button class="btn sheet-action-button-roll">Find/Remove Traps</button></td>
                     </tr>
                     <tr>
                         <td>Detect Magic*</td>
@@ -4259,7 +4250,7 @@ <h4>Proficiency notes</h4>
                                 <td class="sheet-td-dynamic50"><input type="text" name="attr_profstatnum" title="@{repeating_profs_$X_profstatnum}" placeholder="@{abilityScore}" class="sheet-maxtext-min" list="ability-scores"><span></span></td>
                                 <td>&plusmn;</td>
                                 <td><input type="text" name="attr_profmod" title="@{repeating_profs_$X_profmod}" value="0" class="sheet-minish"></td>
-                                <td><button type="roll" name="roll_Prof" title="%{repeating_profs_$X_Prof}" value="&{template:2Echeck} {{checkvs=@{profname} Check}} {{character=@{character_name}}} {{checkroll=[[1d20cs1cf20]]}} {{checktarget=[[(@{profstatnum})+(@{profmod})+(@{misc-mod})]]}} {{color=dark-blue}}"></button></td>
+                                <td><button type="roll" name="roll_Prof" title="%{repeating_profs_$X_Prof}" value="&{template:2Echeck} {{checkvs=@{profname} Check}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{profstatnum})+(@{profmod})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                             </tr>
                         </table>
                     </fieldset>
@@ -11908,7 +11899,7 @@ <h4>Powers List</h4>
                         <li>No adverse effects associated with casting the spell are suffered by the reader. These requirements or penalties have already been fulfilled or suffered by the creator of the scroll (DMG p. 196)</li>
                         <li><strong>Scroll Spell Failure</strong>
                             <ul>
-                                <li>Wizards and Priests casting scrolls containing spells of a level too high for him to cast incurs a 5% failure rate per level between the character's present level and the level at which the spell could be cast (DMG p. 196)<br>
+                                <li>Wizards and Priests casting scrolls containing spells of a level too high for the character to cast incurs a 5% failure rate per level between the character's present level and the level at which the spell could be cast (DMG p. 196)<br>
                                     Wizards and Priests scroll spell failure is either Total Failure (nothing happens) or Reverse / Harmful Failure effect (DMG p. 196)
                                 </li>
                                 <li>Thieves casting scrolls have 25% failure chance. Failure is always a reverse of the effect (PHB p. 58)</li>
@@ -12105,20 +12096,18 @@ <h4>Psionics Core</h4>
                 <br>
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <h4>Telepathy Devotions</h4>
-                        <fieldset name="repeating_psion-telepathy" class="repeating_psion-telepathy">
+                        <h4>Clairsentient Sciences</h4>
+                        <fieldset name="repeating_psion-clairvoyance-science" class="repeating_psion-clairvoyance-science">
                             <table class="sheet-table-white sheet-default-header-thead">
                                 <thead class="sheet-collapse sheet-show-first">
                                 <tr>
                                     <th rowspan="2">Power name</th>
-                                    <th>Roll</th>
                                     <th colspan="4" class="sheet-centering">Power Score</th>
                                     <th></th>
                                     <th colspan="2" class="sheet-centering">PSP Cost</th>
                                     <th colspan="2" rowspan="2">Macro</th>
                                 </tr>
                                 <tr>
-                                    <th>Mod</th>
                                     <th colspan="2" title="The ability score used by the power">Ability</th>
                                     <th title="The modifier for the ability score">Mod</th>
                                     <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
@@ -12126,23 +12115,307 @@ <h4>Telepathy Devotions</h4>
                                     <th>Initial</th>
                                     <th>Maint.</th>
                                 </tr>
-                            </thead>
+                                </thead>
                                 <tr>
-                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_psiontelepathic" title="@{repeating_psion-telepathy_$X_psiontelepathic}" class="sheet-maxtext-min" list="telepathic-devotions"><span></span></td>
-                                    <td><input type="text" name="attr_psionic-mod" title="@{repeating_psion-telepathy_$X_psionic-mod}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod" title="@{repeating_psion-telepathy_$X_powerscore-nomod}" placeholder="@{}" class="sheet-cent-min" list="ability-scores-psi"><span></span></td>
+                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_clair-science" title="@{repeating_psion-clairvoyance-science_$X_clair-science}" class="sheet-maxtext-min" list="clairsentient-sciences"><span></span></td>
+                                    <td><input type="text" name="attr_powerscore-nomod9" title="@{repeating_psion-clairvoyance-science_$X_powerscore-nomod9}" placeholder="@{}" class="sheet-track-min" list="ability-scores-psi"><span></span></td>
                                     <td>&plusmn;</td>
-                                    <td><input type="text" name="attr_powerscore-mod" title="@{repeating_psion-telepathy_$X_powerscore-mod}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-telepathy_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
-                                    <td><button type="roll" name="roll_Telepathy-Devotion" title="%{repeating_psion-telepathy_$X_Telepathy-Devotion}" value="@{action-check}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost20" title="@{repeating_psion-telepathy_$X_PSP-cost20}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-telepathy_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><button type="roll" name="roll_telepathic-macro" title="%{repeating_psion-telepathy_$X_telepathic-macro}" value="@{action-macro}">T</button></td>
+                                    <td><input type="text" name="attr_powerscore-mod9" title="@{repeating_psion-clairvoyance-science_$X_powerscore-mod9}" placeholder="#" class="sheet-small" value="0"></td>
+                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-clairvoyance-science_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
+                                    <td><button type="roll" name="roll_Clair-Science" title="%{repeating_psion-clairvoyance-science_$X_Clair-Science}" value="@{action-check}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost29" title="@{repeating_psion-clairvoyance-science_$X_PSP-cost29}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-clairvoyance-science_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><button type="roll" name="roll_clairvoyance-science-macro" title="%{repeating_psion-clairvoyance-science_$X_clairvoyance-science-macro}" value="@{action-macro}">T</button></td>
                                     <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
                                 </tr>
                                 <tr class="sheet-hidden sheet-fold">
                                     <td colspan="100">
-                                        <textarea type="text" name="attr_psiontelepathic-macro" title="@{repeating_psion-telepathy_$X_psiontelepathic-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
+                                        <textarea type="text" name="attr_psionclair-science-macro" title="@{repeating_psion-clairvoyance-science_$X_psionclair-science-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
+                                    </td>
+                                </tr>
+                            </table>
+                            <input type="hidden" name="attr_action-check" value="">
+                            <button type="action" name="act_action-check" style="display: none"></button>
+                            <button type="action" name="act_action-check-dm" style="display: none"></button>
+                            <input type="hidden" name="attr_action-macro" value="">
+                            <button type="action" name="act_action-macro" style="display: none"></button>
+                        </fieldset>
+                    </div>
+                    <div class="sheet-col">
+                        <h4>Clairsentient Devotions</h4>
+                        <fieldset name="repeating_psion-clairvoyance" class="repeating_psion-clairvoyance">
+                            <table class="sheet-table-white sheet-default-header-thead">
+                                <thead class="sheet-collapse sheet-show-first">
+                                <tr>
+                                    <th rowspan="2">Power name</th>
+                                    <th colspan="4" class="sheet-centering">Power Score</th>
+                                    <th></th>
+                                    <th colspan="2" class="sheet-centering">PSP Cost</th>
+                                    <th colspan="2" rowspan="2">Macro</th>
+                                </tr>
+                                <tr>
+                                    <th colspan="2" title="The ability score used by the power">Ability</th>
+                                    <th title="The modifier for the ability score">Mod</th>
+                                    <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
+                                    <th></th>
+                                    <th>Initial</th>
+                                    <th>Maint.</th>
+                                </tr>
+                                </thead>
+                                <tr>
+                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_psionclair" title="@{repeating_psion-clairvoyance_$X_psionclair}" class="sheet-maxtext-min" list="clairsentient-devotions"><span></span></td>
+                                    <td><input type="text" name="attr_powerscore-nomod8" title="@{repeating_psion-clairvoyance_$X_powerscore-nomod8}" placeholder="@{}" class="sheet-track-min" list="ability-scores-psi"><span></span></td>
+                                    <td>&plusmn;</td>
+                                    <td><input type="text" name="attr_powerscore-mod8" title="@{repeating_psion-clairvoyance_$X_powerscore-mod8}" placeholder="#" class="sheet-small" value="0"></td>
+                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-clairvoyance_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
+                                    <td><button type="roll" name="roll_Clair-Devotion" title="%{repeating_psion-clairvoyance_$X_Clair-Devotion}" value="@{action-check}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost28" title="@{repeating_psion-clairvoyance_$X_PSP-cost28}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-clairvoyance_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><button type="roll" name="roll_clairvoyance-macro" title="%{repeating_psion-clairvoyance_$X_clairvoyance-macro}" value="@{action-macro}">T</button></td>
+                                    <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
+                                </tr>
+                                <tr class="sheet-hidden sheet-fold">
+                                    <td colspan="100">
+                                        <textarea type="text" name="attr_psionclair-macro" title="@{repeating_psion-clairvoyance_$X_psionclair-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
+                                    </td>
+                                </tr>
+                            </table>
+                            <input type="hidden" name="attr_action-check" value="">
+                            <button type="action" name="act_action-check" style="display: none"></button>
+                            <button type="action" name="act_action-check-dm" style="display: none"></button>
+                            <input type="hidden" name="attr_action-macro" value="">
+                            <button type="action" name="act_action-macro" style="display: none"></button>
+                        </fieldset>
+                    </div>
+                </div>
+                <br>
+                <div class="sheet-2colrow">
+                    <div class="sheet-col">
+                        <h4>Psychokinetic Sciences</h4>
+                        <fieldset name="repeating_psion-kinetic-science" class="repeating_psion-kinetic-science">
+                            <table class="sheet-table-white sheet-default-header-thead">
+                                <thead class="sheet-collapse sheet-show-first">
+                                <tr>
+                                    <th rowspan="2">Power name</th>
+                                    <th colspan="4" class="sheet-centering">Power Score</th>
+                                    <th></th>
+                                    <th colspan="2" class="sheet-centering">PSP Cost</th>
+                                    <th colspan="2" rowspan="2">Macro</th>
+                                </tr>
+                                <tr>
+                                    <th colspan="2" title="The ability score used by the power">Ability</th>
+                                    <th title="The modifier for the ability score">Mod</th>
+                                    <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
+                                    <th></th>
+                                    <th>Initial</th>
+                                    <th>Maint.</th>
+                                </tr>
+                                </thead>
+                                <tr>
+                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_kinetic-science" title="@{repeating_psion-kinetic-science_$X_kinetic-science}" class="sheet-maxtext-min" list="psychokinetic-sciences"><span></span></td>
+                                    <td><input type="text" name="attr_powerscore-nomod3" title="@{repeating_psion-kinetic-science_$X_powerscore-nomod3}" placeholder="@{}" class="sheet-track-min" list="ability-scores-psi"><span></span></td>
+                                    <td>&plusmn;</td>
+                                    <td><input type="text" name="attr_powerscore-mod3" title="@{repeating_psion-kinetic-science_$X_powerscore-mod3}" placeholder="#" class="sheet-small" value="0"></td>
+                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-kinetic-science_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
+                                    <td><button type="roll" name="roll_Kinetic-Science" title="%{repeating_psion-kinetic-science_$X_Kinetic-Science}" value="@{action-check}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost23" title="@{repeating_psion-kinetic-science_$X_PSP-cost23}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-kinetic-science_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><button type="roll" name="roll_kinetic-science-macro" title="%{repeating_psion-kinetic-science_$X_kinetic-science-macro}" value="@{action-macro}">T</button></td>
+                                    <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
+                                </tr>
+                                <tr class="sheet-hidden sheet-fold">
+                                    <td colspan="100">
+                                        <textarea type="text" name="attr_psionkinetic-science-macro" title="@{repeating_psion-kinetic-science_$X_psionkinetic-science-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
+                                    </td>
+                                </tr>
+                            </table>
+                            <input type="hidden" name="attr_action-check" value="">
+                            <button type="action" name="act_action-check" style="display: none"></button>
+                            <button type="action" name="act_action-check-dm" style="display: none"></button>
+                            <input type="hidden" name="attr_action-macro" value="">
+                            <button type="action" name="act_action-macro" style="display: none"></button>
+                        </fieldset>
+                    </div>
+                    <div class="sheet-col">
+                        <h4>Psychokinetic Devotions</h4>
+                        <fieldset name="repeating_psion-psychokinesis" class="repeating_psion-psychokinesis">
+                            <table class="sheet-table-white sheet-default-header-thead">
+                                <thead class="sheet-collapse sheet-show-first">
+                                <tr>
+                                    <th rowspan="2">Power name</th>
+                                    <th colspan="4" class="sheet-centering">Power Score</th>
+                                    <th></th>
+                                    <th colspan="2" class="sheet-centering">PSP Cost</th>
+                                    <th colspan="2" rowspan="2">Macro</th>
+                                </tr>
+                                <tr>
+                                    <th colspan="2" title="The ability score used by the power">Ability</th>
+                                    <th title="The modifier for the ability score">Mod</th>
+                                    <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
+                                    <th></th>
+                                    <th>Initial</th>
+                                    <th>Maint.</th>
+                                </tr>
+                                </thead>
+                                <tr>
+                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_psionkinetic" title="@{repeating_psion-psychokinesis_$X_psionkinetic}" class="sheet-maxtext-min" list="psychokinetic-devotions"><span></span></td>
+                                    <td><input type="text" name="attr_powerscore-nomod2" title="@{repeating_psion-psychokinesis_$X_powerscore-nomod2}" placeholder="@{}" class="sheet-track-min" list="ability-scores-psi"><span></span></td>
+                                    <td>&plusmn;</td>
+                                    <td><input type="text" name="attr_powerscore-mod2" title="@{repeating_psion-psychokinesis_$X_powerscore-mod2}" placeholder="#" class="sheet-small" value="0"></td>
+                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-psychokinesis_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
+                                    <td><button type="roll" name="roll_Kinetic-Devotion" title="%{repeating_psion-psychokinesis_$X_Kinetic-Devotion}" value="@{action-check}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost22" title="@{repeating_psion-psychokinesis_$X_PSP-cost22}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-psychokinesis_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><button type="roll" name="roll_kinetic-macro" title="%{repeating_psion-psychokinesis_$X_kinetic-macro}" value="@{action-macro}">T</button></td>
+                                    <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
+                                </tr>
+                                <tr class="sheet-hidden sheet-fold">
+                                    <td colspan="100">
+                                        <textarea type="text" name="attr_psionkinetic-macro" title="@{repeating_psion-psychokinesis_$X_psionkinetic-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
+                                    </td>
+                                </tr>
+                            </table>
+                            <input type="hidden" name="attr_action-check" value="">
+                            <button type="action" name="act_action-check" style="display: none"></button>
+                            <button type="action" name="act_action-check-dm" style="display: none"></button>
+                            <input type="hidden" name="attr_action-macro" value="">
+                            <button type="action" name="act_action-macro" style="display: none"></button>
+                        </fieldset>
+                    </div>
+                </div>
+                <br>
+                <div class="sheet-2colrow">
+                    <div class="sheet-col">
+                        <h4>Psychometabolic Sciences</h4>
+                        <fieldset name="repeating_psion-metabolic-science" class="repeating_psion-metabolic-science">
+                            <table class="sheet-table-white sheet-default-header-thead">
+                                <thead class="sheet-collapse sheet-show-first">
+                                <tr>
+                                    <th rowspan="2">Power name</th>
+                                    <th colspan="4" class="sheet-centering">Power Score</th>
+                                    <th></th>
+                                    <th colspan="2" class="sheet-centering">PSP Cost</th>
+                                    <th colspan="2" rowspan="2">Macro</th>
+                                </tr>
+                                <tr>
+                                    <th colspan="2" title="The ability score used by the power">Ability</th>
+                                    <th title="The modifier for the ability score">Mod</th>
+                                    <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
+                                    <th></th>
+                                    <th>Initial</th>
+                                    <th>Maint.</th>
+                                </tr>
+                                </thead>
+                                <tr>
+                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_metabolic-science" title="@{repeating_psion-metabolic-science_$X_metabolic-science}" class="sheet-maxtext-min" list="psychometabolic-sciences"><span></span></td>
+                                    <td><input type="text" name="attr_powerscore-nomod7" title="@{repeating_psion-metabolic-science_$X_powerscore-nomod7}" placeholder="@{}" class="sheet-track-min" list="ability-scores-psi"><span></span></td>
+                                    <td>&plusmn;</td>
+                                    <td><input type="text" name="attr_powerscore-mod7" title="@{repeating_psion-metabolic-science_$X_powerscore-mod7}" placeholder="#" class="sheet-small" value="0"></td>
+                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-metabolic-science_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
+                                    <td><button type="roll" name="roll_Metabolic-Science" title="%{repeating_psion-metabolic-science_$X_Metabolic-Science}" value="@{action-check}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost27" title="@{repeating_psion-metabolic-science_$X_PSP-cost27}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-metabolic-science_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><button type="roll" name="roll_metabolic-science-macro" title="%{repeating_psion-metabolic-science_$X_metabolic-science-macro}" value="@{action-macro}">T</button></td>
+                                    <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
+                                </tr>
+                                <tr class="sheet-hidden sheet-fold">
+                                    <td colspan="100">
+                                        <textarea type="text" name="attr_psionmetabolic-science-macro" title="@{repeating_psion-metabolic-science_$X_psionmetabolic-science-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
+                                    </td>
+                                </tr>
+                            </table>
+                            <input type="hidden" name="attr_action-check" value="">
+                            <button type="action" name="act_action-check" style="display: none"></button>
+                            <button type="action" name="act_action-check-dm" style="display: none"></button>
+                            <input type="hidden" name="attr_action-macro" value="">
+                            <button type="action" name="act_action-macro" style="display: none"></button>
+                        </fieldset>
+                    </div>
+                    <div class="sheet-col">
+                        <h4>Psychometabolic Devotions</h4>
+                        <fieldset name="repeating_psion-metabolic" class="repeating_psion-metabolic">
+                            <table class="sheet-table-white sheet-default-header-thead">
+                                <thead class="sheet-collapse sheet-show-first">
+                                <tr>
+                                    <th rowspan="2">Power name</th>
+                                    <th colspan="4" class="sheet-centering">Power Score</th>
+                                    <th></th>
+                                    <th colspan="2" class="sheet-centering">PSP Cost</th>
+                                    <th colspan="2" rowspan="2">Macro</th>
+                                </tr>
+                                <tr>
+                                    <th colspan="2" title="The ability score used by the power">Ability</th>
+                                    <th title="The modifier for the ability score">Mod</th>
+                                    <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
+                                    <th></th>
+                                    <th>Initial</th>
+                                    <th>Maint.</th>
+                                </tr>
+                                </thead>
+                                <tr>
+                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_psionmetabolic" title="@{repeating_psion-metabolic_$X_psionmetabolic}" class="sheet-maxtext-min" list="psychometabolic-devotions"><span></span></td>
+                                    <td><input type="text" name="attr_powerscore-nomod6" title="@{repeating_psion-metabolic_$X_powerscore-nomod6}" placeholder="@{}" class="sheet-track-min" list="ability-scores-psi"><span></span></td>
+                                    <td>&plusmn;</td>
+                                    <td><input type="text" name="attr_powerscore-mod6" title="@{repeating_psion-metabolic_$X_powerscore-mod6}" placeholder="#" class="sheet-small" value="0"></td>
+                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-metabolic_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
+                                    <td><button type="roll" name="roll_Metabolic-Devotion" title="%{repeating_psion-metabolic_$X_Metabolic-Devotion}" value="@{action-check}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost26" title="@{repeating_psion-metabolic_$X_PSP-cost26}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-metabolic_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><button type="roll" name="roll_metabolic-macro" title="%{repeating_psion-metabolic_$X_metabolic-macro}" value="@{action-macro}">T</button></td>
+                                    <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
+                                </tr>
+                                <tr class="sheet-hidden sheet-fold">
+                                    <td colspan="100">
+                                        <textarea type="text" name="attr_psionmetabolic-macro" title="@{repeating_psion-metabolic_$X_psionmetabolic-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
+                                    </td>
+                                </tr>
+                            </table>
+                            <input type="hidden" name="attr_action-check" value="">
+                            <button type="action" name="act_action-check" style="display: none"></button>
+                            <button type="action" name="act_action-check-dm" style="display: none"></button>
+                            <input type="hidden" name="attr_action-macro" value="">
+                            <button type="action" name="act_action-macro" style="display: none"></button>
+                        </fieldset>
+                    </div>
+                </div>
+                <br>
+                <div class="sheet-2colrow">
+                    <div class="sheet-col">
+                        <h4>Psychoportive Sciences</h4>
+                        <fieldset name="repeating_psion-portation-science" class="repeating_psion-portation-science">
+                            <table class="sheet-table-white sheet-default-header-thead">
+                                <thead class="sheet-collapse sheet-show-first">
+                                <tr>
+                                    <th rowspan="2">Power name</th>
+                                    <th colspan="4" class="sheet-centering">Power Score</th>
+                                    <th></th>
+                                    <th colspan="2" class="sheet-centering">PSP Cost</th>
+                                    <th colspan="2" rowspan="2">Macro</th>
+                                </tr>
+                                <tr>
+                                    <th colspan="2" title="The ability score used by the power">Ability</th>
+                                    <th title="The modifier for the ability score">Mod</th>
+                                    <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
+                                    <th></th>
+                                    <th>Initial</th>
+                                    <th>Maint.</th>
+                                </tr>
+                                </thead>
+                                <tr>
+                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_portation-science" title="@{repeating_psion-portation-science_$X_portation-science}" class="sheet-maxtext-min" list="psychoportive-sciences"><span></span></td>
+                                    <td><input type="text" name="attr_powerscore-nomod5" title="@{repeating_psion-portation-science_$X_powerscore-nomod5}" placeholder="@{}" class="sheet-track-min" list="ability-scores-psi"><span></span></td>
+                                    <td>&plusmn;</td>
+                                    <td><input type="text" name="attr_powerscore-mod5" title="@{repeating_psion-portation-science_$X_powerscore-mod5}" placeholder="#" class="sheet-small" value="0"></td>
+                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-portation-science_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
+                                    <td><button type="roll" name="roll_Portation-Science" title="%{repeating_psion-portation-science_$X_Portation-Science}" value="@{action-check}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost25" title="@{repeating_psion-portation-science_$X_PSP-cost25}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-portation-science_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><button type="roll" name="roll_portation-science-macro" title="%{repeating_psion-portation-science_$X_portation-science-macro}" value="@{action-macro}">T</button></td>
+                                    <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
+                                </tr>
+                                <tr class="sheet-hidden sheet-fold">
+                                    <td colspan="100">
+                                        <textarea type="text" name="attr_psionportation-science-macro" title="@{repeating_psion-portation-science_$X_psionportation-science-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
                                     </td>
                                 </tr>
                             </table>
@@ -12154,20 +12427,67 @@ <h4>Telepathy Devotions</h4>
                         </fieldset>
                     </div>
                     <div class="sheet-col">
-                        <h4>Telepathy Sciences</h4>
+                        <h4>Psychoportive Devotions</h4>
+                        <fieldset name="repeating_psion-portation" class="repeating_psion-portation">
+                            <table class="sheet-table-white sheet-default-header-thead">
+                                <thead class="sheet-collapse sheet-show-first">
+                                <tr>
+                                    <th rowspan="2">Power name</th>
+                                    <th colspan="4" class="sheet-centering">Power Score</th>
+                                    <th></th>
+                                    <th colspan="2" class="sheet-centering">PSP Cost</th>
+                                    <th colspan="2" rowspan="2">Macro</th>
+                                </tr>
+                                <tr>
+                                    <th colspan="2" title="The ability score used by the power">Ability</th>
+                                    <th title="The modifier for the ability score">Mod</th>
+                                    <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
+                                    <th></th>
+                                    <th>Initial</th>
+                                    <th>Maint.</th>
+                                </tr>
+                                </thead>
+                                <tr>
+                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_psionportation" title="@{repeating_psion-portation_$X_psionportation}" class="sheet-maxtext-min" list="psychoportive-devotions"><span></span></td>
+                                    <td><input type="text" name="attr_powerscore-nomod4" title="@{repeating_psion-portation_$X_powerscore-nomod4}" placeholder="@{}" class="sheet-track-min" list="ability-scores-psi"><span></span></td>
+                                    <td>&plusmn;</td>
+                                    <td><input type="text" name="attr_powerscore-mod4" title="@{repeating_psion-portation_$X_powerscore-mod4}" placeholder="#" class="sheet-small" value="0"></td>
+                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-portation_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
+                                    <td><button type="roll" name="roll_Portation-Devotion" title="%{repeating_psion-portation_$X_Portation-Devotion}" value="@{action-check}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost24" title="@{repeating_psion-portation_$X_PSP-cost24}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-portation_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><button type="roll" name="roll_portation-macro" title="%{repeating_psion-portation_$X_portation-macro}" value="@{action-macro}">T</button></td>
+                                    <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
+                                </tr>
+                                <tr class="sheet-hidden sheet-fold">
+                                    <td colspan="100">
+                                        <textarea type="text" name="attr_psionportation-macro" title="@{repeating_psion-portation_$X_psionportation-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
+                                    </td>
+                                </tr>
+                            </table>
+                            <input type="hidden" name="attr_action-check" value="">
+                            <button type="action" name="act_action-check" style="display: none"></button>
+                            <button type="action" name="act_action-check-dm" style="display: none"></button>
+                            <input type="hidden" name="attr_action-macro" value="">
+                            <button type="action" name="act_action-macro" style="display: none"></button>
+                        </fieldset>
+                    </div>
+                </div>
+                <br>
+                <div class="sheet-2colrow">
+                    <div class="sheet-col">
+                        <h4>Telepathic Sciences</h4>
                         <fieldset name="repeating_psion-telepathic-science" class="repeating_psion-telepathic-science">
                             <table class="sheet-table-white sheet-default-header-thead">
                                 <thead class="sheet-collapse sheet-show-first">
                                 <tr>
                                     <th rowspan="2">Power name</th>
-                                    <th>Roll</th>
                                     <th colspan="4" class="sheet-centering">Power Score</th>
                                     <th></th>
                                     <th colspan="2" class="sheet-centering">PSP Cost</th>
                                     <th colspan="2" rowspan="2">Macro</th>
                                 </tr>
                                 <tr>
-                                    <th>Mod</th>
                                     <th colspan="2" title="The ability score used by the power">Ability</th>
                                     <th title="The modifier for the ability score">Mod</th>
                                     <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
@@ -12175,11 +12495,10 @@ <h4>Telepathy Sciences</h4>
                                     <th>Initial</th>
                                     <th>Maint.</th>
                                 </tr>
-                            </thead>
+                                </thead>
                                 <tr>
                                     <td class="sheet-td-dynamic100"><input type="text" name="attr_telepathic-science" title="@{repeating_psion-telepathic-science_$X_telepathic-science}" class="sheet-maxtext-min" list="telepathic-sciences"><span></span></td>
-                                    <td><input type="text" name="attr_psionic-mod1" title="@{repeating_psion-telepathic-science_$X_psionic-mod1}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod1" title="@{repeating_psion-telepathic-science_$X_powerscore-nomod1}" placeholder="@{}" class="sheet-cent-min" list="ability-scores-psi"><span></span></td>
+                                    <td><input type="text" name="attr_powerscore-nomod1" title="@{repeating_psion-telepathic-science_$X_powerscore-nomod1}" placeholder="@{}" class="sheet-track-min" list="ability-scores-psi"><span></span></td>
                                     <td>&plusmn;</td>
                                     <td><input type="text" name="attr_powerscore-mod1" title="@{repeating_psion-telepathic-science_$X_powerscore-mod1}" placeholder="#" class="sheet-small" value="0"></td>
                                     <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-telepathic-science_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
@@ -12202,275 +12521,19 @@ <h4>Telepathy Sciences</h4>
                             <button type="action" name="act_action-macro" style="display: none"></button>
                         </fieldset>
                     </div>
-                </div>
-                <br>
-                <div class="sheet-2colrow">
-                    <div class="sheet-col">
-                        <h4>Psychokinesis Devotions</h4>
-                        <fieldset name="repeating_psion-psychokinesis" class="repeating_psion-psychokinesis">
-                            <table class="sheet-table-white sheet-default-header-thead">
-                                <thead class="sheet-collapse sheet-show-first">
-                                <tr>
-                                    <th rowspan="2">Power name</th>
-                                    <th>Roll</th>
-                                    <th colspan="4" class="sheet-centering">Power Score</th>
-                                    <th></th>
-                                    <th colspan="2" class="sheet-centering">PSP Cost</th>
-                                    <th colspan="2" rowspan="2">Macro</th>
-                                </tr>
-                                <tr>
-                                    <th>Mod</th>
-                                    <th colspan="2" title="The ability score used by the power">Ability</th>
-                                    <th title="The modifier for the ability score">Mod</th>
-                                    <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
-                                    <th></th>
-                                    <th>Initial</th>
-                                    <th>Maint.</th>
-                                </tr>
-                            </thead>
-                                <tr>
-                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_psionkinetic" title="@{repeating_psion-psychokinesis_$X_psionkinetic}" class="sheet-maxtext-min" list="psychokinetic-devotions"><span></span></td>
-                                    <td><input type="text" name="attr_psionic-mod2" title="@{repeating_psion-psychokinesis_$X_psionic-mod2}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod2" title="@{repeating_psion-psychokinesis_$X_powerscore-nomod2}" placeholder="@{}" class="sheet-cent-min" list="ability-scores-psi"><span></span></td>
-                                    <td>&plusmn;</td>
-                                    <td><input type="text" name="attr_powerscore-mod2" title="@{repeating_psion-psychokinesis_$X_powerscore-mod2}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-psychokinesis_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
-                                    <td><button type="roll" name="roll_Kinetic-Devotion" title="%{repeating_psion-psychokinesis_$X_Kinetic-Devotion}" value="@{action-check}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost22" title="@{repeating_psion-psychokinesis_$X_PSP-cost22}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-psychokinesis_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><button type="roll" name="roll_kinetic-macro" title="%{repeating_psion-psychokinesis_$X_kinetic-macro}" value="@{action-macro}">T</button></td>
-                                    <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
-                                </tr>
-                                <tr class="sheet-hidden sheet-fold">
-                                    <td colspan="100">
-                                        <textarea type="text" name="attr_psionkinetic-macro" title="@{repeating_psion-psychokinesis_$X_psionkinetic-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
-                                    </td>
-                                </tr>
-                            </table>
-                            <input type="hidden" name="attr_action-check" value="">
-                            <button type="action" name="act_action-check" style="display: none"></button>
-                            <button type="action" name="act_action-check-dm" style="display: none"></button>
-                            <input type="hidden" name="attr_action-macro" value="">
-                            <button type="action" name="act_action-macro" style="display: none"></button>
-                        </fieldset>
-                    </div>
-                    <div class="sheet-col">
-                        <h4>Psychokinesis Sciences</h4>
-                        <fieldset name="repeating_psion-kinetic-science" class="repeating_psion-kinetic-science">
-                            <table class="sheet-table-white sheet-default-header-thead">
-                                <thead class="sheet-collapse sheet-show-first">
-                                <tr>
-                                    <th rowspan="2">Power name</th>
-                                    <th>Roll</th>
-                                    <th colspan="4" class="sheet-centering">Power Score</th>
-                                    <th></th>
-                                    <th colspan="2" class="sheet-centering">PSP Cost</th>
-                                    <th colspan="2" rowspan="2">Macro</th>
-                                </tr>
-                                <tr>
-                                    <th>Mod</th>
-                                    <th colspan="2" title="The ability score used by the power">Ability</th>
-                                    <th title="The modifier for the ability score">Mod</th>
-                                    <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
-                                    <th></th>
-                                    <th>Initial</th>
-                                    <th>Maint.</th>
-                                </tr>
-                            </thead>
-                                <tr>
-                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_kinetic-science" title="@{repeating_psion-kinetic-science_$X_kinetic-science}" class="sheet-maxtext-min" list="psychokinetic-sciences"><span></span></td>
-                                    <td><input type="text" name="attr_psionic-mod3" title="@{repeating_psion-kinetic-science_$X_psionic-mod3}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod3" title="@{repeating_psion-kinetic-science_$X_powerscore-nomod3}" placeholder="@{}" class="sheet-cent-min" list="ability-scores-psi"><span></span></td>
-                                    <td>&plusmn;</td>
-                                    <td><input type="text" name="attr_powerscore-mod3" title="@{repeating_psion-kinetic-science_$X_powerscore-mod3}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-kinetic-science_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
-                                    <td><button type="roll" name="roll_Kinetic-Science" title="%{repeating_psion-kinetic-science_$X_Kinetic-Science}" value="@{action-check}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost23" title="@{repeating_psion-kinetic-science_$X_PSP-cost23}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-kinetic-science_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><button type="roll" name="roll_kinetic-science-macro" title="%{repeating_psion-kinetic-science_$X_kinetic-science-macro}" value="@{action-macro}">T</button></td>
-                                    <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
-                                </tr>
-                                <tr class="sheet-hidden sheet-fold">
-                                    <td colspan="100">
-                                        <textarea type="text" name="attr_psionkinetic-science-macro" title="@{repeating_psion-kinetic-science_$X_psionkinetic-science-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
-                                    </td>
-                                </tr>
-                            </table>
-                            <input type="hidden" name="attr_action-check" value="">
-                            <button type="action" name="act_action-check" style="display: none"></button>
-                            <button type="action" name="act_action-check-dm" style="display: none"></button>
-                            <input type="hidden" name="attr_action-macro" value="">
-                            <button type="action" name="act_action-macro" style="display: none"></button>
-                        </fieldset>
-                    </div>
-                </div>
-                <br>
-                <div class="sheet-2colrow">
-                    <div class="sheet-col">
-                        <h4>Psychoportive Devotions</h4>
-                        <fieldset name="repeating_psion-portation" class="repeating_psion-portation">
-                            <table class="sheet-table-white sheet-default-header-thead">
-                                <thead class="sheet-collapse sheet-show-first">
-                                <tr>
-                                    <th rowspan="2">Power name</th>
-                                    <th>Roll</th>
-                                    <th colspan="4" class="sheet-centering">Power Score</th>
-                                    <th></th>
-                                    <th colspan="2" class="sheet-centering">PSP Cost</th>
-                                    <th colspan="2" rowspan="2">Macro</th>
-                                </tr>
-                                <tr>
-                                    <th>Mod</th>
-                                    <th colspan="2" title="The ability score used by the power">Ability</th>
-                                    <th title="The modifier for the ability score">Mod</th>
-                                    <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
-                                    <th></th>
-                                    <th>Initial</th>
-                                    <th>Maint.</th>
-                                </tr>
-                            </thead>
-                                <tr>
-                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_psionportation" title="@{repeating_psion-portation_$X_psionportation}" class="sheet-maxtext-min" list="psychoportive-devotions"><span></span></td>
-                                    <td><input type="text" name="attr_psionic-mod4" title="@{repeating_psion-portation_$X_psionic-mod4}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod4" title="@{repeating_psion-portation_$X_powerscore-nomod4}" placeholder="@{}" class="sheet-cent-min" list="ability-scores-psi"><span></span></td>
-                                    <td>&plusmn;</td>
-                                    <td><input type="text" name="attr_powerscore-mod4" title="@{repeating_psion-portation_$X_powerscore-mod4}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-portation_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
-                                    <td><button type="roll" name="roll_Portation-Devotion" title="%{repeating_psion-portation_$X_Portation-Devotion}" value="@{action-check}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost24" title="@{repeating_psion-portation_$X_PSP-cost24}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-portation_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><button type="roll" name="roll_portation-macro" title="%{repeating_psion-portation_$X_portation-macro}" value="@{action-macro}">T</button></td>
-                                    <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
-                                </tr>
-                                <tr class="sheet-hidden sheet-fold">
-                                    <td colspan="100">
-                                        <textarea type="text" name="attr_psionportation-macro" title="@{repeating_psion-portation_$X_psionportation-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
-                                    </td>
-                                </tr>
-                            </table>
-                            <input type="hidden" name="attr_action-check" value="">
-                            <button type="action" name="act_action-check" style="display: none"></button>
-                            <button type="action" name="act_action-check-dm" style="display: none"></button>
-                            <input type="hidden" name="attr_action-macro" value="">
-                            <button type="action" name="act_action-macro" style="display: none"></button>
-                        </fieldset>
-                    </div>
-                    <div class="sheet-col">
-                        <h4>Psychoportive Sciences</h4>
-                        <fieldset name="repeating_psion-portation-science" class="repeating_psion-portation-science">
-                            <table class="sheet-table-white sheet-default-header-thead">
-                                <thead class="sheet-collapse sheet-show-first">
-                                <tr>
-                                    <th rowspan="2">Power name</th>
-                                    <th>Roll</th>
-                                    <th colspan="4" class="sheet-centering">Power Score</th>
-                                    <th></th>
-                                    <th colspan="2" class="sheet-centering">PSP Cost</th>
-                                    <th colspan="2" rowspan="2">Macro</th>
-                                </tr>
-                                <tr>
-                                    <th>Mod</th>
-                                    <th colspan="2" title="The ability score used by the power">Ability</th>
-                                    <th title="The modifier for the ability score">Mod</th>
-                                    <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
-                                    <th></th>
-                                    <th>Initial</th>
-                                    <th>Maint.</th>
-                                </tr>
-                            </thead>
-                                <tr>
-                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_portation-science" title="@{repeating_psion-portation-science_$X_portation-science}" class="sheet-maxtext-min" list="psychoportive-sciences"><span></span></td>
-                                    <td><input type="text" name="attr_psionic-mod5" title="@{repeating_psion-portation-science_$X_psionic-mod5}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod5" title="@{repeating_psion-portation-science_$X_powerscore-nomod5}" placeholder="@{}" class="sheet-cent-min" list="ability-scores-psi"><span></span></td>
-                                    <td>&plusmn;</td>
-                                    <td><input type="text" name="attr_powerscore-mod5" title="@{repeating_psion-portation-science_$X_powerscore-mod5}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-portation-science_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
-                                    <td><button type="roll" name="roll_Portation-Science" title="%{repeating_psion-portation-science_$X_Portation-Science}" value="@{action-check}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost25" title="@{repeating_psion-portation-science_$X_PSP-cost25}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-portation-science_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><button type="roll" name="roll_portation-science-macro" title="%{repeating_psion-portation-science_$X_portation-science-macro}" value="@{action-macro}">T</button></td>
-                                    <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
-                                </tr>
-                                <tr class="sheet-hidden sheet-fold">
-                                    <td colspan="100">
-                                        <textarea type="text" name="attr_psionportation-science-macro" title="@{repeating_psion-portation-science_$X_psionportation-science-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
-                                    </td>
-                                </tr>
-                            </table>
-                            <input type="hidden" name="attr_action-check" value="">
-                            <button type="action" name="act_action-check" style="display: none"></button>
-                            <button type="action" name="act_action-check-dm" style="display: none"></button>
-                            <input type="hidden" name="attr_action-macro" value="">
-                            <button type="action" name="act_action-macro" style="display: none"></button>
-                        </fieldset>
-                    </div>
-                </div>
-                <br>
-                <div class="sheet-2colrow">
-                    <div class="sheet-col">
-                        <h4>Psychometabolism Devotions</h4>
-                        <fieldset name="repeating_psion-metabolic" class="repeating_psion-metabolic">
-                            <table class="sheet-table-white sheet-default-header-thead">
-                                <thead class="sheet-collapse sheet-show-first">
-                                <tr>
-                                    <th rowspan="2">Power name</th>
-                                    <th>Roll</th>
-                                    <th colspan="4" class="sheet-centering">Power Score</th>
-                                    <th></th>
-                                    <th colspan="2" class="sheet-centering">PSP Cost</th>
-                                    <th colspan="2" rowspan="2">Macro</th>
-                                </tr>
-                                <tr>
-                                    <th>Mod</th>
-                                    <th colspan="2" title="The ability score used by the power">Ability</th>
-                                    <th title="The modifier for the ability score">Mod</th>
-                                    <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
-                                    <th></th>
-                                    <th>Initial</th>
-                                    <th>Maint.</th>
-                                </tr>
-                            </thead>
-                                <tr>
-                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_psionmetabolic" title="@{repeating_psion-metabolic_$X_psionmetabolic}" class="sheet-maxtext-min" list="psychometabolic-devotions"><span></span></td>
-                                    <td><input type="text" name="attr_psionic-mod6" title="@{repeating_psion-metabolic_$X_psionic-mod6}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod6" title="@{repeating_psion-metabolic_$X_powerscore-nomod6}" placeholder="@{}" class="sheet-cent-min" list="ability-scores-psi"><span></span></td>
-                                    <td>&plusmn;</td>
-                                    <td><input type="text" name="attr_powerscore-mod6" title="@{repeating_psion-metabolic_$X_powerscore-mod6}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-metabolic_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
-                                    <td><button type="roll" name="roll_Metabolic-Devotion" title="%{repeating_psion-metabolic_$X_Metabolic-Devotion}" value="@{action-check}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost26" title="@{repeating_psion-metabolic_$X_PSP-cost26}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-metabolic_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><button type="roll" name="roll_metabolic-macro" title="%{repeating_psion-metabolic_$X_metabolic-macro}" value="@{action-macro}">T</button></td>
-                                    <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
-                                </tr>
-                                <tr class="sheet-hidden sheet-fold">
-                                    <td colspan="100">
-                                        <textarea type="text" name="attr_psionmetabolic-macro" title="@{repeating_psion-metabolic_$X_psionmetabolic-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
-                                    </td>
-                                </tr>
-                            </table>
-                            <input type="hidden" name="attr_action-check" value="">
-                            <button type="action" name="act_action-check" style="display: none"></button>
-                            <button type="action" name="act_action-check-dm" style="display: none"></button>
-                            <input type="hidden" name="attr_action-macro" value="">
-                            <button type="action" name="act_action-macro" style="display: none"></button>
-                        </fieldset>
-                    </div>
                     <div class="sheet-col">
-                        <h4>Psychometabolism Sciences</h4>
-                        <fieldset name="repeating_psion-metabolic-science" class="repeating_psion-metabolic-science">
+                        <h4>Telepathic Devotions</h4>
+                        <fieldset name="repeating_psion-telepathy" class="repeating_psion-telepathy">
                             <table class="sheet-table-white sheet-default-header-thead">
                                 <thead class="sheet-collapse sheet-show-first">
                                 <tr>
                                     <th rowspan="2">Power name</th>
-                                    <th>Roll</th>
                                     <th colspan="4" class="sheet-centering">Power Score</th>
                                     <th></th>
                                     <th colspan="2" class="sheet-centering">PSP Cost</th>
                                     <th colspan="2" rowspan="2">Macro</th>
                                 </tr>
                                 <tr>
-                                    <th>Mod</th>
                                     <th colspan="2" title="The ability score used by the power">Ability</th>
                                     <th title="The modifier for the ability score">Mod</th>
                                     <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
@@ -12478,23 +12541,22 @@ <h4>Psychometabolism Sciences</h4>
                                     <th>Initial</th>
                                     <th>Maint.</th>
                                 </tr>
-                            </thead>
+                                </thead>
                                 <tr>
-                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_metabolic-science" title="@{repeating_psion-metabolic-science_$X_metabolic-science}" class="sheet-maxtext-min" list="psychometabolic-sciences"><span></span></td>
-                                    <td><input type="text" name="attr_psionic-mod7" title="@{repeating_psion-metabolic-science_$X_psionic-mod7}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod7" title="@{repeating_psion-metabolic-science_$X_powerscore-nomod7}" placeholder="@{}" class="sheet-cent-min" list="ability-scores-psi"><span></span></td>
+                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_psiontelepathic" title="@{repeating_psion-telepathy_$X_psiontelepathic}" class="sheet-maxtext-min" list="telepathic-devotions"><span></span></td>
+                                    <td><input type="text" name="attr_powerscore-nomod" title="@{repeating_psion-telepathy_$X_powerscore-nomod}" placeholder="@{}" class="sheet-track-min" list="ability-scores-psi"><span></span></td>
                                     <td>&plusmn;</td>
-                                    <td><input type="text" name="attr_powerscore-mod7" title="@{repeating_psion-metabolic-science_$X_powerscore-mod7}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-metabolic-science_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
-                                    <td><button type="roll" name="roll_Metabolic-Science" title="%{repeating_psion-metabolic-science_$X_Metabolic-Science}" value="@{action-check}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost27" title="@{repeating_psion-metabolic-science_$X_PSP-cost27}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-metabolic-science_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><button type="roll" name="roll_metabolic-science-macro" title="%{repeating_psion-metabolic-science_$X_metabolic-science-macro}" value="@{action-macro}">T</button></td>
+                                    <td><input type="text" name="attr_powerscore-mod" title="@{repeating_psion-telepathy_$X_powerscore-mod}" placeholder="#" class="sheet-small" value="0"></td>
+                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-telepathy_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
+                                    <td><button type="roll" name="roll_Telepathy-Devotion" title="%{repeating_psion-telepathy_$X_Telepathy-Devotion}" value="@{action-check}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost20" title="@{repeating_psion-telepathy_$X_PSP-cost20}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-telepathy_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><button type="roll" name="roll_telepathic-macro" title="%{repeating_psion-telepathy_$X_telepathic-macro}" value="@{action-macro}">T</button></td>
                                     <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
                                 </tr>
                                 <tr class="sheet-hidden sheet-fold">
                                     <td colspan="100">
-                                        <textarea type="text" name="attr_psionmetabolic-science-macro" title="@{repeating_psion-metabolic-science_$X_psionmetabolic-science-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
+                                        <textarea type="text" name="attr_psiontelepathic-macro" title="@{repeating_psion-telepathy_$X_psiontelepathic-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
                                     </td>
                                 </tr>
                             </table>
@@ -12509,69 +12571,18 @@ <h4>Psychometabolism Sciences</h4>
                 <br>
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <h4>Clairsentient Devotions</h4>
-                        <fieldset name="repeating_psion-clairvoyance" class="repeating_psion-clairvoyance">
-                            <table class="sheet-table-white sheet-default-header-thead">
-                                <thead class="sheet-collapse sheet-show-first">
-                                <tr>
-                                    <th rowspan="2">Power name</th>
-                                    <th>Roll</th>
-                                    <th colspan="4" class="sheet-centering">Power Score</th>
-                                    <th></th>
-                                    <th colspan="2" class="sheet-centering">PSP Cost</th>
-                                    <th colspan="2" rowspan="2">Macro</th>
-                                </tr>
-                                <tr>
-                                    <th>Mod</th>
-                                    <th colspan="2" title="The ability score used by the power">Ability</th>
-                                    <th title="The modifier for the ability score">Mod</th>
-                                    <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
-                                    <th></th>
-                                    <th>Initial</th>
-                                    <th>Maint.</th>
-                                </tr>
-                            </thead>
-                                <tr>
-                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_psionclair" title="@{repeating_psion-clairvoyance_$X_psionclair}" class="sheet-maxtext-min" list="clairsentient-devotions"><span></span></td>
-                                    <td><input type="text" name="attr_psionic-mod8" title="@{repeating_psion-clairvoyance_$X_psionic-mod8}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod8" title="@{repeating_psion-clairvoyance_$X_powerscore-nomod8}" placeholder="@{}" class="sheet-cent-min" list="ability-scores-psi"><span></span></td>
-                                    <td>&plusmn;</td>
-                                    <td><input type="text" name="attr_powerscore-mod8" title="@{repeating_psion-clairvoyance_$X_powerscore-mod8}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-clairvoyance_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
-                                    <td><button type="roll" name="roll_Clair-Devotion" title="%{repeating_psion-clairvoyance_$X_Clair-Devotion}" value="@{action-check}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost28" title="@{repeating_psion-clairvoyance_$X_PSP-cost28}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-clairvoyance_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><button type="roll" name="roll_clairvoyance-macro" title="%{repeating_psion-clairvoyance_$X_clairvoyance-macro}" value="@{action-macro}">T</button></td>
-                                    <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
-                                </tr>
-                                <tr class="sheet-hidden sheet-fold">
-                                    <td colspan="100">
-                                        <textarea type="text" name="attr_psionclair-macro" title="@{repeating_psion-clairvoyance_$X_psionclair-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
-                                    </td>
-                                </tr>
-                            </table>
-                            <input type="hidden" name="attr_action-check" value="">
-                            <button type="action" name="act_action-check" style="display: none"></button>
-                            <button type="action" name="act_action-check-dm" style="display: none"></button>
-                            <input type="hidden" name="attr_action-macro" value="">
-                            <button type="action" name="act_action-macro" style="display: none"></button>
-                        </fieldset>
-                    </div>
-                    <div class="sheet-col">
-                        <h4>Clairsentient Sciences</h4>
-                        <fieldset name="repeating_psion-clairvoyance-science" class="repeating_psion-clairvoyance-science">
+                        <h4>Metapsionic Sciences</h4>
+                        <fieldset name="repeating_psion-metapsionic-science" class="repeating_psion-metapsionic-science">
                             <table class="sheet-table-white sheet-default-header-thead">
                                 <thead class="sheet-collapse sheet-show-first">
                                 <tr>
                                     <th rowspan="2">Power name</th>
-                                    <th>Roll</th>
                                     <th colspan="4" class="sheet-centering">Power Score</th>
                                     <th></th>
                                     <th colspan="2" class="sheet-centering">PSP Cost</th>
                                     <th colspan="2" rowspan="2">Macro</th>
                                 </tr>
                                 <tr>
-                                    <th>Mod</th>
                                     <th colspan="2" title="The ability score used by the power">Ability</th>
                                     <th title="The modifier for the ability score">Mod</th>
                                     <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
@@ -12579,23 +12590,22 @@ <h4>Clairsentient Sciences</h4>
                                     <th>Initial</th>
                                     <th>Maint.</th>
                                 </tr>
-                            </thead>
+                                </thead>
                                 <tr>
-                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_clair-science" title="@{repeating_psion-clairvoyance-science_$X_clair-science}" class="sheet-maxtext-min" list="clairsentient-sciences"><span></span></td>
-                                    <td><input type="text" name="attr_psionic-mod9" title="@{repeating_psion-clairvoyance-science_$X_psionic-mod9}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod9" title="@{repeating_psion-clairvoyance-science_$X_powerscore-nomod9}" placeholder="@{}" class="sheet-cent-min" list="ability-scores-psi"><span></span></td>
+                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_meta-science" title="@{repeating_psion-metapsionic-science_$X_meta-science}" class="sheet-maxtext-min" list="metapsionic-sciences"><span></span></td>
+                                    <td><input type="text" name="attr_powerscore-nomod13" title="@{repeating_psion-metapsionic-science_$X_powerscore-nomod13}" placeholder="@{}" class="sheet-track-min" list="ability-scores-psi"><span></span></td>
                                     <td>&plusmn;</td>
-                                    <td><input type="text" name="attr_powerscore-mod9" title="@{repeating_psion-clairvoyance-science_$X_powerscore-mod9}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-clairvoyance-science_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
-                                    <td><button type="roll" name="roll_Clair-Science" title="%{repeating_psion-clairvoyance-science_$X_Clair-Science}" value="@{action-check}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost29" title="@{repeating_psion-clairvoyance-science_$X_PSP-cost29}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-clairvoyance-science_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><button type="roll" name="roll_clairvoyance-science-macro" title="%{repeating_psion-clairvoyance-science_$X_clairvoyance-science-macro}" value="@{action-macro}">T</button></td>
+                                    <td><input type="text" name="attr_powerscore-mod13" title="@{repeating_psion-metapsionic-science_$X_powerscore-mod13}" placeholder="#" class="sheet-small" value="0"></td>
+                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-metapsionic-science_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
+                                    <td><button type="roll" name="roll_Meta-Science" title="%{repeating_psion-metapsionic-science_$X_Meta-Science}" value="@{action-check}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost33" title="@{repeating_psion-metapsionic-science_$X_PSP-cost33}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-metapsionic-science_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
+                                    <td><button type="roll" name="roll_metapsionic-science-macro" title="%{repeating_psion-metapsionic-science_$X_metapsionic-science-macro}" value="@{action-macro}">T</button></td>
                                     <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
                                 </tr>
                                 <tr class="sheet-hidden sheet-fold">
                                     <td colspan="100">
-                                        <textarea type="text" name="attr_psionclair-science-macro" title="@{repeating_psion-clairvoyance-science_$X_psionclair-science-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
+                                        <textarea type="text" name="attr_psionmeta-science-macro" title="@{repeating_psion-metapsionic-science_$X_psionmeta-science-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
                                     </td>
                                 </tr>
                             </table>
@@ -12606,9 +12616,6 @@ <h4>Clairsentient Sciences</h4>
                             <button type="action" name="act_action-macro" style="display: none"></button>
                         </fieldset>
                     </div>
-                </div>
-                <br>
-                <div class="sheet-2colrow">
                     <div class="sheet-col">
                         <h4>Metapsionic Devotions</h4>
                         <fieldset name="repeating_psion-metapsionics" class="repeating_psion-metapsionics">
@@ -12616,14 +12623,12 @@ <h4>Metapsionic Devotions</h4>
                                 <thead class="sheet-collapse sheet-show-first">
                                 <tr>
                                     <th rowspan="2">Power name</th>
-                                    <th>Roll</th>
                                     <th colspan="4" class="sheet-centering">Power Score</th>
                                     <th></th>
                                     <th colspan="2" class="sheet-centering">PSP Cost</th>
                                     <th colspan="2" rowspan="2">Macro</th>
                                 </tr>
                                 <tr>
-                                    <th>Mod</th>
                                     <th colspan="2" title="The ability score used by the power">Ability</th>
                                     <th title="The modifier for the ability score">Mod</th>
                                     <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
@@ -12631,11 +12636,10 @@ <h4>Metapsionic Devotions</h4>
                                     <th>Initial</th>
                                     <th>Maint.</th>
                                 </tr>
-                            </thead>
+                                </thead>
                                 <tr>
                                     <td class="sheet-td-dynamic100"><input type="text" name="attr_psionmeta" title="@{repeating_psion-metapsionics_$X_psionmeta}" class="sheet-maxtext-min" list="metapsionic-devotions"><span></span></td>
-                                    <td><input type="text" name="attr_psionic-mod12" title="@{repeating_psion-metapsionics_$X_psionic-mod12}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod12" title="@{repeating_psion-metapsionics_$X_powerscore-nomod12}" placeholder="@{}" class="sheet-cent-min" list="ability-scores-psi"><span></span></td>
+                                    <td><input type="text" name="attr_powerscore-nomod12" title="@{repeating_psion-metapsionics_$X_powerscore-nomod12}" placeholder="@{}" class="sheet-track-min" list="ability-scores-psi"><span></span></td>
                                     <td>&plusmn;</td>
                                     <td><input type="text" name="attr_powerscore-mod12" title="@{repeating_psion-metapsionics_$X_powerscore-mod12}" placeholder="#" class="sheet-small" value="0"></td>
                                     <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-metapsionics_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
@@ -12658,55 +12662,6 @@ <h4>Metapsionic Devotions</h4>
                             <button type="action" name="act_action-macro" style="display: none"></button>
                         </fieldset>
                     </div>
-                    <div class="sheet-col">
-                        <h4>Metapsionic Sciences</h4>
-                        <fieldset name="repeating_psion-metapsionic-science" class="repeating_psion-metapsionic-science">
-                            <table class="sheet-table-white sheet-default-header-thead">
-                                <thead class="sheet-collapse sheet-show-first">
-                                <tr>
-                                    <th rowspan="2">Power name</th>
-                                    <th>Roll</th>
-                                    <th colspan="4" class="sheet-centering">Power Score</th>
-                                    <th></th>
-                                    <th colspan="2" class="sheet-centering">PSP Cost</th>
-                                    <th colspan="2" rowspan="2">Macro</th>
-                                </tr>
-                                <tr>
-                                    <th>Mod</th>
-                                    <th colspan="2" title="The ability score used by the power">Ability</th>
-                                    <th title="The modifier for the ability score">Mod</th>
-                                    <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
-                                    <th></th>
-                                    <th>Initial</th>
-                                    <th>Maint.</th>
-                                </tr>
-                            </thead>
-                                <tr>
-                                    <td class="sheet-td-dynamic100"><input type="text" name="attr_meta-science" title="@{repeating_psion-metapsionic-science_$X_meta-science}" class="sheet-maxtext-min" list="metapsionic-sciences"><span></span></td>
-                                    <td><input type="text" name="attr_psionic-mod13" title="@{repeating_psion-metapsionic-science_$X_psionic-mod13}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod13" title="@{repeating_psion-metapsionic-science_$X_powerscore-nomod13}" placeholder="@{}" class="sheet-cent-min" list="ability-scores-psi"><span></span></td>
-                                    <td>&plusmn;</td>
-                                    <td><input type="text" name="attr_powerscore-mod13" title="@{repeating_psion-metapsionic-science_$X_powerscore-mod13}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-metapsionic-science_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
-                                    <td><button type="roll" name="roll_Meta-Science" title="%{repeating_psion-metapsionic-science_$X_Meta-Science}" value="@{action-check}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost33" title="@{repeating_psion-metapsionic-science_$X_PSP-cost33}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><input type="text" name="attr_PSP-cost-maintenance" title="@{repeating_psion-metapsionic-science_$X_PSP-cost-maintenance}" placeholder="#" class="sheet-minish"/></td>
-                                    <td><button type="roll" name="roll_metapsionic-science-macro" title="%{repeating_psion-metapsionic-science_$X_metapsionic-science-macro}" value="@{action-macro}">T</button></td>
-                                    <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
-                                </tr>
-                                <tr class="sheet-hidden sheet-fold">
-                                    <td colspan="100">
-                                        <textarea type="text" name="attr_psionmeta-science-macro" title="@{repeating_psion-metapsionic-science_$X_psionmeta-science-macro}" class="sheet-table-dynamic" placeholder="Macro"></textarea>
-                                    </td>
-                                </tr>
-                            </table>
-                            <input type="hidden" name="attr_action-check" value="">
-                            <button type="action" name="act_action-check" style="display: none"></button>
-                            <button type="action" name="act_action-check-dm" style="display: none"></button>
-                            <input type="hidden" name="attr_action-macro" value="">
-                            <button type="action" name="act_action-macro" style="display: none"></button>
-                        </fieldset>
-                    </div>
                 </div>
                 <br>
                 <div class="sheet-2colrow">
@@ -12717,14 +12672,12 @@ <h4>Attack Modes</h4>
                                 <thead class="sheet-collapse sheet-show-first">
                                 <tr>
                                     <th rowspan="2">Power name</th>
-                                    <th>Roll</th>
                                     <th colspan="4" class="sheet-centering">Power Score</th>
                                     <th></th>
                                     <th colspan="2" class="sheet-centering">PSP Cost</th>
                                     <th colspan="2" rowspan="2">Macro</th>
                                 </tr>
                                 <tr>
-                                    <th>Mod</th>
                                     <th colspan="2" title="The ability score used by the power">Ability</th>
                                     <th title="The modifier for the ability score">Mod</th>
                                     <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
@@ -12732,11 +12685,10 @@ <h4>Attack Modes</h4>
                                     <th>Initial</th>
                                     <th>Maint.</th>
                                 </tr>
-                            </thead>
+                                </thead>
                                 <tr>
                                     <td class="sheet-td-dynamic100"><input type="text" name="attr_psionattacking" title="@{repeating_psion-attack5_$X_psionattacking}" class="sheet-maxtext-min" list="psionic-attacks"><span></span></td>
-                                    <td><input type="text" name="attr_psionic-mod10" title="@{repeating_psion-attack5_$X_psionic-mod10}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod10" title="@{repeating_psion-attack5_$X_powerscore-nomod10}" placeholder="@{}" class="sheet-cent-min" list="ability-scores-psi"><span></span></td>
+                                    <td><input type="text" name="attr_powerscore-nomod10" title="@{repeating_psion-attack5_$X_powerscore-nomod10}" placeholder="@{}" class="sheet-track-min" list="ability-scores-psi"><span></span></td>
                                     <td>&plusmn;</td>
                                     <td><input type="text" name="attr_powerscore-mod10" title="@{repeating_psion-attack5_$X_powerscore-mod10}" placeholder="#" class="sheet-small" value="0"></td>
                                     <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-attack5_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
@@ -12766,14 +12718,12 @@ <h4>Defense Modes</h4>
                                 <thead class="sheet-collapse sheet-show-first">
                                 <tr>
                                     <th rowspan="2">Power name</th>
-                                    <th>Roll</th>
                                     <th colspan="4" class="sheet-centering">Power Score</th>
                                     <th></th>
                                     <th colspan="2" class="sheet-centering">PSP Cost</th>
                                     <th colspan="2" rowspan="2">Macro</th>
                                 </tr>
                                 <tr>
-                                    <th>Mod</th>
                                     <th colspan="2" title="The ability score used by the power">Ability</th>
                                     <th title="The modifier for the ability score">Mod</th>
                                     <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
@@ -12781,11 +12731,10 @@ <h4>Defense Modes</h4>
                                     <th>Initial</th>
                                     <th>Maint.</th>
                                 </tr>
-                            </thead>
+                                </thead>
                                 <tr>
                                     <td class="sheet-td-dynamic100"><input type="text" name="attr_psiondefending" title="@{repeating_psion-defense5_$X_psiondefending}" class="sheet-maxtext-min" list="psionic-defenses"><span></span></td>
-                                    <td><input type="text" name="attr_psionic-mod11" title="@{repeating_psion-defense5_$X_psionic-mod11}" placeholder="#" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod11" title="@{repeating_psion-defense5_$X_powerscore-nomod11}" placeholder="@{}" class="sheet-cent-min" list="ability-scores-psi"><span></span></td>
+                                    <td><input type="text" name="attr_powerscore-nomod11" title="@{repeating_psion-defense5_$X_powerscore-nomod11}" placeholder="@{}" class="sheet-track-min" list="ability-scores-psi"><span></span></td>
                                     <td>&plusmn;</td>
                                     <td><input type="text" name="attr_powerscore-mod11" title="@{repeating_psion-defense5_$X_powerscore-mod11}" placeholder="#" class="sheet-small" value="0"></td>
                                     <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_psion-defense5_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
@@ -12849,7 +12798,7 @@ <h4>Psionic Strength Points</h4>
                         </table>
                     </div>
                     <div class="sheet-col">
-                        <h4><b>Psionic Proficiencies</b></h4>
+                        <h4>Psionic Proficiencies</h4>
                         <table>
                             <tr>
                                 <td style="text-align: end;">Remaining: </td>
@@ -12884,7 +12833,7 @@ <h4><b>Psionic Proficiencies</b></h4>
                                     <td class="sheet-td-dynamic50"><input type="text" name="attr_psiprofstatnum" title="@{repeating_psiprofs_$X_psiprofstatnum}" placeholder="@{}" class="sheet-maxtext-min"></td>
                                     <td>&plusmn;</td>
                                     <td><input type="text" name="attr_psiprofmod" title="@{repeating_psiprofs_$X_psiprofmod}" value="0" class="sheet-minish"></td>
-                                    <td><button type="roll" name="roll_Psiprof" title="%{repeating_psiprofs_$X_Psiprof}" value="&{template:2Echeck} {{checkvs=@{psiprofname} Check}} {{character=@{character_name}}} {{checkroll=[[1d20cs1cf20]]}} {{checktarget=[[(@{psiprofstatnum})+(@{psiprofmod})+(@{misc-mod})]]}} {{color=dark-blue}}"></button></td>
+                                    <td><button type="roll" name="roll_Psiprof" title="%{repeating_psiprofs_$X_Psiprof}" value="&{template:2Echeck} {{checkvs=@{psiprofname} Check}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psiprofstatnum})+(@{psiprofmod})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                 </tr>
                             </table>
                         </fieldset>
@@ -12919,12 +12868,10 @@ <h4>Psionics Revised</h4>
                 <label>This section applies to the Player's Option: Skills & Powers and the Dark Sun Campaign Setting Revised Psionics.</label>
                 <br>
                 <br>
-            
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <h4><b>Telepathy Devotions</b></h4>
+                        <h4>Clairsentient Sciences</h4>
                         <table>
-            
                             <tr>
                                 <td class="sheet-default-header">Ability Name</td>
                                 <td class="sheet-default-header">MThAC0<br>Adj.</td>
@@ -12934,31 +12881,30 @@ <h4><b>Telepathy Devotions</b></h4>
                                 <td class="sheet-default-header">PSP<br>Cost</td>
                             </tr>
                             <tr>
-                                <td><input type="text" name="attr_psionic-telepathy-name" title="@{psionic-telepathy-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj2" title="@{mthac0adj2}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac" title="@{mac}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC02" title="@{MThAC02}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit1" title="%{mthac02-hit1}" value="/em hits a MAC of [[@{MThAC02}-(1d20+(@{mthac0adj2})+(@{misc-mod}))]]&le;[[@{mac}]] using their @{psionic-telepathy-name}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro3" title="@{psionic-macro3}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check" title="%{psionic-macro3-check}" value="@{psionic-macro3}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost3" title="@{PSP-cost3}" placeholder="#" class="sheet-small"/></td>
+                                <td><input type="text" name="attr_psionic-clairsentience-science-name" title="@{psionic-clairsentience-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                <td><input type="text" name="attr_mthac0adj11" title="@{mthac0adj11}" class="sheet-short" value="0"></td>
+                                <td><input type="text" name="attr_mac9" title="@{mac9}" class="sheet-small" value="10"></td>
+                                <td><input type="text" name="attr_MThAC011" title="@{MThAC011}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit1" title="%{mthac011-hit1}" value="/em hits a MAC of [[@{MThAC011}-(1d20+(@{mthac0adj11})+(@{misc-mod}))]]&le;[[@{mac9}]] using their @{psionic-clairsentience-science-name}"></button></td>
+                                <td><input type="text" name="attr_psionic-macro12" title="@{psionic-macro12}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check" title="%{psionic-macro12-check}" value="@{psionic-macro12}"></button></td>
+                                <td><input type="text" name="attr_PSP-cost12" title="@{PSP-cost12}" placeholder="#" class="sheet-small"/></td>
                             </tr>
                         </table>
-                        <fieldset name="repeating_psionic-telepathics" title="@{psionic-telepathics}" class="repeating_psionic-telepathics">
+                        <fieldset name="repeating_psionic-clairsentience-sciences" title="@{psionic-clairsentience-sciences}" class="repeating_psionic-clairsentience-sciences">
                             <table>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-telepathy-name" title="@{repeating_psionic-telepathics_$X_psionic-telepathy-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj2" title="@repeating_psionic-telepathics_$X_{mthac0adj2}" class="sheet-short" value="0"> &nbsp;</td>
-                                    <td><input type="text" name="attr_mac" title="@{repeating_psionic-telepathics_$X_mac}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC02" title="@{repeating_psionic-telepathics_$X_MThAC02}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit1" title="%{repeating_psionic-telepathics_$X_mthac02-hit1}" value="/em hits a MAC of [[@{MThAC02}-(1d20+(@{mthac0adj2})+(@{misc-mod}))]]&le;[[@{mac}]] using their @{psionic-telepathy-name}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro3" title="@{repeating_psionic-telepathics_$X_psionic-macro3}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check" title="%{repeating_psionic-telepathics_$X_psionic-macro3-check}" value="@{psionic-macro3}"></button>
-                                    <td><input type="text" name="attr_PSP-cost3" title="@{repeating_psionic-telepathics_$X_PSP-cost3}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-clairsentience-science-name" title="@{repeating_psionic-clairsentience-sciences_$X_psionic-clairsentience-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj11" title="@{repeating_psionic-clairsentience-sciences_$X_mthac0adj11}" class="sheet-short" value="0"> &nbsp;</td>
+                                    <td><input type="text" name="attr_mac9" title="@{repeating_psionic-clairsentience-sciences_$X_mac9}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC011" title="@{repeating_psionic-clairsentience-sciences_$X_MThAC011}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit1" title="%{repeating_psionic-clairsentience-sciences_$X_mthac011-hit1}" value="/em hits a MAC of [[@{MThAC011}-(1d20+(@{mthac0adj11})+(@{misc-mod}))]]&le;[[@{mac9}]] using their @{psionic-clairsentience-science-name}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro12" title="@{repeating_psionic-clairsentience-sciences_$X_psionic-macro12}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check" title="%{repeating_psionic-clairsentience-sciences_$X_psionic-macro12-check}" value="@{psionic-macro12}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost12" title="@{repeating_psionic-clairsentience-sciences_$X_PSP-cost12}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                             </table>
                         </fieldset>
                     </div>
                     <div class="sheet-col">
-                        <h4><b>Telepathy Sciences</b></h4>
+                        <h4>Clairsentient Devotions</h4>
                         <table>
-            
                             <tr>
                                 <td class="sheet-default-header">Ability Name</td>
                                 <td class="sheet-default-header">MThAC0<br>Adj.</td>
@@ -12968,23 +12914,23 @@ <h4><b>Telepathy Sciences</b></h4>
                                 <td class="sheet-default-header">PSP<br>Cost</td>
                             </tr>
                             <tr>
-                                <td><input type="text" name="attr_psionic-telepathy-science-name" title="@{psionic-telepathy-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj3" title="@{mthac0adj3}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac1" title="@{mac1}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC03" title="@{MThAC03}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit1" title="%{mthac03-hit1}" value="/em hits a MAC of [[@{MThAC03}-(1d20+(@{mthac0adj3})+(@{misc-mod}))]]&le;[[@{mac1}]] using their @{psionic-telepathy-science-name}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro4" title="@{psionic-macro4}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check" title="%{psionic-macro4-check}" value="@{psionic-macro4}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost4" title="@{PSP-cost4}" placeholder="#" class="sheet-small"/></td>
+                                <td><input type="text" name="attr_psionic-clairsentience-name" title="@{psionic-clairsentience-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                <td><input type="text" name="attr_mthac0adj10" title="@{mthac0adj10}" class="sheet-short" value="0"></td>
+                                <td><input type="text" name="attr_mac8" title="@{mac8}" class="sheet-small" value="10"></td>
+                                <td><input type="text" name="attr_MThAC010" title="@{MThAC010}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit1" title="%{mthac010-hit1}" value="/em hits a MAC of [[@{MThAC010}-(1d20+(@{mthac0adj10})+(@{misc-mod}))]]&le;[[@{mac8}]] using their @{psionic-clairsentience-name}"></button></td>
+                                <td><input type="text" name="attr_psionic-macro11" title="@{psionic-macro11}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check" title="%{psionic-macro11-check}" value="@{psionic-macro11}"></button></td>
+                                <td><input type="text" name="attr_PSP-cost11" title="@{PSP-cost11}" placeholder="#" class="sheet-small"/></td>
                             </tr>
                         </table>
-                        <fieldset name="repeating_psionic-telepathic-sciences" title="@{psionic-telepathic-sciences}" class="repeating_psionic-telepathic-sciences">
+                        <fieldset name="repeating_psionic-clairsentience" title="@{psionic-clairsentience}" class="repeating_psionic-clairsentience">
                             <table>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-telepathy-science-name" title="@{repeating_psionic-telepathic-sciences_$X_psionic-telepathy-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj3" title="@{repeating_psionic-telepathic-sciences_$X_mthac0adj3}" class="sheet-short" value="0"> &nbsp;</td>
-                                    <td><input type="text" name="attr_mac1" title="@{repeating_psionic-telepathic-sciences_$X_mac1}" class="sheet-small" value="0"></td>
-                                    <td><input type="text" name="attr_MThAC03" title="@{repeating_psionic-telepathic-sciences_$X_MThAC03}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit1" title="%{repeating_psionic-telepathic-sciences_$X_mthac03-hit1}" value="/em hits a MAC of [[@{MThAC03}-(1d20+(@{mthac0adj3})+(@{misc-mod}))]]&le;[[@{mac1}]] using their @{psionic-telepathy-science-name}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro4" title="@{repeating_psionic-telepathic-sciences_$X_psionic-macro4}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check" title="%{repeating_psionic-telepathic-sciences_$X_psionic-macro4-check}" value="@{psionic-macro4}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost4" title="@{repeating_psionic-telepathic-sciences_$X_PSP-cost4}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-clairsentience-name" title="@{repeating_psionic-clairsentience_$X_psionic-clairsentience-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj10" title="@{repeating_psionic-clairsentience_$X_mthac0adj10}" class="sheet-short" value="0"> &nbsp;</td>
+                                    <td><input type="text" name="attr_mac8" title="@{repeating_psionic-clairsentience_$X_mac8}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC010" title="@{repeating_psionic-clairsentience_$X_MThAC010}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit1" title="%{repeating_psionic-clairsentience_$X_mthac010-hit1}" value="/em hits a MAC of [[@{MThAC010}-(1d20+(@{mthac0adj10})+(@{misc-mod}))]]&le;[[@{mac8}]] using their @{psionic-clairsentience-name}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro11" title="@{repeating_psionic-clairsentience_$X_psionic-macro11}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check" title="%{repeating_psionic-clairsentience_$X_psionic-macro11-check}" value="@{psionic-macro11}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost11" title="@{repeating_psionic-clairsentience_$X_PSP-cost11}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                             </table>
                         </fieldset>
@@ -12993,9 +12939,41 @@ <h4><b>Telepathy Sciences</b></h4>
                 <br>
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <h4><b>Psychokinesis Devotions</b></h4>
+                        <h4>Psychokinetic Sciences</h4>
+                        <table>
+                            <tr>
+                                <td class="sheet-default-header">Ability Name</td>
+                                <td class="sheet-default-header">MThAC0<br>Adj.</td>
+                                <td class="sheet-default-header">MAC</td>
+                                <td class="sheet-default-header">MThAC0</td>
+                                <td class="sheet-default-header">Macro</td>
+                                <td class="sheet-default-header">PSP<br>Cost</td>
+                            </tr>
+                            <tr>
+                                <td><input type="text" name="attr_psionic-psychokinesis-science-name" title="@{psionic-psychokinesis-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                <td><input type="text" name="attr_mthac0adj5" title="@{mthac0adj5}" class="sheet-short" value="0"></td>
+                                <td><input type="text" name="attr_mac3" title="@{mac3}" class="sheet-small" value="10"></td>
+                                <td><input type="text" name="attr_MThAC05" title="@{MThAC05}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit1" title="%{mthac05-hit1}" value="/em hits a MAC of [[@{MThAC05}-(1d20+(@{mthac0adj5})+(@{misc-mod}))]]&le;[[@{mac3}]] using their @{psionic-psychokinesis-science-name}"></button></td>
+                                <td><input type="text" name="attr_psionic-macro6" title="@{psionic-macro6}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check" title="%{psionic-macro6-check}" value="@{psionic-macro6}"></button></td>
+                                <td><input type="text" name="attr_PSP-cost6" title="@{PSP-cost6}" placeholder="#" class="sheet-small"/></td>
+                            </tr>
+                        </table>
+                        <fieldset name="repeating_psionic-psychokinesis-sciences" title="@{psionic-psychokinesis-sciences}" class="repeating_psionic-psychokinesis-sciences">
+                            <table>
+                                <tr>
+                                    <td><input type="text" name="attr_psionic-psychokinesis-science-name" title="@{repeating_psionic-psychokinesis-sciences_$X_psionic-psychokinesis-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj5" title="@{repeating_psionic-psychokinesis-sciences_$X_mthac0adj5}" class="sheet-short" value="0"> &nbsp;</td>
+                                    <td><input type="text" name="attr_mac3" title="@{repeating_psionic-psychokinesis-sciences_$X_mac3}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC05" title="@{repeating_psionic-psychokinesis-sciences_$X_MThAC05}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit1" title="%{repeating_psionic-psychokinesis-sciences_$X_mthac05-hit1}" value="/em hits a MAC of [[@{MThAC05}-(1d20+(@{mthac0adj5})+(@{misc-mod}))]]&le;[[@{mac3}]] using their @{psionic-psychokinesis-science-name}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro6" title="@{repeating_psionic-psychokinesis-sciences_$X_psionic-macro6}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check" title="%{repeating_psionic-psychokinesis-sciences_$X_psionic-macro6-check}" value="@{psionic-macro6}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost6" title="@{repeating_psionic-psychokinesis-sciences_$X_PSP-cost6}" placeholder="#" class="sheet-small"/></td>
+                                </tr>
+                            </table>
+                        </fieldset>
+                    </div>
+                    <div class="sheet-col">
+                        <h4>Psychokinetic Devotions</h4>
                         <table>
-            
                             <tr>
                                 <td class="sheet-default-header">Ability Name</td>
                                 <td class="sheet-default-header">MThAC0<br>Adj.</td>
@@ -13010,7 +12988,7 @@ <h4><b>Psychokinesis Devotions</b></h4>
                                 <td><input type="text" name="attr_mac2" title="@{mac2}" class="sheet-small" value="10"></td>
                                 <td><input type="text" name="attr_MThAC04" title="@{MThAC04}" class="sheet-small" value="20"><button type="roll" name="roll_mthac04-hit1" title="%{mthac04-hit1}" value="/em hits a MAC of [[@{MThAC04}-(1d20+(@{mthac0adj4})+(@{misc-mod}))]]&le;[[@{mac2}]] using their @{psionic-psychokinesis-name}"></button></td>
                                 <td><input type="text" name="attr_psionic-macro5" title="@{psionic-macro5}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro5-check" title="%{psionic-macro5-check}" value="@{psionic-macro5}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost4" title="@{PSP-cost5}" placeholder="#" class="sheet-small"/></td>
+                                <td><input type="text" name="attr_PSP-cost5" title="@{PSP-cost5}" placeholder="#" class="sheet-small"/></td>
                             </tr>
                         </table>
                         <fieldset name="repeating_psionic-psychokinesis" title="@{psionic-psychokinesis}" class="repeating_psionic-psychokinesis">
@@ -13026,10 +13004,12 @@ <h4><b>Psychokinesis Devotions</b></h4>
                             </table>
                         </fieldset>
                     </div>
+                </div>
+                <br>
+                <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <h4><b>Psychokinesis Sciences</b></h4>
+                        <h4>Psychometabolic Sciences</h4>
                         <table>
-            
                             <tr>
                                 <td class="sheet-default-header">Ability Name</td>
                                 <td class="sheet-default-header">MThAC0<br>Adj.</td>
@@ -13039,34 +13019,30 @@ <h4><b>Psychokinesis Sciences</b></h4>
                                 <td class="sheet-default-header">PSP<br>Cost</td>
                             </tr>
                             <tr>
-                                <td><input type="text" name="attr_psionic-psychokinesis-science-name" title="@{psionic-psychokinesis-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj5" title="@{mthac0adj5}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac3" title="@{mac3}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC05" title="@{MThAC05}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit1" title="%{mthac05-hit1}" value="/em hits a MAC of [[@{MThAC05}-(1d20+(@{mthac0adj5})+(@{misc-mod}))]]&le;[[@{mac3}]] using their @{psionic-psychokinesis-science-name}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro6" title="@{psionic-macro6}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check" title="%{psionic-macro6-check}" value="@{psionic-macro6}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost6" title="@{PSP-cost6}" placeholder="#" class="sheet-small"/></td>
+                                <td><input type="text" name="attr_psionic-psychometabolism-science-name" title="@{psionic-psychometabolism-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                <td><input type="text" name="attr_mthac0adj9" title="@{mthac0adj9}" class="sheet-short" value="0"></td>
+                                <td><input type="text" name="attr_mac7" title="@{mac7}" class="sheet-small" value="10"></td>
+                                <td><input type="text" name="attr_MThAC09" title="@{MThAC09}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit1" title="%{mthac09-hit1}" value="/em hits a MAC of [[@{MThAC09}-(1d20+(@{mthac0adj9})+(@{misc-mod}))]]&le;[[@{mac7}]] using their @{psionic-psychometabolism-science-name}"></button></td>
+                                <td><input type="text" name="attr_psionic-macro10" title="@{psionic-macro10}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check" title="%{psionic-macro10-check}" value="@{psionic-macro10}"></button></td>
+                                <td><input type="text" name="attr_PSP-cost10" title="@{PSP-cost10}" placeholder="#" class="sheet-small"/></td>
                             </tr>
                         </table>
-                        <fieldset name="repeating_psionic-psychokinesis-sciences" title="@{psionic-psychokinesis-sciences}" class="repeating_psionic-psychokinesis-sciences">
+                        <fieldset name="repeating_psionic-psychometabolic-sciences" title="@{psionic-psychometabolic-sciences}" class="repeating_psionic-psychometabolic-sciences">
                             <table>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-psychokinesis-science-name" title="@{repeating_psionic_psychokinesis-sciences_$X_psionic-psychokinesis-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj5" title="@{repeating_psionic_psychokinesis-sciences_$X_mthac0adj5}" class="sheet-short" value="0"> &nbsp;</td>
-                                    <td><input type="text" name="attr_mac3" title="@{repeating_psionic_psychokinesis-sciences_$X_mac3}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC05" title="@{repeating_psionic_psychokinesis-sciences_$X_MThAC05}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit1" title="%{repeating_psionic_psychokinesis-sciences_$X_mthac05-hit1}" value="/em hits a MAC of [[@{MThAC05}-(1d20+(@{mthac0adj5})+(@{misc-mod}))]]&le;[[@{mac3}]] using their @{psionic-psychokinesis-science-name}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro6" title="@{repeating_psionic_psychokinesis-sciences_$X_psionic-macro6}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check" title="%{repeating_psionic_psychokinesis-sciences_$X_psionic-macro6-check}" value="@{psionic-macro6}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost6" title="@{repeating_psionic_psychokinesis-sciences_$X_PSP-cost6}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-psychometabolism-science-name" title="@{repeating_psionic-psychometabolic-sciences_$X_psionic-psychometabolism-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj9" title="@{repeating_psionic-psychometabolic-sciences_$X_mthac0adj9}" class="sheet-short" value="0"> &nbsp;</td>
+                                    <td><input type="text" name="attr_mac7" title="@{repeating_psionic-psychometabolic-sciences_$X_mac7}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC09" title="@{repeating_psionic-psychometabolic-sciences_$X_MThAC09}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit1" title="%{repeating_psionic-psychometabolic-sciences_$X_mthac09-hit1}" value="/em hits a MAC of [[@{MThAC09}-(1d20+(@{mthac0adj9})+(@{misc-mod}))]]&le;[[@{mac7}]] using their @{psionic-psychometabolism-science-name}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro10" title="@{repeating_psionic-psychometabolic-sciences_$X_psionic-macro10}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check" title="%{repeating_psionic-psychometabolic-sciences_$X_psionic-macro10-check}" value="@{psionic-macro10}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost10" title="@{repeating_psionic-psychometabolic-sciences_$X_PSP-cost10}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                             </table>
                         </fieldset>
                     </div>
-                </div>
-                <br>
-                <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <h4><b>Psychoportive Devotions</b></h4>
+                        <h4>Psychometabolic Devotions</h4>
                         <table>
-            
                             <tr>
                                 <td class="sheet-default-header">Ability Name</td>
                                 <td class="sheet-default-header">MThAC0<br>Adj.</td>
@@ -13076,31 +13052,33 @@ <h4><b>Psychoportive Devotions</b></h4>
                                 <td class="sheet-default-header">PSP<br>Cost</td>
                             </tr>
                             <tr>
-                                <td><input type="text" name="attr_psionic-psychoportation-name" title="@{psionic-psychoportation-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj6" title="@{mthac0adj6}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac4" title="@{mac4}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC06" title="@{MThAC06}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit1" title="%{mthac06-hit1}" value="/em hits a MAC of [[@{MThAC06}-(1d20+(@{mthac0adj6})+(@{misc-mod}))]]&le;[[@{mac4}]] using their @{psionic-psychoportation-name}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro7" title="@{psionic-macro7}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check" title="%{psionic-macro7-check}" value="@{psionic-macro7}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost7" title="@{PSP-cost7}" placeholder="#" class="sheet-small"/></td>
+                                <td><input type="text" name="attr_psionic-psychometabolism-name" title="@{psionic-psychometabolism-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                <td><input type="text" name="attr_mthac0adj8" title="@{mthac0adj8}" class="sheet-short" value="0"></td>
+                                <td><input type="text" name="attr_mac6" title="@{mac6}" class="sheet-small" value="10"></td>
+                                <td><input type="text" name="attr_MThAC08" title="@{MThAC08}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit1" title="%{mthac08-hit1}" value="/em hits a MAC of [[@{MThAC08}-(1d20+(@{mthac0adj8})+(@{misc-mod}))]]&le;[[@{mac6}]] using their @{psionic-psychometabolism-name}"></button></td>
+                                <td><input type="text" name="attr_psionic-macro9" title="@{psionic-macro9}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check" title="%{psionic-macro9-check}" value="@{psionic-macro9}"></button></td>
+                                <td><input type="text" name="attr_PSP-cost9" title="@{PSP-cost9}" placeholder="#" class="sheet-small"/></td>
                             </tr>
                         </table>
-                        <fieldset name="repeating_psionic-psychoportive" title="@{psionic-psychoportive}" class="repeating_psionic-psychoportive">
+                        <fieldset name="repeating_psionic-psychometabolics" title="@{psionic-psychometabolics}" class="repeating_psionic-psychometabolics">
                             <table>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-psychoportation-name" title="@{repeating_psionic-psychoportive_$X_psionic-psychoportation-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj6" title="@{repeating_psionic-psychoportive_$X_mthac0adj6}" class="sheet-short" value="0"> &nbsp;</td>
-                                    <td><input type="text" name="attr_mac4" title="@{repeating_psionic-psychoportive_$X_mac4}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC06" title="@{repeating_psionic-psychoportive_$X_MThAC06}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit1" title="%{repeating_psionic-psychoportive_$X_mthac06-hit1}" value="/em hits a MAC of [[@{MThAC06}-(1d20+(@{mthac0adj6})+(@{misc-mod}))]]&le;[[@{mac4}]] using their @{psionic-psychoportation-name}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro7" title="@{repeating_psionic-psychoportive_$X_psionic-macro7}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check" title="%{repeating_psionic-psychoportive_$X_psionic-macro7-check}" value="@{psionic-macro7}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost7" title="@{repeating_psionic-psychoportive_$X_PSP-cost7}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-psychometabolism-name" title="@{repeating_psionic-psychometabolics_$X_psionic-psychometabolism-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj8" title="@{repeating_psionic-psychometabolics_$X_mthac0adj8}" class="sheet-short" value="0"> &nbsp;</td>
+                                    <td><input type="text" name="attr_mac6" title="@{repeating_psionic-psychometabolics_$X_mac6}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC08" title="@{repeating_psionic-psychometabolics_$X_MThAC08}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit1" title="%{repeating_psionic-psychometabolics_$X_mthac08-hit1}" value="/em hits a MAC of [[@{MThAC08}-(1d20+(@{mthac0adj8})+(@{misc-mod}))]]&le;[[@{mac6}]] using their @{psionic-psychometabolism-name}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro9" title="@{repeating_psionic-psychometabolics_$X_psionic-macro9}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check" title="%{repeating_psionic-psychometabolics_$X_psionic-macro9-check}" value="@{psionic-macro9}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost9" title="@{repeating_psionic-psychometabolics_$X_PSP-cost9}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                             </table>
                         </fieldset>
                     </div>
+                </div>
+                <br>
+                <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <h4><b>Psychoportive Sciences</b></h4>
+                        <h4>Psychoportive Sciences</h4>
                         <table>
-            
                             <tr>
                                 <td class="sheet-default-header">Ability Name</td>
                                 <td class="sheet-default-header">MThAC0<br>Adj.</td>
@@ -13125,19 +13103,15 @@ <h4><b>Psychoportive Sciences</b></h4>
                                     <td><input type="text" name="attr_mthac0adj7" title="@{repeating_psionic-psychoportive-sciences_$X_mthac0adj7}" class="sheet-short" value="0"> &nbsp;</td>
                                     <td><input type="text" name="attr_mac5" title="@{repeating_psionic-psychoportive-sciences_$X_mac5}" class="sheet-small" value="10"></td>
                                     <td><input type="text" name="attr_MThAC07" title="@{repeating_psionic-psychoportive-sciences_$X_MThAC07}" class="sheet-small" value="20"><button type="roll" name="roll_mthac07-hit1" title="%{repeating_psionic-psychoportive-sciences_$X_mthac07-hit1}" value="/em hits a MAC of [[@{MThAC07}-(1d20+(@{mthac0adj7})+(@{misc-mod}))]]&le;[[@{mac5}]] using their @{psionic-psychoportation-science-name}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro8" title="@{repeating_psionic-psychoportive-sciences_$X_psionic-macro6}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro8-check" title="%{repeating_psionic-psychoportive-sciences_$X_psionic-macro8-check}" value="@{psionic-macro8}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro8" title="@{repeating_psionic-psychoportive-sciences_$X_psionic-macro8}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro8-check" title="%{repeating_psionic-psychoportive-sciences_$X_psionic-macro8-check}" value="@{psionic-macro8}"></button></td>
                                     <td><input type="text" name="attr_PSP-cost8" title="@{repeating_psionic-psychoportive-sciences_$X_PSP-cost8}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                             </table>
                         </fieldset>
                     </div>
-                </div>
-                <br>
-                <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <h4><b>Psychometabolism Devotions</b></h4>
+                        <h4>Psychoportive Devotions</h4>
                         <table>
-            
                             <tr>
                                 <td class="sheet-default-header">Ability Name</td>
                                 <td class="sheet-default-header">MThAC0<br>Adj.</td>
@@ -13147,57 +13121,23 @@ <h4><b>Psychometabolism Devotions</b></h4>
                                 <td class="sheet-default-header">PSP<br>Cost</td>
                             </tr>
                             <tr>
-                                <td><input type="text" name="attr_psionic-psychometabolism-name" title="@{psionic-psychometabolism-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj8" title="@{mthac0adj8}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac6" title="@{mac6}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC08" title="@{MThAC08}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit1" title="%{mthac08-hit1}" value="/em hits a MAC of [[@{MThAC08}-(1d20+(@{mthac0adj8})+(@{misc-mod}))]]&le;[[@{mac6}]] using their @{psionic-psychometabolism-name}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro9" title="@{psionic-macro9}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check" title="%{psionic-macro9-check}" value="@{psionic-macro9}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost9" title="@{PSP-cost9}" placeholder="#" class="sheet-small"/></td>
+                                <td><input type="text" name="attr_psionic-psychoportation-name" title="@{psionic-psychoportation-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                <td><input type="text" name="attr_mthac0adj6" title="@{mthac0adj6}" class="sheet-short" value="0"></td>
+                                <td><input type="text" name="attr_mac4" title="@{mac4}" class="sheet-small" value="10"></td>
+                                <td><input type="text" name="attr_MThAC06" title="@{MThAC06}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit1" title="%{mthac06-hit1}" value="/em hits a MAC of [[@{MThAC06}-(1d20+(@{mthac0adj6})+(@{misc-mod}))]]&le;[[@{mac4}]] using their @{psionic-psychoportation-name}"></button></td>
+                                <td><input type="text" name="attr_psionic-macro7" title="@{psionic-macro7}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check" title="%{psionic-macro7-check}" value="@{psionic-macro7}"></button></td>
+                                <td><input type="text" name="attr_PSP-cost7" title="@{PSP-cost7}" placeholder="#" class="sheet-small"/></td>
                             </tr>
                         </table>
-                        <fieldset name="repeating_psionic-psychometabolics" title="@{psionic-psychometabolics}" class="repeating_psionic-psychometabolics">
+                        <fieldset name="repeating_psionic-psychoportive" title="@{psionic-psychoportive}" class="repeating_psionic-psychoportive">
                             <table>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-psychometabolism-name" title="@{repeating_psionic-pschometabolics_$X_psionic-psychometabolism-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj8" title="@{repeating_psionic-pschometabolics_$X_mthac0adj8}" class="sheet-short" value="0"> &nbsp;</td>
-                                    <td><input type="text" name="attr_mac6" title="@{repeating_psionic-pschometabolics_$X_mac6}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC08" title="@{repeating_psionic-pschometabolics_$X_MThAC08}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit1" title="%{repeating_psionic-pschometabolics_$X_mthac08-hit1}" value="/em hits a MAC of [[@{MThAC08}-(1d20+(@{mthac0adj8})+(@{misc-mod}))]]&le;[[@{mac6}]] using their @{psionic-psychometabolism-name}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro9" title="@{repeating_psionic-pschometabolics_$X_psionic-macro9}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check" title="%{repeating_psionic-pschometabolics_$X_psionic-macro9-check}" value="@{psionic-macro9}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost9" title="@{repeating_psionic-pschometabolics_$X_PSP-cost9}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </fieldset>
-                    </div>
-                    <div class="sheet-col">
-                        <h4><b>Psychometabolism Sciences</b></h4>
-                        <table>
-            
-                            <tr>
-                                <td class="sheet-default-header">Ability Name</td>
-                                <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                <td class="sheet-default-header">MAC</td>
-                                <td class="sheet-default-header">MThAC0</td>
-                                <td class="sheet-default-header">Macro</td>
-                                <td class="sheet-default-header">PSP<br>Cost</td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychometabolism-science-name" title="@{psionic-psychometabolism-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj9" title="@{mthac0adj9}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac7" title="@{mac7}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC09" title="@{MThAC09}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit1" title="%{mthac09-hit1}" value="/em hits a MAC of [[@{MThAC09}-(1d20+(@{mthac0adj9})+(@{misc-mod}))]]&le;[[@{mac7}]] using their @{psionic-psychometabolism-science-name}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro10" title="@{psionic-macro10}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check" title="%{psionic-macro10-check}" value="@{psionic-macro10}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost10" title="@{PSP-cost10}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                        </table>
-                        <fieldset name="repeating_psionic-psychometabolic-sciences" title="@{psionic-psychometabolic-sciences}" class="repeating_psionic-psychometabolic-sciences">
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychometabolism-science-name" title="@{repeating_psychometabolic-sciences_$X_psionic-psychometabolism-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj9" title="@{repeating_psychometabolic-sciences_$X_mthac0adj9}" class="sheet-short" value="0"> &nbsp;</td>
-                                    <td><input type="text" name="attr_mac7" title="@{repeating_psychometabolic-sciences_$X_mac7}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC09" title="@{repeating_psychometabolic-sciences_$X_MThAC09}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit1" title="%{repeating_psychometabolic-sciences_$X_mthac09-hit1}" value="/em hits a MAC of [[@{MThAC09}-(1d20+(@{mthac0adj9})+(@{misc-mod}))]]&le;[[@{mac7}]] using their @{psionic-psychometabolism-science-name}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro10" title="@{repeating_psychometabolic-sciences_$X_psionic-macro10}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check" title="%{repeating_psychometabolic-sciences_$X_psionic-macro10-check}" value="@{psionic-macro10}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost10" title="@{repeating_psychometabolic-sciences_$X_PSP-cost10}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-psychoportation-name" title="@{repeating_psionic-psychoportive_$X_psionic-psychoportation-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj6" title="@{repeating_psionic-psychoportive_$X_mthac0adj6}" class="sheet-short" value="0"> &nbsp;</td>
+                                    <td><input type="text" name="attr_mac4" title="@{repeating_psionic-psychoportive_$X_mac4}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC06" title="@{repeating_psionic-psychoportive_$X_MThAC06}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit1" title="%{repeating_psionic-psychoportive_$X_mthac06-hit1}" value="/em hits a MAC of [[@{MThAC06}-(1d20+(@{mthac0adj6})+(@{misc-mod}))]]&le;[[@{mac4}]] using their @{psionic-psychoportation-name}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro7" title="@{repeating_psionic-psychoportive_$X_psionic-macro7}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check" title="%{repeating_psionic-psychoportive_$X_psionic-macro7-check}" value="@{psionic-macro7}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost7" title="@{repeating_psionic-psychoportive_$X_PSP-cost7}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                             </table>
                         </fieldset>
@@ -13206,9 +13146,8 @@ <h4><b>Psychometabolism Sciences</b></h4>
                 <br>
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <h4><b>Clairsentient Devotions</b></h4>
+                        <h4>Telepathic Sciences</h4>
                         <table>
-            
                             <tr>
                                 <td class="sheet-default-header">Ability Name</td>
                                 <td class="sheet-default-header">MThAC0<br>Adj.</td>
@@ -13218,31 +13157,30 @@ <h4><b>Clairsentient Devotions</b></h4>
                                 <td class="sheet-default-header">PSP<br>Cost</td>
                             </tr>
                             <tr>
-                                <td><input type="text" name="attr_psionic-clairsentience-name" title="@{psionic-clairsentience-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj10" title="@{mthac0adj10}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac8" title="@{mac8}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC010" title="@{MThAC010}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit1" title="%{mthac010-hit1}" value="/em hits a MAC of [[@{MThAC010}-(1d20+(@{mthac0adj10})+(@{misc-mod}))]]&le;[[@{mac8}]] using their @{psionic-clairsentience-name}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro11" title="@{psionic-macro11}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check" title="%{psionic-macro11-check}" value="@{psionic-macro11}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost11" title="@{PSP-cost11}" placeholder="#" class="sheet-small"/></td>
+                                <td><input type="text" name="attr_psionic-telepathy-science-name" title="@{psionic-telepathy-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                <td><input type="text" name="attr_mthac0adj3" title="@{mthac0adj3}" class="sheet-short" value="0"></td>
+                                <td><input type="text" name="attr_mac1" title="@{mac1}" class="sheet-small" value="10"></td>
+                                <td><input type="text" name="attr_MThAC03" title="@{MThAC03}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit1" title="%{mthac03-hit1}" value="/em hits a MAC of [[@{MThAC03}-(1d20+(@{mthac0adj3})+(@{misc-mod}))]]&le;[[@{mac1}]] using their @{psionic-telepathy-science-name}"></button></td>
+                                <td><input type="text" name="attr_psionic-macro4" title="@{psionic-macro4}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check" title="%{psionic-macro4-check}" value="@{psionic-macro4}"></button></td>
+                                <td><input type="text" name="attr_PSP-cost4" title="@{PSP-cost4}" placeholder="#" class="sheet-small"/></td>
                             </tr>
                         </table>
-                        <fieldset name="repeating_psionic-clairsentience" title="@{psionic-clairsentience}" class="repeating_psionic-clairsentience">
+                        <fieldset name="repeating_psionic-telepathic-sciences" title="@{psionic-telepathic-sciences}" class="repeating_psionic-telepathic-sciences">
                             <table>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-clairsentience-name" title="@{repeating_psionic_clairsentience_$X_psionic-clairentience-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj10" title="@{repeating_psionic_clairsentience_$X_mthac0adj10}" class="sheet-short" value="0"> &nbsp;</td>
-                                    <td><input type="text" name="attr_mac8" title="@{repeating_psionic_clairsentience_$X_mac8}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC010" title="@repeating_psionic_clairsentience_$X_{MThAC010}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit1" title="%{repeating_psionic_clairsentience_$X_mthac010-hit1}" value="/em hits a MAC of [[@{MThAC010}-(1d20+(@{mthac0adj10})+(@{misc-mod}))]]&le;[[@{mac8}]] using their @{psionic-clairsentience-name}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro11" title="@{repeating_psionic_clairsentience_$X_psionic-macro11}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check" title="%{repeating_psionic_clairsentience_$X_psionic-macro11-check}" value="@{psionic-macro11}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost11" title="@{repeating_psionic_clairsentience_$X_PSP-cost11}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-telepathy-science-name" title="@{repeating_psionic-telepathic-sciences_$X_psionic-telepathy-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj3" title="@{repeating_psionic-telepathic-sciences_$X_mthac0adj3}" class="sheet-short" value="0"> &nbsp;</td>
+                                    <td><input type="text" name="attr_mac1" title="@{repeating_psionic-telepathic-sciences_$X_mac1}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC03" title="@{repeating_psionic-telepathic-sciences_$X_MThAC03}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit1" title="%{repeating_psionic-telepathic-sciences_$X_mthac03-hit1}" value="/em hits a MAC of [[@{MThAC03}-(1d20+(@{mthac0adj3})+(@{misc-mod}))]]&le;[[@{mac1}]] using their @{psionic-telepathy-science-name}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro4" title="@{repeating_psionic-telepathic-sciences_$X_psionic-macro4}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check" title="%{repeating_psionic-telepathic-sciences_$X_psionic-macro4-check}" value="@{psionic-macro4}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost4" title="@{repeating_psionic-telepathic-sciences_$X_PSP-cost4}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                             </table>
                         </fieldset>
                     </div>
                     <div class="sheet-col">
-                        <h4><b>Clairsentient Sciences</b></h4>
+                        <h4>Telepathic Devotions</h4>
                         <table>
-            
                             <tr>
                                 <td class="sheet-default-header">Ability Name</td>
                                 <td class="sheet-default-header">MThAC0<br>Adj.</td>
@@ -13252,40 +13190,39 @@ <h4><b>Clairsentient Sciences</b></h4>
                                 <td class="sheet-default-header">PSP<br>Cost</td>
                             </tr>
                             <tr>
-                                <td><input type="text" name="attr_psionic-clairsentience-science-name" title="@{psionic-clairsentience-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj11" title="@{mthac0adj11}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac9" title="@{mac9}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC011" title="@{MThAC011}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit1" title="%{mthac011-hit1}" value="/em hits a MAC of [[@{MThAC011}-(1d20+(@{mthac0adj11})+(@{misc-mod}))]]&le;[[@{mac9}]] using their @{psionic-clairsentience-science-name}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro12" title="@{psionic-macro12}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check" title="%{psionic-macro12-check}" value="@{psionic-macro12}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost12" title="@{PSP-cost12}" placeholder="#" class="sheet-small"/></td>
+                                <td><input type="text" name="attr_psionic-telepathy-name" title="@{psionic-telepathy-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                <td><input type="text" name="attr_mthac0adj2" title="@{mthac0adj2}" class="sheet-short" value="0"></td>
+                                <td><input type="text" name="attr_mac" title="@{mac}" class="sheet-small" value="10"></td>
+                                <td><input type="text" name="attr_MThAC02" title="@{MThAC02}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit1" title="%{mthac02-hit1}" value="/em hits a MAC of [[@{MThAC02}-(1d20+(@{mthac0adj2})+(@{misc-mod}))]]&le;[[@{mac}]] using their @{psionic-telepathy-name}"></button></td>
+                                <td><input type="text" name="attr_psionic-macro3" title="@{psionic-macro3}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check" title="%{psionic-macro3-check}" value="@{psionic-macro3}"></button></td>
+                                <td><input type="text" name="attr_PSP-cost3" title="@{PSP-cost3}" placeholder="#" class="sheet-small"/></td>
                             </tr>
                         </table>
-                        <fieldset name="repeating_psionic-clairsentience-sciences" title="@{psionic-clairsentience-sciences}" class="repeating_psionic-clairsentience-sciences">
+                        <fieldset name="repeating_psionic-telepathics" title="@{psionic-telepathics}" class="repeating_psionic-telepathics">
                             <table>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-clairsentience-science-name" title="@{repeating_psionic-clairsentience-sciences_$X_psionic-clairsentience-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj11" title="@{repeating_psionic-clairsentience-sciences_$X_mthac0adj11}" class="sheet-short" value="0"> &nbsp;</td>
-                                    <td><input type="text" name="attr_mac9" title="@{repeating_psionic-clairsentience-sciences_$X_mac9}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC011" title="@{repeating_psionic-clairsentience-sciences_$X_MThAC011}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit1" title="%{repeating_psionic-clairsentience-sciences_$X_mthac011-hit1}" value="/em hits a MAC of [[@{MThAC011}-(1d20+(@{mthac0adj11})+(@{misc-mod}))]]&le;[[@{mac9}]] using their @{psionic-clairsentience-science-name}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro12" title="@{repeating_psionic-clairsentience-sciences_$X_psionic-macro12}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check" title="%{repeating_psionic-clairsentience-sciences_$X_psionic-macro12-check}" value="@{psionic-macro12}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost12" title="@{repeating_psionic-clairsentience-sciences_$X_PSP-cost12}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-telepathy-name" title="@{repeating_psionic-telepathics_$X_psionic-telepathy-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj2" title="@{repeating_psionic-telepathics_$X_mthac0adj2}" class="sheet-short" value="0"> &nbsp;</td>
+                                    <td><input type="text" name="attr_mac" title="@{repeating_psionic-telepathics_$X_mac}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC02" title="@{repeating_psionic-telepathics_$X_MThAC02}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit1" title="%{repeating_psionic-telepathics_$X_mthac02-hit1}" value="/em hits a MAC of [[@{MThAC02}-(1d20+(@{mthac0adj2})+(@{misc-mod}))]]&le;[[@{mac}]] using their @{psionic-telepathy-name}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro3" title="@{repeating_psionic-telepathics_$X_psionic-macro3}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check" title="%{repeating_psionic-telepathics_$X_psionic-macro3-check}" value="@{psionic-macro3}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost3" title="@{repeating_psionic-telepathics_$X_PSP-cost3}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                             </table>
                         </fieldset>
                     </div>
                 </div>
                 <br>
-                <h4><b>Psionic Attack Modes</b></h4>
-                <table>
-            
+                <h4>Psionic Attack Modes</h4>
+                <table class="sheet-default-header-first-row">
                     <tr>
-                        <td class="sheet-default-header">Attack Name</td>
-                        <td class="sheet-default-header">Attack<br>Speed</td>
-                        <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                        <td class="sheet-default-header">MThAC0</td>
-                        <td class="sheet-default-header">Damage</td>
-                        <td class="sheet-default-header">Macro</td>
-                        <td class="sheet-default-header">PSP<br>Cost</td>
+                        <td>Attack Name</td>
+                        <td>Attack<br>Speed</td>
+                        <td>MThAC0<br>Adj.</td>
+                        <td>MThAC0</td>
+                        <td>Damage</td>
+                        <td>Macro</td>
+                        <td>PSP<br>Cost</td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_psionic-attack-name" title="@{psionic-attack-name}" class="sheet-display" placeholder="Ability Name"/></td>
@@ -13313,13 +13250,12 @@ <h4><b>Psionic Attack Modes</b></h4>
                 <br>
                 <div class="sheet-3colrow">
                     <div class="sheet-col">
-                        <h4><b>Psionic Defense Modes</b></h4>
-                        <table>
-            
+                        <h4>Psionic Defense Modes</h4>
+                        <table class="sheet-default-header-first-row">
                             <tr>
-                                <td class="sheet-default-header">Attack Name</td>
-                                <td class="sheet-default-header">Macro</td>
-                                <td class="sheet-default-header">PSP<br>Cost</td>
+                                <td>Attack Name</td>
+                                <td>Macro</td>
+                                <td>PSP<br>Cost</td>
                             </tr>
                             <tr>
                                 <td><input type="text" name="attr_psionic-defense-name" title="@{psionic-defense-name}" class="sheet-midtext" placeholder="Defense Name"/></td>
@@ -13338,51 +13274,51 @@ <h4><b>Psionic Defense Modes</b></h4>
                         </fieldset>
                     </div>
                     <div class="sheet-col">
-                        <h4><b>Psionic Strength Points</b></h4>
-                        <table style='width:250px;'>
+                        <h4>Psionic Strength Points</h4>
+                        <table class="sheet-table-white sheet-default-header-first-row sheet-default-header-first-column" style='width:250px;'>
                             <tr>
-                                <td class="sheet-default-header" style="width:100px;">Value</td>
-                                <td class="sheet-default-header" style="width:50px;">Current</td>
-                                <td class="sheet-default-header" style="width:15px;">/</td>
-                                <td class="sheet-default-header" style="width:60px;">Maximum</td>
-                                <td class="sheet-default-header" style="width:25px;">Speed</td>
+                                <td style="width:100px;">Value</td>
+                                <td style="width:50px;">Current</td>
+                                <td style="width:15px;">/</td>
+                                <td style="width:60px;">Maximum</td>
+                                <td style="width:25px;">Speed</td>
                             </tr>
                             <tr>
-                                <td class="sheet-default-header" style="width:100px;">PSP:</td>
+                                <td>PSP:</td>
                                 <td><input type="number" name="attr_PSP" title="@{PSP}" class="sheet-short" placeholder="PSP"/></td>
-                                <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                <td>/</td>
                                 <td><input type="number" name="attr_PSP_max" title="@{PSP|max}" class="sheet-short"/></td>
                                 <td><button type="roll" name="roll_psispeed2" title="@{psispeed2}" value="/gmroll [[{([[1d10]]-(@{misc-mod})), 1}kh1]] [Initiative Psionics]&{tracker}"></button></td>
                             </tr>
                             <tr>
-                                <td class="sheet-default-header" style="width:100px;">Temp PSP:</td>
+                                <td>Temp PSP:</td>
                                 <td><input type="number" name="attr_tempPSP" title="@{tempPSP}" class="sheet-short" placeholder="Temp"/></td>
-                                <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                <td>/</td>
                                 <td><input type="number" name="attr_tempPSP_max" title="@{tempPSP|max}" class="sheet-short"/></td>
                             </tr>
                             <tr>
-                                <td class="sheet-default-header" style="width:100px;">Stored PSP:</td>
+                                <td>Stored PSP:</td>
                                 <td><input type="number" name="attr_storedPSP" title="@{storedPSP}" class="sheet-short" placeholder="Stored"/></td>
-                                <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                <td>/</td>
                                 <td><input type="number" name="attr_storedPSP_max" title="@{storedPSP|max}" class="sheet-short"/></td>
                             </tr>
                             <tr>
-                                <td class="sheet-default-header" style="width:100px;">M.A.C.</td>
+                                <td>M.A.C.</td>
                                 <td><input type="number" name="attr_selfMAC" title="@{selfMAC}" class="sheet-short"/></td>
-                                <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                <td>/</td>
                                 <td><input type="number" name="attr_temp-selfMAC" title="@{temp-selfMAC}" class="sheet-short"/></td>
                             </tr>
                         </table>
                     </div>
                     <div class="sheet-col">
-                        <h4><b>Psionic Proficiencies</b></h4>
+                        <h4>Psionic Proficiencies</h4>
                         <fieldset name="repeating_psionicprofs" title="@{psionicprofs}" class="repeating_psionicprofs">
                             <table>
                                 <tr>
                                     <td><input type="text" name="attr_psionicprofname" title="@{repeating_psionicprofs_$X_psionicprofname}" class="sheet-maxtext" placeholder="Name of NWP"></td>
                                     <td><input type="text" name="attr_psionicprofstatnum" title="@{repeating_psionicprofs_$X_psionicprofstatnum}" placeholder="@{}" class="sheet-small"></td>
                                     <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionicprofmod" title="@{repeating_psionicprofs_$X_psionicprofmod}" value="0" class="sheet-small"><input type="text" name="attr_psionicprofslots" title="@{repeating_psionicprofs_$X_profslots}" class="sheet-small" placeholder="#">
-                                        <button type="roll" name="roll_Psionicprof" title="%{repeating_psionicprofs_$X_Psionicprof}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psionicprofstatnum})+(@{psionicprofmod})]] @{psionicprofname}"></button></td>
+                                        <button type="roll" name="roll_Psionicprof" title="%{repeating_psionicprofs_$X_Psionicprof}" value="&{template:2Echeck} {{checkvs=@{psionicprofname} Check}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psionicprofstatnum})+(@{psionicprofmod})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                 </tr>
                             </table>
                         </fieldset>
@@ -13904,7 +13840,7 @@ <h4>Scrolls</h4>
                                 <li>No adverse effects associated with casting the spell are suffered by the reader. These requirements or penalties have already been fulfilled or suffered by the creator of the scroll (DMG p. 196)</li>
                                 <li><strong>Scroll Spell Failure</strong>
                                     <ul>
-                                        <li>Wizards and Priests casting scrolls containing spells of a level too high for him to cast incurs a 5% failure rate per level between the character's present level and the level at which the spell could be cast (DMG p. 196)<br>
+                                        <li>Wizards and Priests casting scrolls containing spells of a level too high for the character to cast incurs a 5% failure rate per level between the character's present level and the level at which the spell could be cast (DMG p. 196)<br>
                                             Wizards and Priests scroll spell failure is either Total Failure (nothing happens) or Reverse / Harmful Failure effect (DMG p. 196)
                                         </li>
                                         <li>Thieves casting scrolls have 25% failure chance. Failure is always a reverse of the effect (PHB p. 58)</li>
@@ -14545,18 +14481,18 @@ <h4>Followers, Familiars and Animals</h4>
             <div class="sheet-tab-content sheet-section-follower-warrior">
                 <h4>Warrior Followers</h4>
                 <br>
-                <table>
+                <table class="sheet-default-header-first-row">
                     <tr>
-                        <td class="sheet-default-header">Name</td>
-                        <td class="sheet-default-header">AC</td>
-                        <td class="sheet-default-header">Race</td>
-                        <td class="sheet-default-header">Level</td>
-                        <td class="sheet-default-header">Class</td>
-                        <td class="sheet-default-header">Hit Dice</td>
-                        <td class="sheet-default-header">HP/Max</td>
-                        <td class="sheet-default-header">Units</td>
-                        <td class="sheet-default-header">Enemy AC / Base Dmg</td>
-                        <td class="sheet-default-header">Skirmish</td>
+                        <td>Name</td>
+                        <td>AC</td>
+                        <td>Race</td>
+                        <td>Level</td>
+                        <td>Class</td>
+                        <td>Hit Dice</td>
+                        <td>HP/Max</td>
+                        <td>Units</td>
+                        <td>Enemy AC / Base Dmg</td>
+                        <td>Skirmish</td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_henchname" title="@{henchname}" class="sheet-maxtext"></td>
@@ -14574,19 +14510,19 @@ <h4>Warrior Followers</h4>
                 </table>
                 <hr>
                 <h4>Weapons</h4>
-                <table>
+                <table class="sheet-default-header-first-row">
                     <tr>
-                        <td class="sheet-default-header">Weapon Name</td>
-                        <td class="sheet-default-header"># of<br>Strikes</td>
-                        <td class="sheet-default-header">Attack<br>Adj.</td>
-                        <td class="sheet-default-header">Dam<br>Adj.</td>
-                        <td class="sheet-default-header">THAC0</td>
-                        <td class="sheet-default-header">Crit</td>
-                        <td class="sheet-default-header">Dam SM</td>
-                        <td class="sheet-default-header">Dam L</td>
-                        <td class="sheet-default-header">Range</td>
-                        <td class="sheet-default-header">Type</td>
-                        <td class="sheet-default-header">Speed</td>
+                        <td>Weapon Name</td>
+                        <td># of<br>Strikes</td>
+                        <td>Attack<br>Adj.</td>
+                        <td>Dam<br>Adj.</td>
+                        <td>THAC0</td>
+                        <td>Crit</td>
+                        <td>Dam SM</td>
+                        <td>Dam L</td>
+                        <td>Range</td>
+                        <td>Type</td>
+                        <td>Speed</td>
                     </tr>
                     <tr>
                         <td>
@@ -14640,16 +14576,16 @@ <h4>Weapons</h4>
                 <hr>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
-                        <td><button type="roll" name="roll_henchparsave" title="%{henchparsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchpartar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchparsave" title="%{henchpoisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchpoitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchdeasave" title="%{henchdeasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchdeatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchrodsave" title="%{henchrodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchrodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchstasave" title="%{henchstasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchstatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchwansave" title="%{henchwansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchwantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchpetsave" title="%{henchpetsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchpettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchpolsave" title="%{henchpolsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchpoltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchbresave" title="%{henchbresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchbretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchspesave" title="%{henchspesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchspetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchparsave" title="%{henchparsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchpartar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchparsave" title="%{henchpoisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchpoitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchdeasave" title="%{henchdeasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchdeatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchrodsave" title="%{henchrodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchrodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchstasave" title="%{henchstasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchstatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchwansave" title="%{henchwansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchwantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchpetsave" title="%{henchpetsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchpettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchpolsave" title="%{henchpolsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchpoltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchbresave" title="%{henchbresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchbretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchspesave" title="%{henchspesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{henchspetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_henchpartar" title="@{henchpartar}" class="sheet-small"></td>
@@ -14751,18 +14687,18 @@ <h4>Notes</h4>
                 <hr>
                 <hr>
                 <fieldset name="repeating_hench" class="repeating_hench">
-                    <table>
+                    <table class="sheet-default-header-first-row">
                         <tr>
-                            <td class="sheet-default-header">Name</td>
-                            <td class="sheet-default-header">AC</td>
-                            <td class="sheet-default-header">Race</td>
-                            <td class="sheet-default-header">Level</td>
-                            <td class="sheet-default-header">Class</td>
-                            <td class="sheet-default-header">Hit Dice</td>
-                            <td class="sheet-default-header">HP/Max</td>
-                            <td class="sheet-default-header">Units</td>
-                            <td class="sheet-default-header">Enemy AC / Base Dmg</td>
-                            <td class="sheet-default-header">Skirmish</td>
+                            <td>Name</td>
+                            <td>AC</td>
+                            <td>Race</td>
+                            <td>Level</td>
+                            <td>Class</td>
+                            <td>Hit Dice</td>
+                            <td>HP/Max</td>
+                            <td>Units</td>
+                            <td>Enemy AC / Base Dmg</td>
+                            <td>Skirmish</td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_henchname1" title="@{repeating_hench_$X_henchname1}" class="sheet-maxtext"></td>
@@ -14779,19 +14715,19 @@ <h4>Notes</h4>
                     </table>
                     <hr>
                     <h4>Weapons</h4>
-                    <table>
+                    <table class="sheet-default-header-first-row">
                         <tr>
-                            <td class="sheet-default-header">Weapon Name</td>
-                            <td class="sheet-default-header"># of<br>Strikes</td>
-                            <td class="sheet-default-header">Attack<br>Adj.</td>
-                            <td class="sheet-default-header">Dam<br>Adj.</td>
-                            <td class="sheet-default-header">THAC0</td>
-                            <td class="sheet-default-header">Crit</td>
-                            <td class="sheet-default-header">Dam SM</td>
-                            <td class="sheet-default-header">Dam L</td>
-                            <td class="sheet-default-header">Range</td>
-                            <td class="sheet-default-header">Type</td>
-                            <td class="sheet-default-header">Speed</td>
+                            <td>Weapon Name</td>
+                            <td># of<br>Strikes</td>
+                            <td>Attack<br>Adj.</td>
+                            <td>Dam<br>Adj.</td>
+                            <td>THAC0</td>
+                            <td>Crit</td>
+                            <td>Dam SM</td>
+                            <td>Dam L</td>
+                            <td>Range</td>
+                            <td>Type</td>
+                            <td>Speed</td>
                         </tr>
                         <tr>
                             <td>
@@ -14845,16 +14781,16 @@ <h4>Weapons</h4>
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
-                            <td><button type="roll" name="roll_hench1parsave" title="%{repeating_hench_$X_hench1parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1parsave" title="%{repeating_hench_$X_hench1poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1deasave" title="%{repeating_hench_$X_hench1deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1rodsave" title="%{repeating_hench_$X_hench1rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1stasave" title="%{repeating_hench_$X_hench1stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1wansave" title="%{repeating_hench_$X_hench1wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1petsave" title="%{repeating_hench_$X_hench1petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1polsave" title="%{repeating_hench_$X_hench1polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1bresave" title="%{repeating_hench_$X_hench1bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1spesave" title="%{repeating_hench_$X_hench1spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1parsave" title="%{repeating_hench_$X_hench1parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1parsave" title="%{repeating_hench_$X_hench1poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1deasave" title="%{repeating_hench_$X_hench1deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1rodsave" title="%{repeating_hench_$X_hench1rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1stasave" title="%{repeating_hench_$X_hench1stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1wansave" title="%{repeating_hench_$X_hench1wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1petsave" title="%{repeating_hench_$X_hench1petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1polsave" title="%{repeating_hench_$X_hench1polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1bresave" title="%{repeating_hench_$X_hench1bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1spesave" title="%{repeating_hench_$X_hench1spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname1}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench1spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_hench1partar" title="@{repeating_hench_$X_hench1partar}" class="sheet-small"></td>
@@ -14961,15 +14897,15 @@ <h4>Notes</h4>
             <div class="sheet-tab-content sheet-section-follower-wizard">
                 <h4>Wizard Followers</h4>
                 <br>
-                <table>
+                <table class="sheet-default-header-first-row">
                     <tr>
-                        <td class="sheet-default-header">Name</td>
-                        <td class="sheet-default-header">AC</td>
-                        <td class="sheet-default-header">Race</td>
-                        <td class="sheet-default-header">Level</td>
-                        <td class="sheet-default-header">Class</td>
-                        <td class="sheet-default-header">HP/Max</td>
-                        <td class="sheet-default-header">Units</td>
+                        <td>Name</td>
+                        <td>AC</td>
+                        <td>Race</td>
+                        <td>Level</td>
+                        <td>Class</td>
+                        <td>HP/Max</td>
+                        <td>Units</td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_henchname2" title="@{henchname2}"></td>
@@ -15049,16 +14985,16 @@ <h4>Weapons / Attacks</h4>
                 <hr>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
-                        <td><button type="roll" name="roll_hench2parsave" title="%{hench2parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2parsave" title="%{hench2poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2deasave" title="%{hench2deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2rodsave" title="%{hench2rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2stasave" title="%{hench2stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2wansave" title="%{hench2wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2petsave" title="%{hench2petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2polsave" title="%{hench2polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2bresave" title="%{hench2bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2spesave" title="%{hench2spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2parsave" title="%{hench2parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2parsave" title="%{hench2poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2deasave" title="%{hench2deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2rodsave" title="%{hench2rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2stasave" title="%{hench2stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2wansave" title="%{hench2wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2petsave" title="%{hench2petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2polsave" title="%{hench2polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2bresave" title="%{hench2bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2spesave" title="%{hench2spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname2}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench2spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_hench2partar" title="@{hench2partar}" class="sheet-small"></td>
@@ -15319,15 +15255,15 @@ <h4>Notes</h4>
                 <hr>
                 <hr>
                 <fieldset name="repeating_hench2" class="repeating_hench2">
-                    <table>
+                    <table class="sheet-default-header-first-row">
                         <tr>
-                            <td class="sheet-default-header">Name</td>
-                            <td class="sheet-default-header">AC</td>
-                            <td class="sheet-default-header">Race</td>
-                            <td class="sheet-default-header">Level</td>
-                            <td class="sheet-default-header">Class</td>
-                            <td class="sheet-default-header">HP/Max</td>
-                            <td class="sheet-default-header">Units</td>
+                            <td>Name</td>
+                            <td>AC</td>
+                            <td>Race</td>
+                            <td>Level</td>
+                            <td>Class</td>
+                            <td>HP/Max</td>
+                            <td>Units</td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_henchname22" title="@{repeating_hench2_$X_henchname22}"></td>
@@ -15407,16 +15343,16 @@ <h4>Weapons / Attacks</h4>
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
-                            <td><button type="roll" name="roll_hench22parsave" title="%{repeating_hench2_$X_hench22parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22parsave" title="%{repeating_hench2_$X_hench22poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22deasave" title="%{repeating_hench2_$X_hench22deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22rodsave" title="%{repeating_hench2_$X_hench22rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22stasave" title="%{repeating_hench2_$X_hench22stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22wansave" title="%{repeating_hench2_$X_hench22wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22petsave" title="%{repeating_hench2_$X_hench22petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22polsave" title="%{repeating_hench2_$X_hench22polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22bresave" title="%{repeating_hench2_$X_hench22bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22spesave" title="%{repeating_hench2_$X_hench22spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22parsave" title="%{repeating_hench2_$X_hench22parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22parsave" title="%{repeating_hench2_$X_hench22poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22deasave" title="%{repeating_hench2_$X_hench22deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22rodsave" title="%{repeating_hench2_$X_hench22rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22stasave" title="%{repeating_hench2_$X_hench22stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22wansave" title="%{repeating_hench2_$X_hench22wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22petsave" title="%{repeating_hench2_$X_hench22petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22polsave" title="%{repeating_hench2_$X_hench22polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22bresave" title="%{repeating_hench2_$X_hench22bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22spesave" title="%{repeating_hench2_$X_hench22spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname22}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench22spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_hench22partar" title="@{repeating_hench2_$X_hench22partar}" class="sheet-small"></td>
@@ -15682,15 +15618,15 @@ <h4>Notes</h4>
             <div class="sheet-tab-content sheet-section-follower-priest">
                 <h4>Priest Followers</h4>
                 <br>
-                <table>
+                <table class="sheet-default-header-first-row">
                     <tr>
-                        <td class="sheet-default-header">Name</td>
-                        <td class="sheet-default-header">AC</td>
-                        <td class="sheet-default-header">Race</td>
-                        <td class="sheet-default-header">Level</td>
-                        <td class="sheet-default-header">Class</td>
-                        <td class="sheet-default-header">HP/Max</td>
-                        <td class="sheet-default-header">Units</td>
+                        <td>Name</td>
+                        <td>AC</td>
+                        <td>Race</td>
+                        <td>Level</td>
+                        <td>Class</td>
+                        <td>HP/Max</td>
+                        <td>Units</td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_henchname3" title="@{henchname3}"></td>
@@ -15770,16 +15706,16 @@ <h4>Weapons / Attacks</h4>
                 <hr>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
-                        <td><button type="roll" name="roll_hench3parsave" title="%{hench3parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3parsave" title="%{hench3poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3deasave" title="%{hench3deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3rodsave" title="%{hench3rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3stasave" title="%{hench3stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3wansave" title="%{hench3wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3petsave" title="%{hench3petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3polsave" title="%{hench3polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3bresave" title="%{hench3bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3spesave" title="%{hench3spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3parsave" title="%{hench3parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3parsave" title="%{hench3poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3deasave" title="%{hench3deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3rodsave" title="%{hench3rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3stasave" title="%{hench3stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3wansave" title="%{hench3wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3petsave" title="%{hench3petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3polsave" title="%{hench3polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3bresave" title="%{hench3bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3spesave" title="%{hench3spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname3}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench3spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_hench3partar" title="@{hench3partar}" class="sheet-small"></td>
@@ -16040,15 +15976,15 @@ <h4>Notes</h4>
                 <hr>
                 <hr>
                 <fieldset name="repeating_hench3" class="repeating_hench3">
-                    <table>
+                    <table class="sheet-default-header-first-row">
                         <tr>
-                            <td class="sheet-default-header">Name</td>
-                            <td class="sheet-default-header">AC</td>
-                            <td class="sheet-default-header">Race</td>
-                            <td class="sheet-default-header">Level</td>
-                            <td class="sheet-default-header">Class</td>
-                            <td class="sheet-default-header">HP/Max</td>
-                            <td class="sheet-default-header">Units</td>
+                            <td>Name</td>
+                            <td>AC</td>
+                            <td>Race</td>
+                            <td>Level</td>
+                            <td>Class</td>
+                            <td>HP/Max</td>
+                            <td>Units</td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_henchname33" title="@{repeating_hench3_$X_henchname33}"></td>
@@ -16128,16 +16064,16 @@ <h4>Weapons / Attacks</h4>
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
-                            <td><button type="roll" name="roll_hench33parsave" title="%{repeating_hench3_$X_hench33parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33parsave" title="%{repeating_hench3_$X_hench33poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33deasave" title="%{repeating_hench3_$X_hench33deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33rodsave" title="%{repeating_hench3_$X_hench33rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33stasave" title="%{repeating_hench3_$X_hench33stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33wansave" title="%{repeating_hench3_$X_hench33wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33petsave" title="%{repeating_hench3_$X_hench33petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33polsave" title="%{repeating_hench3_$X_hench33polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33bresave" title="%{repeating_hench3_$X_hench33bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33spesave" title="%{repeating_hench3_$X_hench33spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33parsave" title="%{repeating_hench3_$X_hench33parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33parsave" title="%{repeating_hench3_$X_hench33poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33deasave" title="%{repeating_hench3_$X_hench33deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33rodsave" title="%{repeating_hench3_$X_hench33rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33stasave" title="%{repeating_hench3_$X_hench33stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33wansave" title="%{repeating_hench3_$X_hench33wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33petsave" title="%{repeating_hench3_$X_hench33petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33polsave" title="%{repeating_hench3_$X_hench33polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33bresave" title="%{repeating_hench3_$X_hench33bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33spesave" title="%{repeating_hench3_$X_hench33spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname33}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench33spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_hench33partar" title="@{repeating_hench3_$X_hench33partar}" class="sheet-small"></td>
@@ -16403,15 +16339,15 @@ <h4>Notes</h4>
             <div class="sheet-tab-content sheet-section-follower-rogue">
                 <h4>Rogue Followers</h4>
                 <br>
-                <table>
+                <table class="sheet-default-header-first-row">
                     <tr>
-                        <td class="sheet-default-header">Name</td>
-                        <td class="sheet-default-header">AC</td>
-                        <td class="sheet-default-header">Race</td>
-                        <td class="sheet-default-header">Level</td>
-                        <td class="sheet-default-header">Class</td>
-                        <td class="sheet-default-header">HP/Max</td>
-                        <td class="sheet-default-header">Units</td>
+                        <td>Name</td>
+                        <td>AC</td>
+                        <td>Race</td>
+                        <td>Level</td>
+                        <td>Class</td>
+                        <td>HP/Max</td>
+                        <td>Units</td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_henchname4" title="@{henchname4}"></td>
@@ -16491,16 +16427,16 @@ <h4>Weapons / Attacks</h4>
                 <hr>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
-                        <td><button type="roll" name="roll_hench4parsave" title="%{hench4parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4parsave" title="%{hench4poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4deasave" title="%{hench4deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4rodsave" title="%{hench4rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4stasave" title="%{hench4stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4wansave" title="%{hench4wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4petsave" title="%{hench4petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4polsave" title="%{hench4polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4bresave" title="%{hench4bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4spesave" title="%{hench4spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4parsave" title="%{hench4parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4parsave" title="%{hench4poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4deasave" title="%{hench4deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4rodsave" title="%{hench4rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4stasave" title="%{hench4stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4wansave" title="%{hench4wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4petsave" title="%{hench4petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4polsave" title="%{hench4polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4bresave" title="%{hench4bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4spesave" title="%{hench4spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname4}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench4spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_hench4partar" title="@{hench4partar}" class="sheet-small"></td>
@@ -16527,245 +16463,231 @@ <h4>Rogue Skills</h4>
                     <input type="text" name="attr_backstabmultiplier2" title="@{backstabmultiplier2}" class="sheet-tiny">
                     <br>
                     <br>
-                    <div class="sheet-tab-content sheet-section-rogue-standard-hench">
-                        <table class="sheet-default-header-first-row sheet-default-header-first-column sheet-table-white">
-                            <tr>
-                                <td>Skill</td>
-                                <td>Base</td>
-                                <td>Race</td>
-                                <td>Dex</td>
-                                <td>Kit</td>
-                                <td>Magic</td>
-                                <td>Armor**</td>
-                                <td>Level</td>
-                                <td colspan="3">Total</td>
-                            </tr>
-                            <tr>
-                                <td>Pick Pockets</td>
-                                <td><input type="text" name="attr_ppb2" title="@{ppb2}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_ppr2" title="@{ppr2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ppd2" title="@{ppd2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ppk2" title="@{ppk2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ppm2" title="@{ppm2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ppa2" title="@{ppa2}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ppl2" title="@{ppl2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ppt2" title="@{ppt2}" value="(@{ppb2})+(@{ppr2})+(@{ppd2})+(@{ppk2})+(@{ppm2})+(@{ppa2})+(@{ppl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_pp2" title="%{pp2}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ppt2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_ppnoarmor2" title="%{ppnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ppb2})+(@{ppr2})+(@{ppd2})+(@{ppk2})+(@{ppm2})+(@{ppl2})+5]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Open Locks</td>
-                                <td><input type="text" name="attr_olb2" title="@{olb2}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_olr2" title="@{olr2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_old2" title="@{old2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_olk2" title="@{olk2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_olm2" title="@{olm2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ola2" title="@{ola2}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_oll2" title="@{oll2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_olt2" title="@{olt2}" value="(@{olb2})+(@{olr2})+(@{old2})+(@{olk2})+(@{olm2})+(@{ola2})+(@{oll2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_ol2" title="%{ol2}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{olt2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_olnoarmor2" title="%{olnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{olb2})+(@{olr2})+(@{old2})+(@{olk2})+(@{olm2})+(@{oll2})]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Find/Remove Traps</td>
-                                <td><input type="text" name="attr_rtb2" title="@{rtb2}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_rtr2" title="@{rtr2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rtd2" title="@{rtd2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rtk2" title="@{rtk2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rtm2" title="@{rtm2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rta2" title="@{rta2}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rtl2" title="@{rtl2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rtt2" title="@{rtt2}" value="(@{rtb2})+(@{rtr2})+(@{rtd2})+(@{rtk2})+(@{rtm2})+(@{rta2})+(@{rtl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_rt2" title="%{rt2}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{rtt2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_rtnoarmor2" title="%{rtnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{rtb2})+(@{rtr2})+(@{rtd2})+(@{rtk2})+(@{rtm2})+(@{rtl2})]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Move Silently</td>
-                                <td><input type="text" name="attr_msb2" title="@{msb2}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_msr2" title="@{msr2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_msd2" title="@{msd2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_msk2" title="@{msk2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_msm2" title="@{msm2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_msa2" title="@{msa2}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_msl2" title="@{msl2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_mst2" title="@{mst2}" value="(@{msb2})+(@{msr2})+(@{msd2})+(@{msk2})+(@{msm2})+(@{msa2})+(@{msl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_ms2" title="%{ms2}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{mst2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_msnoarmor2" title="%{msnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{msb2})+(@{msr2})+(@{msd2})+(@{msk2})+(@{msm2})+(@{msl2})+10]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Hide in Shadows</td>
-                                <td><input type="text" name="attr_hsb2" title="@{hsb2}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_hsr2" title="@{hsr2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_hsd2" title="@{hsd2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_hsk2" title="@{hsk2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_hsm2" title="@{hsm2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_hsa2" title="@{hsa2}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_hsl2" title="@{hsl2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_hst2" title="@{hst2}" value="(@{hsb2})+(@{hsr2})+(@{hsd2})+(@{hsk2})+(@{hsm2})+(@{hsa2})+(@{hsl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_hs2" title="%{hs2}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{hst2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_hsnoarmor2" title="%{hsnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{hsb2})+(@{hsr2})+(@{hsd2})+(@{hsk2})+(@{hsm2})+(@{hsl2})+5]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Detect Noise</td>
-                                <td><input type="text" name="attr_dnb2" title="@{dnb2}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_dnr2" title="@{dnr2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dnd2" title="@{dnd2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dnk2" title="@{dnk2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dnm2" title="@{dnm2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dna2" title="@{dna2}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dnl2" title="@{dnl2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dnt2" title="@{dnt2}" value="(@{dnb2})+(@{dnr2})+(@{dnd2})+(@{dnk2})+(@{dnm2})+(@{dna2})+(@{dnl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_dn2" title="%{dn2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dnt2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_dnnoarmor2" title="%{dnnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dnb2})+(@{dnr2})+(@{dnd2})+(@{dnk2})+(@{dnm2})+(@{dnl2})]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Climb Walls</td>
-                                <td><input type="text" name="attr_cwb2" title="@{cwb2}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_cwr2" title="@{cwr2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_cwd2" title="@{cwd2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_cwk2" title="@{cwk2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_cwm2" title="@{cwm2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_cwa2" title="@{cwa2}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_cwl2" title="@{cwl2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_cwt2" title="@{cwt2}" value="(@{cwb2})+(@{cwr2})+(@{cwd2})+(@{cwk2})+(@{cwm2})+(@{cwa2})+(@{cwl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_cw2" title="%{cw2}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{cwt2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_cwnoarmor2" title="%{cwnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{cwb2})+(@{cwr2})+(@{cwd2})+(@{cwk2})+(@{cwm2})+(@{cwl2})+10]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Read Languages</td>
-                                <td><input type="text" name="attr_rlb2" title="@{rlb2}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_rlr2" title="@{rlr2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rld2" title="@{rld2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rlk2" title="@{rlk2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rlm2" title="@{rlm2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rla2" title="@{rla2}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rll2" title="@{rll2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rlt2" title="@{rlt2}" value="(@{rlb2})+(@{rlr2})+(@{rld2})+(@{rlk2})+(@{rlm2})+(@{rla2})+(@{rll2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_rl2" title="%{rl2}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{rlt2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_rlnoarmor2" title="%{rlnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{rlb2})+(@{rlr2})+(@{rld2})+(@{rlk2})+(@{rlm2})+(@{rll2})]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Legend Lore</td>
-                                <td><input type="text" name="attr_ibb2" title="@{ibb2}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_ibr2" title="@{ibr2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ibd2" title="@{ibd2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ibk2" title="@{ibk2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ibm2" title="@{ibm2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_iba2" title="@{iba2}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ibl2" title="@{ibl2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ibt2" title="@{ibt2}" value="(@{ibb2})+(@{ibr2})+(@{ibd2})+(@{ibk2})+(@{ibm2})+(@{iba2})+(@{ibl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_ib2" title="%{ib2}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ibt2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_ibnoarmor2" title="%{ibnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ibb2})+(@{ibr2})+(@{ibd2})+(@{ibk2})+(@{ibm2})+(@{ibl2})]]}}">No Armor</button></td>
-                            </tr>
-                        </table>
-                    </div>
+                    <table class="sheet-default-header-first-row sheet-default-header-first-column sheet-table-white">
+                        <tr>
+                            <td>Skill</td>
+                            <td>Base</td>
+                            <td>Race</td>
+                            <td>Dex</td>
+                            <td>Kit</td>
+                            <td>Magic</td>
+                            <td>Armor</td>
+                            <td>Level</td>
+                            <td>Total</td>
+                            <td>
+                                <input type="text" name="attr_armorname2" title="@{armorname2}" class="sheet-table-dynamic sheet-chrome" placeholder="Select Armor Type" list="rogue-armor"/>
+                                <input type="text" name="attr_armorname2" title="@{armorname2}" class="sheet-table-dynamic sheet-firefox" placeholder="Select Armor Type" list="rogue-armor-ff"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>Pick Pockets</td>
+                            <td><input type="text" name="attr_ppb2" title="@{ppb2}" class="sheet-short" value="0"/>%</td>
+                            <td><input type="text" name="attr_ppr2" title="@{ppr2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_ppd2" title="@{ppd2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_ppk2" title="@{ppk2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_ppm2" title="@{ppm2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_ppa2" title="@{ppa2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_ppl2" title="@{ppl2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_ppt2" title="@{ppt2}" value="(@{ppb2})+(@{ppr2})+(@{ppd2})+(@{ppk2})+(@{ppm2})+(@{ppa2})+(@{ppl2})" disabled class="sheet-short"/>%</td>
+                            <td><button type="roll" name="roll_pp2" title="%{pp2}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets\n(in @{armorname2})}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{ppt2}+(@{misc-mod}),95}kl1]]%}}">Pick Pockets</button></td>
+                        </tr>
+                        <tr>
+                            <td>Open Locks</td>
+                            <td><input type="text" name="attr_olb2" title="@{olb2}" class="sheet-short" value="0"/>%</td>
+                            <td><input type="text" name="attr_olr2" title="@{olr2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_old2" title="@{old2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_olk2" title="@{olk2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_olm2" title="@{olm2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_ola2" title="@{ola2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_oll2" title="@{oll2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_olt2" title="@{olt2}" value="(@{olb2})+(@{olr2})+(@{old2})+(@{olk2})+(@{olm2})+(@{ola2})+(@{oll2})" disabled class="sheet-short"/>%</td>
+                            <td><button type="roll" name="roll_ol2" title="%{ol2}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks\n(in @{armorname2})}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{olt2}+(@{misc-mod}),95}kl1]]%}}">Open Locks</button></td>
+                        </tr>
+                        <tr>
+                            <td>Find/Remove Traps</td>
+                            <td><input type="text" name="attr_rtb2" title="@{rtb2}" class="sheet-short" value="0"/>%</td>
+                            <td><input type="text" name="attr_rtr2" title="@{rtr2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_rtd2" title="@{rtd2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_rtk2" title="@{rtk2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_rtm2" title="@{rtm2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_rta2" title="@{rta2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_rtl2" title="@{rtl2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_rtt2" title="@{rtt2}" value="(@{rtb2})+(@{rtr2})+(@{rtd2})+(@{rtk2})+(@{rtm2})+(@{rta2})+(@{rtl2})" disabled class="sheet-short"/>%</td>
+                            <td><button type="roll" name="roll_rt2" title="%{rt2}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps\n(in @{armorname2})}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{rtt2}+(@{misc-mod}),95}kl1]]%}}">Find/Remove Traps</button></td>
+                        </tr>
+                        <tr>
+                            <td>Move Silently</td>
+                            <td><input type="text" name="attr_msb2" title="@{msb2}" class="sheet-short" value="0"/>%</td>
+                            <td><input type="text" name="attr_msr2" title="@{msr2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_msd2" title="@{msd2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_msk2" title="@{msk2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_msm2" title="@{msm2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_msa2" title="@{msa2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_msl2" title="@{msl2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_mst2" title="@{mst2}" value="(@{msb2})+(@{msr2})+(@{msd2})+(@{msk2})+(@{msm2})+(@{msa2})+(@{msl2})" disabled class="sheet-short"/>%</td>
+                            <td><button type="roll" name="roll_ms2" title="%{ms2}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently\n(in @{armorname2})}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{mst2}+(@{misc-mod}),95}kl1]]%}}">Move Silently</button></td>
+                        </tr>
+                        <tr>
+                            <td>Hide in Shadows</td>
+                            <td><input type="text" name="attr_hsb2" title="@{hsb2}" class="sheet-short" value="0"/>%</td>
+                            <td><input type="text" name="attr_hsr2" title="@{hsr2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_hsd2" title="@{hsd2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_hsk2" title="@{hsk2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_hsm2" title="@{hsm2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_hsa2" title="@{hsa2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_hsl2" title="@{hsl2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_hst2" title="@{hst2}" value="(@{hsb2})+(@{hsr2})+(@{hsd2})+(@{hsk2})+(@{hsm2})+(@{hsa2})+(@{hsl2})" disabled class="sheet-short"/>%</td>
+                            <td><button type="roll" name="roll_hs2" title="%{hs2}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows\n(in @{armorname2})}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{hst2}+(@{misc-mod}),95}kl1]]%}}">Hide in Shadows</button></td>
+                        </tr>
+                        <tr>
+                            <td>Detect Noise</td>
+                            <td><input type="text" name="attr_dnb2" title="@{dnb2}" class="sheet-short" value="0"/>%</td>
+                            <td><input type="text" name="attr_dnr2" title="@{dnr2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_dnd2" title="@{dnd2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_dnk2" title="@{dnk2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_dnm2" title="@{dnm2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_dna2" title="@{dna2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_dnl2" title="@{dnl2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_dnt2" title="@{dnt2}" value="(@{dnb2})+(@{dnr2})+(@{dnd2})+(@{dnk2})+(@{dnm2})+(@{dna2})+(@{dnl2})" disabled class="sheet-short"/>%</td>
+                            <td><button type="roll" name="roll_dn2" title="%{dn2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise\n(in @{armorname2})}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{dnt2}+(@{misc-mod}),95}kl1]]%}}">Detect Noise</button></td>
+                        </tr>
+                        <tr>
+                            <td>Climb Walls</td>
+                            <td><input type="text" name="attr_cwb2" title="@{cwb2}" class="sheet-short" value="0"/>%</td>
+                            <td><input type="text" name="attr_cwr2" title="@{cwr2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_cwd2" title="@{cwd2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_cwk2" title="@{cwk2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_cwm2" title="@{cwm2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_cwa2" title="@{cwa2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_cwl2" title="@{cwl2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_cwt2" title="@{cwt2}" value="(@{cwb2})+(@{cwr2})+(@{cwd2})+(@{cwk2})+(@{cwm2})+(@{cwa2})+(@{cwl2})" disabled class="sheet-short"/>%</td>
+                            <td><button type="roll" name="roll_cw2" title="%{cw2}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls\n(in @{armorname2})}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{cwt2}+(@{misc-mod}),95}kl1]]%}}">Climb Walls</button></td>
+                        </tr>
+                        <tr>
+                            <td>Read Languages</td>
+                            <td><input type="text" name="attr_rlb2" title="@{rlb2}" class="sheet-short" value="0"/>%</td>
+                            <td><input type="text" name="attr_rlr2" title="@{rlr2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_rld2" title="@{rld2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_rlk2" title="@{rlk2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_rlm2" title="@{rlm2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_rla2" title="@{rla2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_rll2" title="@{rll2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_rlt2" title="@{rlt2}" value="(@{rlb2})+(@{rlr2})+(@{rld2})+(@{rlk2})+(@{rlm2})+(@{rla2})+(@{rll2})" disabled class="sheet-short"/>%</td>
+                            <td><button type="roll" name="roll_rl2" title="%{rl2}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages\n(in @{armorname2})}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{rlt2}+(@{misc-mod}),95}kl1]]%}}">Read Languages</button></td>
+                        </tr>
+                        <tr>
+                            <td>Legend Lore</td>
+                            <td><input type="text" name="attr_ibb2" title="@{ibb2}" class="sheet-short" value="0"/>%</td>
+                            <td><input type="text" name="attr_ibr2" title="@{ibr2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_ibd2" title="@{ibd2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_ibk2" title="@{ibk2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_ibm2" title="@{ibm2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_iba2" title="@{iba2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_ibl2" title="@{ibl2}" value="0" class="sheet-short"/>%</td>
+                            <td><input type="text" name="attr_ibt2" title="@{ibt2}" value="(@{ibb2})+(@{ibr2})+(@{ibd2})+(@{ibk2})+(@{ibm2})+(@{iba2})+(@{ibl2})" disabled class="sheet-short"/>%</td>
+                            <td><button type="roll" name="roll_ib2" title="%{ib2}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore\n(in @{armorname2})}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{ibt2}+(@{misc-mod}),95}kl1]]%}}">Legend Lore</button></td>
+                        </tr>
+                    </table>
                     <div class="sheet-tab-content sheet-section-rogue-spds-hench">
                         <table class="sheet-default-header-first-row sheet-default-header-first-column sheet-table-white">
-                            <tr>
-                                <td>Skill</td>
+                            <tr class="sheet-collapse">
+                                <td>Find/Remove Traps</td>
                                 <td>Base</td>
                                 <td>Race</td>
                                 <td>Dex</td>
                                 <td>Kit</td>
                                 <td>Magic</td>
-                                <td>Armor**</td>
+                                <td>Armor</td>
                                 <td>Level</td>
-                                <td colspan="3">Total</td>
+                                <td>Total</td>
+                                <td><button class="btn sheet-action-button-roll">Find/Remove Traps</button></td>
                             </tr>
                             <tr>
-                                <td>Detect Magic*</td>
+                                <td>Detect Magic</td>
                                 <td><input type="text" name="attr_dmb2" title="@{dmb2}" class="sheet-short" value="0"/>%</td>
                                 <td><input type="text" name="attr_dmr2" title="@{dmr2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dmd2" title="@{dmd2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dmk2" title="@{dmk2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dmm2" title="@{dmm2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dma2" title="@{dma2}" value="-0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_dma2" title="@{dma2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dml2" title="@{dml2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dmt2" title="@{dmt2}" value="(@{dmb2})+(@{dmr2})+(@{dmd2})+(@{dmk2})+(@{dmm2})+(@{dma2})+(@{dml2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_dm2" title="%{dm2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dmt2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_dmnoarmor2" title="%{dmnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dmb2})+(@{dmr2})+(@{dmd2})+(@{dmk2})+(@{dmm2})+(@{dml2})]]}}">No Armor</button></td>
+                                <td><button type="roll" name="roll_dm2" title="%{dm2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic\n(in @{armorname2})}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{dmt2}+(@{misc-mod}),95}kl1]]%}}">Detect Magic</button></td>
                             </tr>
                             <tr>
-                                <td>Detect Illusion*</td>
+                                <td>Detect Illusion</td>
                                 <td><input type="text" name="attr_dib2" title="@{dib2}" class="sheet-short" value="0"/>%</td>
                                 <td><input type="text" name="attr_dir2" title="@{dir2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_did2" title="@{did2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dik2" title="@{dik2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dim2" title="@{dim2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dia2" title="@{dia2}" value="-0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_dia2" title="@{dia2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dil2" title="@{dil2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_dit2" title="@{dit2}" value="(@{dib2})+(@{dir2})+(@{did2})+(@{dik2})+(@{dim2})+(@{dia2})+(@{dil2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_di2" title="%{di2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dit2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_dinoarmor2" title="%{dinoarmor}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dib2})+(@{dir2})+(@{did2})+(@{dik2})+(@{dim2})+(@{dil2})]]}}">No Armor</button></td>
+                                <td><button type="roll" name="roll_di2" title="%{di2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion\n(in @{armorname2})}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{dit2}+(@{misc-mod}),95}kl1]]%}}">Detect Illusion</button></td>
                             </tr>
                             <tr>
-                                <td>Bribery*</td>
+                                <td>Bribe</td>
                                 <td><input type="text" name="attr_brb2" title="@{brb2}" class="sheet-short" value="0"/>%</td>
                                 <td><input type="text" name="attr_brr2" title="@{brr2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_brd2" title="@{brd2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_brk2" title="@{brk2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_brm2" title="@{brm2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_bra2" title="@{bra2}" value="-0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_bra2" title="@{bra2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_brl2" title="@{brl2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_brt2" title="@{brt2}" value="(@{brb2})+(@{brr2})+(@{brd2})+(@{brk2})+(@{brm2})+(@{bra2})+(@{brl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_br2" title="%{br2}" value="/w gm &{template:2Echeck} {{checkvs=Bribe*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{brt2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_brnoarmor2" title="%{brnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Bribe*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{brb2})+(@{brr2})+(@{brd2})+(@{brk2})+(@{brm2})+(@{brl2})]]}}">No Armor</button></td>
+                                <td><button type="roll" name="roll_br2" title="%{br2}" value="/w gm &{template:2Echeck} {{checkvs=Bribe\n(in @{armorname2})}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{brt2}+(@{misc-mod}),95}kl1]]%}}">Bribe</button></td>
                             </tr>
                             <tr>
-                                <td>Tunneling*</td>
+                                <td>Tunneling</td>
                                 <td><input type="text" name="attr_tub2" title="@{tub2}" class="sheet-short" value="0"/>%</td>
                                 <td><input type="text" name="attr_tur2" title="@{tur2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_tud2" title="@{tud2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_tuk2" title="@{tuk2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_tum2" title="@{tum2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_tua2" title="@{tua2}" value="-0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_tua2" title="@{tua2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_tul2" title="@{tul2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_tut2" title="@{tut2}" value="(@{tub2})+(@{tur2})+(@{tud2})+(@{tuk2})+(@{tum2})+(@{tua2})+(@{tul2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_tu2" title="%{tu2}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{tut2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_tunoarmor2" title="%{tunoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{tub2})+(@{tur2})+(@{tud2})+(@{tuk2})+(@{tum2})+(@{tul2})+10]]}}">No Armor</button></td>
+                                <td><button type="roll" name="roll_tu2" title="%{tu2}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling\n(in @{armorname2})}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{tut2}+(@{misc-mod}),95}kl1]]%}}">Tunneling</button></td>
                             </tr>
                             <tr>
-                                <td>Escape Bonds*</td>
+                                <td>Escape Bonds</td>
                                 <td><input type="text" name="attr_ebb2" title="@{ebb2}" class="sheet-short" value="0"/>%</td>
                                 <td><input type="text" name="attr_ebr2" title="@{ebr2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ebd2" title="@{ebd2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ebk2" title="@{ebk2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ebm2" title="@{ebm2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_eba2" title="@{eba2}" value="-0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_eba2" title="@{eba2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ebl2" title="@{ebl2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_ebt2" title="@{ebt2}" value="(@{ebb2})+(@{ebr2})+(@{ebd2})+(@{ebk2})+(@{ebm2})+(@{eba2})+(@{ebl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_eb2" title="%{eb2}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ebt2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_ebnoarmor2" title="%{ebnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ebb2})+(@{ebr2})+(@{ebd2})+(@{ebk2})+(@{ebm2})+(@{ebl2})+5]]}}">No Armor</button></td>
+                                <td><button type="roll" name="roll_eb2" title="%{eb2}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds\n(in @{armorname2})}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{ebt2}+(@{misc-mod}),95}kl1]]%}}">Escape Bonds</button></td>
                             </tr>
                             <tr>
-                                <td>Forge Documents*</td>
+                                <td>Forge Documents</td>
                                 <td><input type="text" name="attr_fdb2" title="@{fdb2}" class="sheet-short" value="0"/>%</td>
                                 <td><input type="text" name="attr_fdr2" title="@{fdr2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_fdd2" title="@{fdd2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_fdk2" title="@{fdk2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_fdm2" title="@{fdm2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_fda2" title="@{fda2}" value="-0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_fda2" title="@{fda2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_fdl2" title="@{fdl2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_fdt2" title="@{fdt2}" value="(@{fdb2})+(@{fdr2})+(@{fdd2})+(@{fdk2})+(@{fdm2})+(@{fda2})+(@{fdl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_fd2" title="%{fd2}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{fdt2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_fdnoarmor2" title="%{fdnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{fdb2})+(@{fdr2})+(@{fdd2})+(@{fdk2})+(@{fdm2})+(@{fdl2})]]}}">No Armor</button></td>
+                                <td><button type="roll" name="roll_fd2" title="%{fd2}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents\n(in @{armorname2})}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{fdt2}+(@{misc-mod}),95}kl1]]%}}">Forge Documents</button></td>
                             </tr>
                             <tr>
-                                <td>Appraise*</td>
+                                <td>Appraisal</td>
                                 <td><input type="text" name="attr_apb2" title="@{apb2}" class="sheet-short" value="0"/>%</td>
                                 <td><input type="text" name="attr_apr2" title="@{apr2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_apd2" title="@{apd2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_apk2" title="@{apk2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_apm2" title="@{apm2}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_apa2" title="@{apa2}" value="-0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_apa2" title="@{apa2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_apl2" title="@{apl2}" value="0" class="sheet-short"/>%</td>
                                 <td><input type="text" name="attr_apt2" title="@{apt2}" value="(@{apb2})+(@{apr2})+(@{apd2})+(@{apk2})+(@{apm2})+(@{apa2})+(@{apl2})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_ap2" title="%{ap2}" value="/w gm &{template:2Echeck} {{checkvs=Appraise*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{apt2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_apnoarmor2" title="%{apnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Appraise*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{apb2})+(@{apr2})+(@{apd2})+(@{apk2})+(@{apm2})+(@{apl2})]]}}">No Armor</button></td>
+                                <td><button type="roll" name="roll_ap2" title="%{ap2}" value="/w gm &{template:2Echeck} {{checkvs=Appraisal\n(in @{armorname2})}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{apt2}+(@{misc-mod}),95}kl1]]%}}">Appraisal</button></td>
                             </tr>
                         </table>
                     </div>
-                    <label>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</label>
                 </div>
                 <hr>
                 <h4>Gear</h4>
@@ -16854,15 +16776,15 @@ <h4>Notes</h4>
                 <hr>
                 <hr>
                 <fieldset name="repeating_hench4" class="repeating_hench4">
-                    <table>
+                    <table class="sheet-default-header-first-row">
                         <tr>
-                            <td class="sheet-default-header">Name</td>
-                            <td class="sheet-default-header">AC</td>
-                            <td class="sheet-default-header">Race</td>
-                            <td class="sheet-default-header">Level</td>
-                            <td class="sheet-default-header">Class</td>
-                            <td class="sheet-default-header">HP/Max</td>
-                            <td class="sheet-default-header">Units</td>
+                            <td>Name</td>
+                            <td>AC</td>
+                            <td>Race</td>
+                            <td>Level</td>
+                            <td>Class</td>
+                            <td>HP/Max</td>
+                            <td>Units</td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_henchname44" title="@{repeating_hench4_$X_henchname44}"></td>
@@ -16942,16 +16864,16 @@ <h4>Weapons / Attacks</h4>
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
-                            <td><button type="roll" name="roll_hench44parsave" title="%{repeating_hench4_$X_hench44parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44parsave" title="%{repeating_hench4_$X_hench44poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44deasave" title="%{repeating_hench4_$X_hench44deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44rodsave" title="%{repeating_hench4_$X_hench44rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44stasave" title="%{repeating_hench4_$X_hench44stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44wansave" title="%{repeating_hench4_$X_hench44wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44petsave" title="%{repeating_hench4_$X_hench44petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44polsave" title="%{repeating_hench4_$X_hench44polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44bresave" title="%{repeating_hench4_$X_hench44bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44spesave" title="%{repeating_hench4_$X_hench44spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44parsave" title="%{repeating_hench4_$X_hench44parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44parsave" title="%{repeating_hench4_$X_hench44poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44deasave" title="%{repeating_hench4_$X_hench44deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44rodsave" title="%{repeating_hench4_$X_hench44rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44stasave" title="%{repeating_hench4_$X_hench44stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44wansave" title="%{repeating_hench4_$X_hench44wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44petsave" title="%{repeating_hench4_$X_hench44petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44polsave" title="%{repeating_hench4_$X_hench44polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44bresave" title="%{repeating_hench4_$X_hench44bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44spesave" title="%{repeating_hench4_$X_hench44spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname44}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench44spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_hench44partar" title="@{repeating_hench4_$X_hench44partar}" class="sheet-small"></td>
@@ -16975,248 +16897,234 @@ <h4>Rogue Skills</h4>
                         <br>
                         <br>
                         <label>Backstab Multiplier:</label>
-                        <input type="text" name="attr_backstabmultiplier22" title="@{backstabmultiplier22}" class="sheet-tiny">
+                        <input type="text" name="attr_backstabmultiplier22" title="@{repeating_hench4_$X_backstabmultiplier22}" class="sheet-tiny">
                         <br>
                         <br>
-                        <div class="sheet-tab-content sheet-section-rogue-standard-repeat">
-                            <table class="sheet-default-header-first-row sheet-default-header-first-column sheet-table-white">
-                                <tr>
-                                    <td>Skill</td>
-                                    <td>Base</td>
-                                    <td>Race</td>
-                                    <td>Dex</td>
-                                    <td>Kit</td>
-                                    <td>Magic</td>
-                                    <td>Armor**</td>
-                                    <td>Level</td>
-                                    <td colspan="3">Total</td>
-                                </tr>
-                                <tr>
-                                    <td>Pick Pockets</td>
-                                    <td><input type="text" name="attr_ppb22" title="@{repeating_hench4_$X_ppb22}" class="sheet-short" value="0"/>%</td>
-                                    <td><input type="text" name="attr_ppr22" title="@{repeating_hench4_$X_ppr22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_ppd22" title="@{repeating_hench4_$X_ppd22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_ppk22" title="@{repeating_hench4_$X_ppk22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_ppm22" title="@{repeating_hench4_$X_ppm22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_ppa22" title="@{repeating_hench4_$X_ppa22}" value="-0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_ppl22" title="@{repeating_hench4_$X_ppl22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_ppt22" title="@{repeating_hench4_$X_ppt22}" value="(@{ppb22})+(@{ppr22})+(@{ppd22})+(@{ppk22})+(@{ppm22})+(@{ppa22})+(@{ppl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_pp22" title="%{repeating_hench4_$X_pp22}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ppt22}]]}}">Armor</button></td>
-                                    <td><button type="roll" name="roll_ppnoarmor22" title="%{repeating_hench4_$X_ppnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ppb22})+(@{ppr22})+(@{ppd22})+(@{ppk22})+(@{ppm22})+(@{ppl22})+5]]}}">No Armor</button></td>
-                                </tr>
-                                <tr>
-                                    <td>Open Locks</td>
-                                    <td><input type="text" name="attr_olb22" title="@{repeating_hench4_$X_olb22}" class="sheet-short" value="0"/>%</td>
-                                    <td><input type="text" name="attr_olr22" title="@{repeating_hench4_$X_olr22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_old22" title="@{repeating_hench4_$X_old22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_olk22" title="@{repeating_hench4_$X_olk22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_olm22" title="@{repeating_hench4_$X_olm22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_ola22" title="@{repeating_hench4_$X_ola22}" value="-0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_oll22" title="@{repeating_hench4_$X_oll22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_olt22" title="@{repeating_hench4_$X_olt22}" value="(@{olb22})+(@{olr22})+(@{old22})+(@{olk22})+(@{olm22})+(@{ola22})+(@{oll22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_ol22" title="%{repeating_hench4_$X_ol22}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{olt22}]]}}">Armor</button></td>
-                                    <td><button type="roll" name="roll_olnoarmor22" title="%{repeating_hench4_$X_olnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{olb22})+(@{olr22})+(@{old22})+(@{olk22})+(@{olm22})+(@{oll22})]]}}">No Armor</button></td>
-                                </tr>
-                                <tr>
-                                    <td>Find/Remove Traps</td>
-                                    <td><input type="text" name="attr_rtb22" title="@{repeating_hench4_$X_rtb22}" class="sheet-short" value="0"/>%</td>
-                                    <td><input type="text" name="attr_rtr22" title="@{repeating_hench4_$X_rtr22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_rtd22" title="@{repeating_hench4_$X_rtd22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_rtk22" title="@{repeating_hench4_$X_rtk22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_rtm22" title="@{repeating_hench4_$X_rtm22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_rta22" title="@{repeating_hench4_$X_rta22}" value="-0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_rtl22" title="@{repeating_hench4_$X_rtl22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_rtt22" title="@{repeating_hench4_$X_rtt22}" value="(@{rtb22})+(@{rtr22})+(@{rtd22})+(@{rtk22})+(@{rtm22})+(@{rta22})+(@{rtl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_rt22" title="%{repeating_hench4_$X_rt22}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{rtt22}]]}}">Armor</button></td>
-                                    <td><button type="roll" name="roll_rtnoarmor22" title="%{repeating_hench4_$X_rtnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{rtb22})+(@{rtr22})+(@{rtd22})+(@{rtk22})+(@{rtm22})+(@{rtl22})]]}}">No Armor</button></td>
-                                </tr>
-                                <tr>
-                                    <td>Move Silently</td>
-                                    <td><input type="text" name="attr_msb22" title="@{repeating_hench4_$X_msb22}" class="sheet-short" value="0"/>%</td>
-                                    <td><input type="text" name="attr_msr22" title="@{repeating_hench4_$X_msr22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_msd22" title="@{repeating_hench4_$X_msd22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_msk22" title="@{repeating_hench4_$X_msk22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_msm22" title="@{repeating_hench4_$X_msm22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_msa22" title="@{repeating_hench4_$X_msa22}" value="-0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_msl22" title="@{repeating_hench4_$X_msl22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_mst22" title="@{repeating_hench4_$X_mst22}" value="(@{msb22})+(@{msr22})+(@{msd22})+(@{msk22})+(@{msm22})+(@{msa22})+(@{msl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_ms22" title="%{repeating_hench4_$X_ms22}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{mst22}]]}}">Armor</button></td>
-                                    <td><button type="roll" name="roll_msnoarmor22" title="%{repeating_hench4_$X_msnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{msb22})+(@{msr22})+(@{msd22})+(@{msk22})+(@{msm22})+(@{msl22})+10]]}}">No Armor</button></td>
-                                </tr>
-                                <tr>
-                                    <td>Hide in Shadows</td>
-                                    <td><input type="text" name="attr_hsb22" title="@{repeating_hench4_$X_hsb22}" class="sheet-short" value="0"/>%</td>
-                                    <td><input type="text" name="attr_hsr22" title="@{repeating_hench4_$X_hsr22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_hsd22" title="@{repeating_hench4_$X_hsd22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_hsk22" title="@{repeating_hench4_$X_hsk22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_hsm22" title="@{repeating_hench4_$X_hsm22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_hsa22" title="@{repeating_hench4_$X_hsa22}" value="-0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_hsl22" title="@{repeating_hench4_$X_hsl22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_hst22" title="@{repeating_hench4_$X_hst22}" value="(@{hsb22})+(@{hsr22})+(@{hsd22})+(@{hsk22})+(@{hsm22})+(@{hsa22})+(@{hsl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_hs22" title="%{repeating_hench4_$X_hs22}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{hst22}]]}}">Armor</button></td>
-                                    <td><button type="roll" name="roll_hsnoarmor22" title="%{repeating_hench4_$X_hsnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{hsb22})+(@{hsr22})+(@{hsd22})+(@{hsk22})+(@{hsm22})+(@{hsl22})+5]]}}">No Armor</button></td>
-                                </tr>
-                                <tr>
-                                    <td>Detect Noise</td>
-                                    <td><input type="text" name="attr_dnb22" title="@{repeating_hench4_$X_dnb22}" class="sheet-short" value="0"/>%</td>
-                                    <td><input type="text" name="attr_dnr22" title="@{repeating_hench4_$X_dnr22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_dnd22" title="@{repeating_hench4_$X_dnd22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_dnk22" title="@{repeating_hench4_$X_dnk22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_dnm22" title="@{repeating_hench4_$X_dnm22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_dna22" title="@{repeating_hench4_$X_dna22}" value="-0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_dnl22" title="@{repeating_hench4_$X_dnl22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_dnt22" title="@{repeating_hench4_$X_dnt22}" value="(@{dnb22})+(@{dnr22})+(@{dnd22})+(@{dnk22})+(@{dnm22})+(@{dna22})+(@{dnl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_dn22" title="%{repeating_hench4_$X_dn22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dnt22}]]}}">Armor</button></td>
-                                    <td><button type="roll" name="roll_dnnoarmor22" title="%{repeating_hench4_$X_dnnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dnb22})+(@{dnr22})+(@{dnd22})+(@{dnk22})+(@{dnm22})+(@{dnl22})]]}}">No Armor</button></td>
-                                </tr>
-                                <tr>
-                                    <td>Climb Walls</td>
-                                    <td><input type="text" name="attr_cwb22" title="@{repeating_hench4_$X_cwb22}" class="sheet-short" value="0"/>%</td>
-                                    <td><input type="text" name="attr_cwr22" title="@{repeating_hench4_$X_cwr22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_cwd22" title="@{repeating_hench4_$X_cwd22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_cwk22" title="@{repeating_hench4_$X_cwk22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_cwm22" title="@{repeating_hench4_$X_cmw22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_cwa22" title="@{repeating_hench4_$X_cwa22}" value="-0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_cwl22" title="@{repeating_hench4_$X_cwl22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_cwt22" title="@{repeating_hench4_$X_cwt22}" value="(@{cwb22})+(@{cwr22})+(@{cwd22})+(@{cwk22})+(@{cwm22})+(@{cwa22})+(@{cwl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_cw22" title="%{repeating_hench4_$X_cw22}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{cwt22}]]}}">Armor</button></td>
-                                    <td><button type="roll" name="roll_cwnoarmor22" title="%{repeating_hench4_$X_cwnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{cwb22})+(@{cwr22})+(@{cwd22})+(@{cwk22})+(@{cwm22})+(@{cwl22})+10]]}}">No Armor</button></td>
-                                </tr>
-                                <tr>
-                                    <td>Read Languages</td>
-                                    <td><input type="text" name="attr_rlb22" title="@{repeating_hench4_$X_rlb22}" class="sheet-short" value="0"/>%</td>
-                                    <td><input type="text" name="attr_rlr22" title="@{repeating_hench4_$X_rlr22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_rld22" title="@{repeating_hench4_$X_rld22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_rlk22" title="@{repeating_hench4_$X_rlk22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_rlm22" title="@{repeating_hench4_$X_rlm22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_rla22" title="@{repeating_hench4_$X_rla22}" value="-0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_rll22" title="@{repeating_hench4_$X_rll22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_rlt22" title="@{repeating_hench4_$X_rlt22}" value="(@{rlb22})+(@{rlr22})+(@{rld22})+(@{rlk22})+(@{rlm22})+(@{rla22})+(@{rll22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_rl22" title="%{repeating_hench4_$X_rl22}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{rlt22}]]}}">Armor</button></td>
-                                    <td><button type="roll" name="roll_rlnoarmor22" title="%{repeating_hench4_$X_rlnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{rlb22})+(@{rlr22})+(@{rld22})+(@{rlk22})+(@{rlm22})+(@{rll22})]]}}">No Armor</button></td>
-                                </tr>
-                                <tr>
-                                    <td>Legend Lore</td>
-                                    <td><input type="text" name="attr_ibb22" title="@{repeating_hench4_$X_ibb22}" class="sheet-short" value="0"/>%</td>
-                                    <td><input type="text" name="attr_ibr22" title="@{repeating_hench4_$X_ibr22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_ibd22" title="@{repeating_hench4_$X_ibd22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_ibk22" title="@{repeating_hench4_$X_ibk22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_ibm22" title="@{repeating_hench4_$X_ibm22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_iba22" title="@{repeating_hench4_$X_iba22}" value="-0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_ibl22" title="@{repeating_hench4_$X_ibl22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_ibt22" title="@{repeating_hench4_$X_ibt22}" value="(@{ibb22})+(@{ibr22})+(@{ibd22})+(@{ibk22})+(@{ibm22})+(@{iba22})+(@{ibl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_ib22" title="%{repeating_hench4_$X_ib22}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ibt22}]]}}">Armor</button></td>
-                                    <td><button type="roll" name="roll_ibnoarmor22" title="%{repeating_hench4_$X_ibnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ibb22})+(@{ibr22})+(@{ibd22})+(@{ibk22})+(@{ibm22})+(@{ibl22})]]}}">No Armor</button></td>
-                                </tr>
-                            </table>
-                        </div>
+                        <table class="sheet-default-header-first-row sheet-default-header-first-column sheet-table-white">
+                            <tr>
+                                <td>Skill</td>
+                                <td>Base</td>
+                                <td>Race</td>
+                                <td>Dex</td>
+                                <td>Kit</td>
+                                <td>Magic</td>
+                                <td>Armor</td>
+                                <td>Level</td>
+                                <td>Total</td>
+                                <td>
+                                    <input type="text" name="attr_armorname22" title="@{repeating_hench4_$X_armorname22}" class="sheet-table-dynamic sheet-chrome" placeholder="Select Armor Type" list="rogue-armor"/>
+                                    <input type="text" name="attr_armorname22" title="@{repeating_hench4_$X_armorname22}" class="sheet-table-dynamic sheet-firefox" placeholder="Select Armor Type" list="rogue-armor-ff"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Pick Pockets</td>
+                                <td><input type="text" name="attr_ppb22" title="@{repeating_hench4_$X_ppb22}" class="sheet-short" value="0"/>%</td>
+                                <td><input type="text" name="attr_ppr22" title="@{repeating_hench4_$X_ppr22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_ppd22" title="@{repeating_hench4_$X_ppd22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_ppk22" title="@{repeating_hench4_$X_ppk22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_ppm22" title="@{repeating_hench4_$X_ppm22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_ppa22" title="@{repeating_hench4_$X_ppa22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_ppl22" title="@{repeating_hench4_$X_ppl22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_ppt22" title="@{repeating_hench4_$X_ppt22}" value="(@{ppb22})+(@{ppr22})+(@{ppd22})+(@{ppk22})+(@{ppm22})+(@{ppa22})+(@{ppl22})" disabled class="sheet-short"/>%</td>
+                                <td><button type="roll" name="roll_pp22" title="%{repeating_hench4_$X_pp22}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets\n(in @{armorname22})}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{ppt22}+(@{misc-mod}),95}kl1]]%}}">Pick Pockets</button></td>
+                            </tr>
+                            <tr>
+                                <td>Open Locks</td>
+                                <td><input type="text" name="attr_olb22" title="@{repeating_hench4_$X_olb22}" class="sheet-short" value="0"/>%</td>
+                                <td><input type="text" name="attr_olr22" title="@{repeating_hench4_$X_olr22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_old22" title="@{repeating_hench4_$X_old22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_olk22" title="@{repeating_hench4_$X_olk22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_olm22" title="@{repeating_hench4_$X_olm22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_ola22" title="@{repeating_hench4_$X_ola22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_oll22" title="@{repeating_hench4_$X_oll22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_olt22" title="@{repeating_hench4_$X_olt22}" value="(@{olb22})+(@{olr22})+(@{old22})+(@{olk22})+(@{olm22})+(@{ola22})+(@{oll22})" disabled class="sheet-short"/>%</td>
+                                <td><button type="roll" name="roll_ol22" title="%{repeating_hench4_$X_ol22}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks\n(in @{armorname22})}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{olt22}+(@{misc-mod}),95}kl1]]%}}">Open Locks</button></td>
+                            </tr>
+                            <tr>
+                                <td>Find/Remove Traps</td>
+                                <td><input type="text" name="attr_rtb22" title="@{repeating_hench4_$X_rtb22}" class="sheet-short" value="0"/>%</td>
+                                <td><input type="text" name="attr_rtr22" title="@{repeating_hench4_$X_rtr22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_rtd22" title="@{repeating_hench4_$X_rtd22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_rtk22" title="@{repeating_hench4_$X_rtk22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_rtm22" title="@{repeating_hench4_$X_rtm22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_rta22" title="@{repeating_hench4_$X_rta22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_rtl22" title="@{repeating_hench4_$X_rtl22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_rtt22" title="@{repeating_hench4_$X_rtt22}" value="(@{rtb22})+(@{rtr22})+(@{rtd22})+(@{rtk22})+(@{rtm22})+(@{rta22})+(@{rtl22})" disabled class="sheet-short"/>%</td>
+                                <td><button type="roll" name="roll_rt22" title="%{repeating_hench4_$X_rt22}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps\n(in @{armorname22})}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{rtt22}+(@{misc-mod}),95}kl1]]%}}">Find/Remove Traps</button></td>
+                            </tr>
+                            <tr>
+                                <td>Move Silently</td>
+                                <td><input type="text" name="attr_msb22" title="@{repeating_hench4_$X_msb22}" class="sheet-short" value="0"/>%</td>
+                                <td><input type="text" name="attr_msr22" title="@{repeating_hench4_$X_msr22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_msd22" title="@{repeating_hench4_$X_msd22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_msk22" title="@{repeating_hench4_$X_msk22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_msm22" title="@{repeating_hench4_$X_msm22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_msa22" title="@{repeating_hench4_$X_msa22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_msl22" title="@{repeating_hench4_$X_msl22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_mst22" title="@{repeating_hench4_$X_mst22}" value="(@{msb22})+(@{msr22})+(@{msd22})+(@{msk22})+(@{msm22})+(@{msa22})+(@{msl22})" disabled class="sheet-short"/>%</td>
+                                <td><button type="roll" name="roll_ms22" title="%{repeating_hench4_$X_ms22}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently\n(in @{armorname22})}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{mst22}+(@{misc-mod}),95}kl1]]%}}">Move Silently</button></td>
+                            </tr>
+                            <tr>
+                                <td>Hide in Shadows</td>
+                                <td><input type="text" name="attr_hsb22" title="@{repeating_hench4_$X_hsb22}" class="sheet-short" value="0"/>%</td>
+                                <td><input type="text" name="attr_hsr22" title="@{repeating_hench4_$X_hsr22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_hsd22" title="@{repeating_hench4_$X_hsd22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_hsk22" title="@{repeating_hench4_$X_hsk22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_hsm22" title="@{repeating_hench4_$X_hsm22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_hsa22" title="@{repeating_hench4_$X_hsa22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_hsl22" title="@{repeating_hench4_$X_hsl22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_hst22" title="@{repeating_hench4_$X_hst22}" value="(@{hsb22})+(@{hsr22})+(@{hsd22})+(@{hsk22})+(@{hsm22})+(@{hsa22})+(@{hsl22})" disabled class="sheet-short"/>%</td>
+                                <td><button type="roll" name="roll_hs22" title="%{repeating_hench4_$X_hs22}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows\n(in @{armorname22})}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{hst22}+(@{misc-mod}),95}kl1]]%}}">Hide in Shadows</button></td>
+                            </tr>
+                            <tr>
+                                <td>Detect Noise</td>
+                                <td><input type="text" name="attr_dnb22" title="@{repeating_hench4_$X_dnb22}" class="sheet-short" value="0"/>%</td>
+                                <td><input type="text" name="attr_dnr22" title="@{repeating_hench4_$X_dnr22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_dnd22" title="@{repeating_hench4_$X_dnd22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_dnk22" title="@{repeating_hench4_$X_dnk22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_dnm22" title="@{repeating_hench4_$X_dnm22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_dna22" title="@{repeating_hench4_$X_dna22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_dnl22" title="@{repeating_hench4_$X_dnl22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_dnt22" title="@{repeating_hench4_$X_dnt22}" value="(@{dnb22})+(@{dnr22})+(@{dnd22})+(@{dnk22})+(@{dnm22})+(@{dna22})+(@{dnl22})" disabled class="sheet-short"/>%</td>
+                                <td><button type="roll" name="roll_dn22" title="%{repeating_hench4_$X_dn22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise\n(in @{armorname22})}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{dnt22}+(@{misc-mod}),95}kl1]]%}}">Detect Noise</button></td>
+                            </tr>
+                            <tr>
+                                <td>Climb Walls</td>
+                                <td><input type="text" name="attr_cwb22" title="@{repeating_hench4_$X_cwb22}" class="sheet-short" value="0"/>%</td>
+                                <td><input type="text" name="attr_cwr22" title="@{repeating_hench4_$X_cwr22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_cwd22" title="@{repeating_hench4_$X_cwd22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_cwk22" title="@{repeating_hench4_$X_cwk22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_cwm22" title="@{repeating_hench4_$X_cwm22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_cwa22" title="@{repeating_hench4_$X_cwa22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_cwl22" title="@{repeating_hench4_$X_cwl22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_cwt22" title="@{repeating_hench4_$X_cwt22}" value="(@{cwb22})+(@{cwr22})+(@{cwd22})+(@{cwk22})+(@{cwm22})+(@{cwa22})+(@{cwl22})" disabled class="sheet-short"/>%</td>
+                                <td><button type="roll" name="roll_cw22" title="%{repeating_hench4_$X_cw22}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls\n(in @{armorname22})}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{cwt22}+(@{misc-mod}),95}kl1]]%}}">Climb Walls</button></td>
+                            </tr>
+                            <tr>
+                                <td>Read Languages</td>
+                                <td><input type="text" name="attr_rlb22" title="@{repeating_hench4_$X_rlb22}" class="sheet-short" value="0"/>%</td>
+                                <td><input type="text" name="attr_rlr22" title="@{repeating_hench4_$X_rlr22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_rld22" title="@{repeating_hench4_$X_rld22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_rlk22" title="@{repeating_hench4_$X_rlk22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_rlm22" title="@{repeating_hench4_$X_rlm22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_rla22" title="@{repeating_hench4_$X_rla22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_rll22" title="@{repeating_hench4_$X_rll22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_rlt22" title="@{repeating_hench4_$X_rlt22}" value="(@{rlb22})+(@{rlr22})+(@{rld22})+(@{rlk22})+(@{rlm22})+(@{rla22})+(@{rll22})" disabled class="sheet-short"/>%</td>
+                                <td><button type="roll" name="roll_rl22" title="%{repeating_hench4_$X_rl22}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages\n(in @{armorname22})}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{rlt22}+(@{misc-mod}),95}kl1]]%}}">Read Languages</button></td>
+                            </tr>
+                            <tr>
+                                <td>Legend Lore</td>
+                                <td><input type="text" name="attr_ibb22" title="@{repeating_hench4_$X_ibb22}" class="sheet-short" value="0"/>%</td>
+                                <td><input type="text" name="attr_ibr22" title="@{repeating_hench4_$X_ibr22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_ibd22" title="@{repeating_hench4_$X_ibd22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_ibk22" title="@{repeating_hench4_$X_ibk22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_ibm22" title="@{repeating_hench4_$X_ibm22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_iba22" title="@{repeating_hench4_$X_iba22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_ibl22" title="@{repeating_hench4_$X_ibl22}" value="0" class="sheet-short"/>%</td>
+                                <td><input type="text" name="attr_ibt22" title="@{repeating_hench4_$X_ibt22}" value="(@{ibb22})+(@{ibr22})+(@{ibd22})+(@{ibk22})+(@{ibm22})+(@{iba22})+(@{ibl22})" disabled class="sheet-short"/>%</td>
+                                <td><button type="roll" name="roll_ib22" title="%{repeating_hench4_$X_ib22}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore\n(in @{armorname22})}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{ibt22}+(@{misc-mod}),95}kl1]]%}}">Legend Lore</button></td>
+                            </tr>
+                        </table>
                         <div class="sheet-tab-content sheet-section-rogue-spds-repeat">
                             <table class="sheet-default-header-first-row sheet-default-header-first-column sheet-table-white">
-                                <tr>
-                                    <td>Skill</td>
+                                <tr class="sheet-collapse">
+                                    <td>Find/Remove Traps</td>
                                     <td>Base</td>
                                     <td>Race</td>
                                     <td>Dex</td>
                                     <td>Kit</td>
                                     <td>Magic</td>
-                                    <td>Armor**</td>
+                                    <td>Armor</td>
                                     <td>Level</td>
-                                    <td colspan="3">Total</td>
+                                    <td>Total</td>
+                                    <td><button class="btn sheet-action-button-roll">Find/Remove Traps</button></td>
                                 </tr>
                                 <tr>
-                                    <td>Detect Magic*</td>
+                                    <td>Detect Magic</td>
                                     <td><input type="text" name="attr_dmb22" title="@{repeating_hench4_$X_dmb22}" class="sheet-short" value="0"/>%</td>
                                     <td><input type="text" name="attr_dmr22" title="@{repeating_hench4_$X_dmr22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_dmd22" title="@{repeating_hench4_$X_dmd22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_dmk22" title="@{repeating_hench4_$X_dmk22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_dmm22" title="@{repeating_hench4_$X_dmm22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_dma22" title="@{repeating_hench4_$X_dma22}" value="-0" class="sheet-short"/>%</td>
+                                    <td><input type="text" name="attr_dma22" title="@{repeating_hench4_$X_dma22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_dml22" title="@{repeating_hench4_$X_dml22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_dmt22" title="@{repeating_hench4_$X_dmt22}" value="(@{dmb22})+(@{dmr22})+(@{dmd22})+(@{dmk22})+(@{dmm22})+(@{dma22})+(@{dml22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_dm22" title="=%{repeating_hench4_$X_dm22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dmt2}]]}}">Armor</button></td>
-                                    <td><button type="roll" name="roll_dmnoarmor22" title="%{repeating_hench4_$X_dmnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dmb22})+(@{dmr22})+(@{dmd22})+(@{dmk22})+(@{dmm22})+(@{dml22})]]}}">No Armor</button></td>
+                                    <td><button type="roll" name="roll_dm22" title="%{repeating_hench4_$X_dm22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic\n(in @{armorname22})}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{dmt22}+(@{misc-mod}),95}kl1]]%}}">Detect Magic</button></td>
                                 </tr>
                                 <tr>
-                                    <td>Detect Illusion*</td>
+                                    <td>Detect Illusion</td>
                                     <td><input type="text" name="attr_dib22" title="@{repeating_hench4_$X_dib22}" class="sheet-short" value="0"/>%</td>
                                     <td><input type="text" name="attr_dir22" title="@{repeating_hench4_$X_dir22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_did22" title="@{repeating_hench4_$X_did22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_dik22" title="@{repeating_hench4_$X_dik22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_dim22" title="@{repeating_hench4_$X_dim22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_dia22" title="@{repeating_hench4_$X_dia22}" value="-0" class="sheet-short"/>%</td>
+                                    <td><input type="text" name="attr_dia22" title="@{repeating_hench4_$X_dia22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_dil22" title="@{repeating_hench4_$X_dil22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_dit22" title="@{repeating_hench4_$X_dit22}" value="(@{dib22})+(@{dir22})+(@{did22})+(@{dik22})+(@{dim22})+(@{dia22})+(@{dil22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_di22" title="%{repeating_hench4_$X_di22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dit22}]]}}">Armor</button></td>
-                                    <td><button type="roll" name="roll_dinoarmor22" title="%{repeating_hench4_$X_dinoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dib22})+(@{dir22})+(@{did22})+(@{dik22})+(@{dim22})+(@{dil22})]]}}">No Armor</button></td>
+                                    <td><button type="roll" name="roll_di22" title="%{repeating_hench4_$X_di22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion\n(in @{armorname22})}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{dit22}+(@{misc-mod}),95}kl1]]%}}">Detect Illusion</button></td>
                                 </tr>
                                 <tr>
-                                    <td>Bribery*</td>
+                                    <td>Bribe</td>
                                     <td><input type="text" name="attr_brb22" title="@{repeating_hench4_$X_brb22}" class="sheet-short" value="0"/>%</td>
                                     <td><input type="text" name="attr_brr22" title="@{repeating_hench4_$X_brr22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_brd22" title="@{repeating_hench4_$X_brd22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_brk22" title="@{repeating_hench4_$X_brk22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_brm22" title="@{repeating_hench4_$X_brm22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_bra22" title="@{repeating_hench4_$X_bra22}" value="-0" class="sheet-short"/>%</td>
+                                    <td><input type="text" name="attr_bra22" title="@{repeating_hench4_$X_bra22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_brl22" title="@{repeating_hench4_$X_brl22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_brt22" title="@{repeating_hench4_$X_brt22}" value="(@{brb22})+(@{brr22})+(@{brd22})+(@{brk22})+(@{brm22})+(@{bra22})+(@{brl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_br22" title="%{repeating_hench4_$X_br22}" value="/w gm &{template:2Echeck} {{checkvs=Bribe*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{brt22}]]}}">Armor</button></td>
-                                    <td><button type="roll" name="roll_brnoarmor22" title="%{repeating_hench4_$X_brnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Bribe*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{brb22})+(@{brr2})+(@{brd22})+(@{brk22})+(@{brm22})+(@{brl22})]]}}">No Armor</button></td>
+                                    <td><button type="roll" name="roll_br22" title="%{repeating_hench4_$X_br22}" value="/w gm &{template:2Echeck} {{checkvs=Bribe\n(in @{armorname22})}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{brt22}+(@{misc-mod}),95}kl1]]%}}">Bribe</button></td>
                                 </tr>
                                 <tr>
-                                    <td>Tunneling*</td>
+                                    <td>Tunneling</td>
                                     <td><input type="text" name="attr_tub22" title="@{repeating_hench4_$X_tub22}" class="sheet-short" value="0"/>%</td>
                                     <td><input type="text" name="attr_tur22" title="@{repeating_hench4_$X_tur22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_tud22" title="@{repeating_hench4_$X_tud22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_tuk22" title="@{repeating_hench4_$X_tuk22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_tum22" title="@{repeating_hench4_$X_tum22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_tua22" title="@{repeating_hench4_$X_tua22}" value="-0" class="sheet-short"/>%</td>
+                                    <td><input type="text" name="attr_tua22" title="@{repeating_hench4_$X_tua22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_tul22" title="@{repeating_hench4_$X_tul22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_tut22" title="@{repeating_hench4_$X_tut22}" value="(@{tub22})+(@{tur22})+(@{tud22})+(@{tuk22})+(@{tum22})+(@{tua22})+(@{tul22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_tu22" title="%{repeating_hench4_$X_tu22}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{tut22}]]}}">Armor</button></td>
-                                    <td><button type="roll" name="roll_tunoarmor22" title="%{repeating_hench4_$X_tunoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{tub22})+(@{tur22})+(@{tud22})+(@{tuk22})+(@{tum22})+(@{tul22})+10]]}}">No Armor</button></td>
+                                    <td><button type="roll" name="roll_tu22" title="%{repeating_hench4_$X_tu22}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling\n(in @{armorname22})}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{tut22}+(@{misc-mod}),95}kl1]]%}}">Tunneling</button></td>
                                 </tr>
                                 <tr>
-                                    <td>Escape Bonds*</td>
+                                    <td>Escape Bonds</td>
                                     <td><input type="text" name="attr_ebb22" title="@{repeating_hench4_$X_ebb22}" class="sheet-short" value="0"/>%</td>
                                     <td><input type="text" name="attr_ebr22" title="@{repeating_hench4_$X_ebr22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_ebd22" title="@{repeating_hench4_$X_ebd22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_ebk22" title="@{repeating_hench4_$X_ebk22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_ebm22" title="@{repeating_hench4_$X_ebm22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_eba22" title="@{repeating_hench4_$X_eba22}" value="-0" class="sheet-short"/>%</td>
+                                    <td><input type="text" name="attr_eba22" title="@{repeating_hench4_$X_eba22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_ebl22" title="@{repeating_hench4_$X_ebl22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_ebt22" title="@{repeating_hench4_$X_ebt22}" value="(@{ebb22})+(@{ebr22})+(@{ebd22})+(@{ebk22})+(@{ebm22})+(@{eba22})+(@{ebl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_eb22" title="%{repeating_hench4_$X_eb22}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ebt22}]]}}">Armor</button></td>
-                                    <td><button type="roll" name="roll_ebnoarmor22" title="%{repeating_hench4_$X_ebnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ebb22})+(@{ebr22})+(@{ebd22})+(@{ebk22})+(@{ebm22})+(@{ebl22})+5]]}}">No Armor</button></td>
+                                    <td><button type="roll" name="roll_eb22" title="%{repeating_hench4_$X_eb22}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds\n(in @{armorname22})}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{ebt22}+(@{misc-mod}),95}kl1]]%}}">Escape Bonds</button></td>
                                 </tr>
                                 <tr>
-                                    <td>Forge Documents*</td>
+                                    <td>Forge Documents</td>
                                     <td><input type="text" name="attr_fdb22" title="@{repeating_hench4_$X_fdb22}" class="sheet-short" value="0"/>%</td>
                                     <td><input type="text" name="attr_fdr22" title="@{repeating_hench4_$X_fdr22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_fdd22" title="@{repeating_hench4_$X_fdd22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_fdk22" title="@{repeating_hench4_$X_fdk22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_fdm22" title="@{repeating_hench4_$X_fdm22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_fda22" title="@{repeating_hench4_$X_fda22}" value="-0" class="sheet-short"/>%</td>
+                                    <td><input type="text" name="attr_fda22" title="@{repeating_hench4_$X_fda22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_fdl22" title="@{repeating_hench4_$X_fdl22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_fdt22" title="@{repeating_hench4_$X_fdt22}" value="(@{fdb22})+(@{fdr22})+(@{fdd22})+(@{fdk22})+(@{fdm22})+(@{fda22})+(@{fdl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_fd22" title="%{repeating_hench4_$X_fd22}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{fdt22}]]}}">Armor</button></td>
-                                    <td><button type="roll" name="roll_fdnoarmor22" title="%{repeating_hench4_$X_fdnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{fdb22})+(@{fdr22})+(@{fdd22})+(@{fdk22})+(@{fdm22})+(@{fdl22})]]}}">No Armor</button></td>
+                                    <td><button type="roll" name="roll_fd22" title="%{repeating_hench4_$X_fd22}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents\n(in @{armorname22})}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{fdt22}+(@{misc-mod}),95}kl1]]%}}">Forge Documents</button></td>
                                 </tr>
                                 <tr>
-                                    <td>Appraise*</td>
+                                    <td>Appraisal</td>
                                     <td><input type="text" name="attr_apb22" title="@{repeating_hench4_$X_apb22}" class="sheet-short" value="0"/>%</td>
                                     <td><input type="text" name="attr_apr22" title="@{repeating_hench4_$X_apr22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_apd22" title="@{repeating_hench4_$X_apd22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_apk22" title="@{repeating_hench4_$X_apk22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_apm22" title="@{repeating_hench4_$X_apm22}" value="0" class="sheet-short"/>%</td>
-                                    <td><input type="text" name="attr_apa22" title="@{repeating_hench4_$X_apa22}" value="-0" class="sheet-short"/>%</td>
+                                    <td><input type="text" name="attr_apa22" title="@{repeating_hench4_$X_apa22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_apl22" title="@{repeating_hench4_$X_apl22}" value="0" class="sheet-short"/>%</td>
                                     <td><input type="text" name="attr_apt22" title="@{repeating_hench4_$X_apt22}" value="(@{apb22})+(@{apr22})+(@{apd22})+(@{apk22})+(@{apm22})+(@{apa22})+(@{apl22})" disabled class="sheet-short"/>%</td>
-                                    <td><button type="roll" name="roll_ap22" title="%{repeating_hench4_$X_ap22}" value="/w gm &{template:2Echeck} {{checkvs=Appraise*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{apt22}]]}}">Armor</button></td>
-                                    <td><button type="roll" name="roll_apnoarmor22" title="%{repeating_hench4_$X_apnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Appraise*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{apb22})+(@{apr22})+(@{apd22})+(@{apk22})+(@{apm22})+(@{apl22})]]}}">No Armor</button></td>
+                                    <td><button type="roll" name="roll_ap22" title="%{repeating_hench4_$X_ap22}" value="/w gm &{template:2Echeck} {{checkvs=Appraisal\n(in @{armorname22})}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{apt22}+(@{misc-mod}),95}kl1]]%}}">Appraisal</button></td>
                                 </tr>
                             </table>
                         </div>
-                        <label>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</label>
                     </div>
                     <hr>
                     <h4>Gear</h4>
@@ -17310,15 +17218,15 @@ <h4>Notes</h4>
             <div class="sheet-tab-content sheet-section-follower-psion">
                 <h4>Psionic Followers</h4>
                 <br>
-                <table>
+                <table class="sheet-default-header-first-row">
                     <tr>
-                        <td class="sheet-default-header">Name</td>
-                        <td class="sheet-default-header">AC</td>
-                        <td class="sheet-default-header">Race</td>
-                        <td class="sheet-default-header">Level</td>
-                        <td class="sheet-default-header">Class</td>
-                        <td class="sheet-default-header">HP/Max</td>
-                        <td class="sheet-default-header">Units</td>
+                        <td>Name</td>
+                        <td>AC</td>
+                        <td>Race</td>
+                        <td>Level</td>
+                        <td>Class</td>
+                        <td>HP/Max</td>
+                        <td>Units</td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_henchname5" title="@{henchname5}"></td>
@@ -17398,16 +17306,16 @@ <h4>Weapons / Attacks</h4>
                 <hr>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
-                        <td><button type="roll" name="roll_hench5parsave" title="%{hench5parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5parsave" title="%{hench5poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5deasave" title="%{hench5deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5rodsave" title="%{hench5rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5stasave" title="%{hench5stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5wansave" title="%{hench5wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5petsave" title="%{hench5petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5polsave" title="%{hench5polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5bresave" title="%{hench5bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5spesave" title="%{hench5spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5parsave" title="%{hench5parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5parsave" title="%{hench5poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5deasave" title="%{hench5deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5rodsave" title="%{hench5rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5stasave" title="%{hench5stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5wansave" title="%{hench5wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5petsave" title="%{hench5petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5polsave" title="%{hench5polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5bresave" title="%{hench5bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5spesave" title="%{hench5spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname5}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench5spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_hench5partar" title="@{hench5partar}" class="sheet-small"></td>
@@ -17424,7 +17332,7 @@ <h4>Weapons / Attacks</h4>
                 </table>
                 <hr>
                 <input type="radio" name="attr_tab30" class="sheet-tab sheet-tab65" value="1" checked/><span class="sheet-tab sheet-tab65">Psionic Core</span>&nbsp;
-                <input type="radio" name="attr_tab30" class="sheet-tab sheet-tab66" value="2"/><span class="sheet-tab sheet-tab66">Psionic S/P</span>
+                <input type="radio" name="attr_tab30" class="sheet-tab sheet-tab66" value="2"/><span class="sheet-tab sheet-tab66">Psionic S&P</span>
                 <br>
                 <br>
     
@@ -17434,66 +17342,71 @@ <h4>Psionics Core</h4>
                     <label>You can use + to denote different sources of bonuses.</label>
                     <br>
                     <br>
-    
                     <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Telepathy Devotions</b></h4>
+                            <h4>Clairsentient Sciences</h4>
                             <ul>
-                                <table>
+                                <table class="sheet-table-white">
                                     <tr>
-                                        <td><input type="text" name="attr_psiontelepathic500" title="@{psiontelepathic500}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod500" title="@{powerscore-nomod500}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod500" title="@{powerscore-mod500}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod500" title="@{psionic-mod500}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Telepathy-Devotion500" title="%{Telepathy-Devotion500}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod500})]]&le;[[@{powerscore-nomod500}+(@{powerscore-mod500})]] @{psiontelepathic500}"></button></td>
-                                        <td><input type="text" name="attr_psiontelepathic-macro500" title="@{psiontelepathic-macro500}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-macro500" title="%{telepathic-macro500}" value="@{psiontelepathic-macro500}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost600" title="@{PSP-cost600}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_clair-science527" title="@{clair-science527}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod527" title="@{powerscore-nomod527}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod527" title="@{powerscore-mod527}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Clair-Science527" title="%{Clair-Science527}" value="/roll [[1d20cs[[{@{powerscore-nomod527}+(@{powerscore-mod527})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod527}+(@{powerscore-mod527})+(@{misc-mod}),19}kl1]] @{clair-science527}"></button></td>
+                                        <td><input type="text" name="attr_psionclair-science-macro527" title="@{psionclair-science-macro527}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_clair-science-macro527" title="%{clair-science-macro527}" value="@{psionclair-science-macro527}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost627" title="@{PSP-cost627}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psiontelepathic501" title="@{psiontelepathic501}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod501" title="@{powerscore-nomod501}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod501" title="@{powerscore-mod501}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod501" title="@{psionic-mod501}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Telepathy-Devotion501" title="%{Telepathy-Devotion501}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod501})]]&le;[[@{powerscore-nomod501}+(@{powerscore-mod501})]] @{psiontelepathic501}"></button></td>
-                                        <td><input type="text" name="attr_psiontelepathic-macro501" title="@{psiontelepathic-macro501}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-macro501" title="%{telepathic-macro501}" value="@{psiontelepathic-macro501}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost601" title="@{PSP-cost601}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_clair-science528" title="@{clair-science528}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod528" title="@{powerscore-nomod528}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod528" title="@{powerscore-mod528}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Clair-Science528" title="%{Clair-Science528}" value="/roll [[1d20cs[[{@{powerscore-nomod528}+(@{powerscore-mod528})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod528}+(@{powerscore-mod528})+(@{misc-mod}),19}kl1]] @{clair-science528}"></button></td>
+                                        <td><input type="text" name="attr_psionclair-science-macro528" title="@{psionclair-science-macro528}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_clair-science-macro528" title="%{clair-science-macro528}" value="@{psionclair-science-macro528}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost628" title="@{PSP-cost628}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psiontelepathic502" title="@{psiontelepathic502}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod502" title="@{powerscore-nomod502}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod502" title="@{powerscore-mod502}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod502" title="@{psionic-mod502}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Telepathy-Devotion502" title="%{Telepathy-Devotion502}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod502})]]&le;[[@{powerscore-nomod502}+(@{powerscore-mod502})]] @{psiontelepathic502}"></button></td>
-                                        <td><input type="text" name="attr_psiontelepathic-macro502" title="@{psiontelepathic-macro502}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-macro502" title="%{telepathic-macro502}" value="@{psiontelepathic-macro502}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost602" title="@{PSP-cost602}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_clair-science529" title="@{clair-science529}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod529" title="@{powerscore-nomod529}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod529" title="@{powerscore-mod529}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Clair-Science529" title="%{Clair-Science529}" value="/roll [[1d20cs[[{@{powerscore-nomod529}+(@{powerscore-mod529})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod529}+(@{powerscore-mod529})+(@{misc-mod}),19}kl1]] @{clair-science529}"></button></td>
+                                        <td><input type="text" name="attr_psionclair-science-macro529" title="@{psionclair-science-macro529}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_clair-science-macro529" title="%{clair-science-macro529}" value="@{psionclair-science-macro529}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost629" title="@{PSP-cost629}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </ul>
                         </div>
                         <div class="sheet-col">
-                            <h4><b>Telepathy Sciences</b></h4>
+                            <h4>Clairsentient Devotions</h4>
                             <ul>
-                                <table>
+                                <table class="sheet-table-white">
                                     <tr>
-                                        <td><input type="text" name="attr_telepathic-science503" title="@{telepathic-science503}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod503" title="@{powerscore-nomod503}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod503" title="@{powerscore-mod503}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod503" title="@{psionic-mod503}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Telepathy-Science503" title="%{Telepathy-Science503}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod503})]]&le;[[@{powerscore-nomod503}+(@{powerscore-mod503})]] @{telepathic-science503}"></button></td>
-                                        <td><input type="text" name="attr_psiontelepathic-science-macro503" title="@{psiontelepathic-science-macro503}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-science-macro503" title="%{telepathic-science-macro503}" value="@{psiontelepathic-science-macro503}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost603" title="@{PSP-cost603}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionclair524" title="@{psionclair524}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod524" title="@{powerscore-nomod524}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod524" title="@{powerscore-mod524}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Clair-Devotion524" title="%{Clair-Devotion524}" value="/roll [[1d20cs[[{@{powerscore-nomod524}+(@{powerscore-mod524})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod524}+(@{powerscore-mod524})+(@{misc-mod}),19}kl1]] @{psionclair524}"></button></td>
+                                        <td><input type="text" name="attr_psionclair-macro524" title="@{psionclair-macro524}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_clair-macro524" title="%{clair-macro524}" value="@{psionclair-macro524}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost624" title="@{PSP-cost624}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_telepathic-science504" title="@{telepathic-science504}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod504" title="@{powerscore-nomod504}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod504" title="@{powerscore-mod504}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod504" title="@{psionic-mod504}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Telepathy-Science504" title="%{Telepathy-Science504}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod504})]]&le;[[@{powerscore-nomod504}+(@{powerscore-mod504})]] @{telepathic-science504}"></button></td>
-                                        <td><input type="text" name="attr_psiontelepathic-science-macro504" title="@{psiontelepathic-science-macro504}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-science-macro504" title="%{telepathic-science-macro504}" value="@{psiontelepathic-science-macro504}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost604" title="@{PSP-cost604}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionclair525" title="@{psionclair525}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod525" title="@{powerscore-nomod525}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod525" title="@{powerscore-mod525}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Clair-Devotion525" title="%{Clair-Devotion525}" value="/roll [[1d20cs[[{@{powerscore-nomod525}+(@{powerscore-mod525})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod525}+(@{powerscore-mod525})+(@{misc-mod}),19}kl1]] @{psionclair525}"></button></td>
+                                        <td><input type="text" name="attr_psionclair-macro525" title="@{psionclair-macro525}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_clair-macro525" title="%{clair-macro525}" value="@{psionclair-macro525}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost625" title="@{PSP-cost625}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_telepathic-science505" title="@{telepathic-science505}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod505" title="@{powerscore-nomod505}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod505" title="@{powerscore-mod505}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod505" title="@{psionic-mod505}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Telepathy-Science505" title="%{Telepathy-Science505}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod505})]]&le;[[@{powerscore-nomod505}+(@{powerscore-mod505})]] @{telepathic-science505}"></button></td>
-                                        <td><input type="text" name="attr_psiontelepathic-science-macro505" title="@{psiontelepathic-science-macro505}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-science-macro505" title="%{telepathic-science-macro505}" value="@{psiontelepathic-science-macro505}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost605" title="@{PSP-cost605}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionclair526" title="@{psionclair526}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod526" title="@{powerscore-nomod526}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod526" title="@{powerscore-mod526}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Clair-Devotion526" title="%{Clair-Devotion526}" value="/roll [[1d20cs[[{@{powerscore-nomod526}+(@{powerscore-mod526})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod526}+(@{powerscore-mod526})+(@{misc-mod}),19}kl1]] @{psionclair526}"></button></td>
+                                        <td><input type="text" name="attr_psionclair-macro526" title="@{psionclair-macro526}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_clair-macro526" title="%{clair-macro526}" value="@{psionclair-macro526}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost626" title="@{PSP-cost626}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </ul>
@@ -17502,387 +17415,423 @@ <h4><b>Telepathy Sciences</b></h4>
                     <br>
                     <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Psychokinesis Devotions</b></h4>
+                            <h4>Psychokinectic Sciences</h4>
                             <ul>
-                                <table>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionkinetic506" title="@{psionkinetic506}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod506" title="@{powerscore-nomod506}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod506" title="@{powerscore-mod506}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod506" title="@{psionic-mod506}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Kinetic-Devotion506" title="%{Kinetic-Devotion506}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod506})]]&le;[[@{powerscore-nomod506}+(@{powerscore-mod506})]] @{psionkinetic506}"></button></td>
-                                        <td><input type="text" name="attr_psionkinetic-macro506" title="@{psionkinetic-macro506}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-macro506" title="%{kinetic-macro506}" value="@{psionkinetic-macro506}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost606" title="@{PSP-cost606}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionkinetic507" title="@{psionkinetic507}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod507" title="@{powerscore-nomod507}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod507" title="@{powerscore-mod507}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod507" title="@{psionic-mod507}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Kinetic-Devotion507" title="%{Kinetic-Devotion507}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod507})]]&le;[[@{powerscore-nomod507}+(@{powerscore-mod507})]] @{psionkinetic507}"></button></td>
-                                        <td><input type="text" name="attr_psionkinetic-macro507" title="@{psionkinetic-macro507}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-macro507" title="%{kinetic-macro507}" value="@{psionkinetic-macro507}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost607" title="@{PSP-cost607}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionkinetic508" title="@{psionkinetic508}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod508" title="@{powerscore-nomod508}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod508" title="@{powerscore-mod508}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod508" title="@{psionic-mod508}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Kinetic-Devotion508" title="%{Kinetic-Devotion508}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod508})]]&le;[[@{powerscore-nomod508}+(@{powerscore-mod508})]] @{psionkinetic508}"></button></td>
-                                        <td><input type="text" name="attr_psionkinetic-macro508" title="@{psionkinetic-macro508}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-macro508" title="%{kinetic-macro508}" value="@{psionkinetic-macro508}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost608" title="@{PSP-cost608}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                </table>
-                            </ul>
-                        </div>
-                        <div class="sheet-col">
-                            <h4><b>Psychokinesis Sciences</b></h4>
-                            <ul>
-                                <table>
+                                <table class="sheet-table-white">
                                     <tr>
                                         <td><input type="text" name="attr_kinetic-science509" title="@{kinetic-science509}" class="sheet-medium"></td>
                                         <td><input type="text" name="attr_powerscore-nomod509" title="@{powerscore-nomod509}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod509" title="@{powerscore-mod509}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod509" title="@{psionic-mod509}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Kinetic-Science509" title="%{Kinetic-Science509}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod509})]]&le;[[@{powerscore-nomod509}+(@{powerscore-mod509})]] @{kinetic-science509}"></button></td>
-                                        <td><input type="text" name="attr_psionkinetic-science-macro509" title="@{psionkinetic-science-macro509}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-science-macro509" title="%{kinetic-science-macro509}" value="@{psionkinetic-science-macro509}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod509" title="@{powerscore-mod509}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Kinetic-Science509" title="%{Kinetic-Science509}" value="/roll [[1d20cs[[{@{powerscore-nomod509}+(@{powerscore-mod509})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod509}+(@{powerscore-mod509})+(@{misc-mod}),19}kl1]] @{kinetic-science509}"></button></td>
+                                        <td><input type="text" name="attr_psionkinetic-science-macro509" title="@{psionkinetic-science-macro509}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_kinetic-science-macro509" title="%{kinetic-science-macro509}" value="@{psionkinetic-science-macro509}"></button></td>
                                         <td><input type="text" name="attr_PSP-cost609" title="@{PSP-cost609}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_kinetic-science510" title="@{kinetic-science510}" class="sheet-medium"></td>
                                         <td><input type="text" name="attr_powerscore-nomod510" title="@{powerscore-nomod510}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod510" title="@{powerscore-mod510}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod510" title="@{psionic-mod510}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Kinetic-Science510" title="%{Kinetic-Science510}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod510})]]&le;[[@{powerscore-nomod510}+(@{powerscore-mod510})]] @{kinetic-science510}"></button></td>
-                                        <td><input type="text" name="attr_psionkinetic-science-macro510" title="@{psionkinetic-science-macro510}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-science-macro510" title="%{kinetic-science-macro510}" value="@{psionkinetic-science-macro510}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod510" title="@{powerscore-mod510}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Kinetic-Science510" title="%{Kinetic-Science510}" value="/roll [[1d20cs[[{@{powerscore-nomod510}+(@{powerscore-mod510})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod510}+(@{powerscore-mod510})+(@{misc-mod}),19}kl1]] @{kinetic-science510}"></button></td>
+                                        <td><input type="text" name="attr_psionkinetic-science-macro510" title="@{psionkinetic-science-macro510}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_kinetic-science-macro510" title="%{kinetic-science-macro510}" value="@{psionkinetic-science-macro510}"></button></td>
                                         <td><input type="text" name="attr_PSP-cost610" title="@{PSP-cost610}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_kinetic-science511" title="@{kinetic-science511}" class="sheet-medium"></td>
                                         <td><input type="text" name="attr_powerscore-nomod511" title="@{powerscore-nomod511}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod511" title="@{powerscore-mod511}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod511" title="@{psionic-mod511}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Kinetic-Science511" title="%{Kinetic-Science511}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod511})]]&le;[[@{powerscore-nomod511}+(@{powerscore-mod511})]] @{kinetic-science511}"></button></td>
-                                        <td><input type="text" name="attr_psionkinetic-science-macro511" title="@{psionkinetic-science-macro511}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-science-macro511" title="%{kinetic-science-macro511}" value="@{psionkinetic-science-macro511}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod511" title="@{powerscore-mod511}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Kinetic-Science511" title="%{Kinetic-Science511}" value="/roll [[1d20cs[[{@{powerscore-nomod511}+(@{powerscore-mod511})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod511}+(@{powerscore-mod511})+(@{misc-mod}),19}kl1]] @{kinetic-science511}"></button></td>
+                                        <td><input type="text" name="attr_psionkinetic-science-macro511" title="@{psionkinetic-science-macro511}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_kinetic-science-macro511" title="%{kinetic-science-macro511}" value="@{psionkinetic-science-macro511}"></button></td>
                                         <td><input type="text" name="attr_PSP-cost611" title="@{PSP-cost611}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </ul>
                         </div>
-                    </div>
-                    <br>
-                    <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Psychoportive Devotions</b></h4>
+                            <h4>Psychokinectic Devotions</h4>
                             <ul>
-                                <table>
+                                <table class="sheet-table-white">
                                     <tr>
-                                        <td><input type="text" name="attr_psionportation512" title="@{psionportation512}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod512" title="@{powerscore-nomod512}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod512" title="@{powerscore-mod512}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod512" title="@{psionic-mod512}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Portation-Devotion512" title="%{Portation-Devotion512}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod512})]]&le;[[@{powerscore-nomod512}+(@{powerscore-mod512})]] @{psionportation512}"></button></td>
-                                        <td><input type="text" name="attr_psionportation-macro512" title="@{psionportation-macro512}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-macro512" title="%{portation-macro512}" value="@{psionportation-macro512}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost612" title="@{PSP-cost612}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionkinetic506" title="@{psionkinetic506}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod506" title="@{powerscore-nomod506}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod506" title="@{powerscore-mod506}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Kinetic-Devotion506" title="%{Kinetic-Devotion506}" value="/roll [[1d20cs[[{@{powerscore-nomod506}+(@{powerscore-mod506})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod506}+(@{powerscore-mod506})+(@{misc-mod}),19}kl1]] @{psionkinetic506}"></button></td>
+                                        <td><input type="text" name="attr_psionkinetic-macro506" title="@{psionkinetic-macro506}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_kinetic-macro506" title="%{kinetic-macro506}" value="@{psionkinetic-macro506}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost606" title="@{PSP-cost606}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionportation513" title="@{psionportation513}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod513" title="@{powerscore-nomod513}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod513" title="@{powerscore-mod513}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod513" title="@{psionic-mod513}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Portation-Devotion513" title="%{Portation-Devotion513}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod513})]]&le;[[@{powerscore-nomod513}+(@{powerscore-mod513})]] @{psionportation513}"></button></td>
-                                        <td><input type="text" name="attr_psionportation-macro513" title="@{psionportation-macro513}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-macro513" title="%{portation-macro513}" value="@{psionportation-macro513}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost613" title="@{PSP-cost613}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionkinetic507" title="@{psionkinetic507}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod507" title="@{powerscore-nomod507}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod507" title="@{powerscore-mod507}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Kinetic-Devotion507" title="%{Kinetic-Devotion507}" value="/roll [[1d20cs[[{@{powerscore-nomod507}+(@{powerscore-mod507})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod507}+(@{powerscore-mod507})+(@{misc-mod}),19}kl1]] @{psionkinetic507}"></button></td>
+                                        <td><input type="text" name="attr_psionkinetic-macro507" title="@{psionkinetic-macro507}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_kinetic-macro507" title="%{kinetic-macro507}" value="@{psionkinetic-macro507}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost607" title="@{PSP-cost607}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionportation514" title="@{psionportation514}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod514" title="@{powerscore-nomod514}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod514" title="@{powerscore-mod514}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod514" title="@{psionic-mod514}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Portation-Devotion514" title="%{Portation-Devotion514}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod514})]]&le;[[@{powerscore-nomod514}+(@{powerscore-mod514})]] @{psionportation514}"></button></td>
-                                        <td><input type="text" name="attr_psionportation-macro514" title="@{psionportation-macro514}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-macro514" title="%{portation-macro514}" value="@{psionportation-macro514}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost614" title="@{PSP-cost614}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionkinetic508" title="@{psionkinetic508}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod508" title="@{powerscore-nomod508}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod508" title="@{powerscore-mod508}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Kinetic-Devotion508" title="%{Kinetic-Devotion508}" value="/roll [[1d20cs[[{@{powerscore-nomod508}+(@{powerscore-mod508})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod508}+(@{powerscore-mod508})+(@{misc-mod}),19}kl1]] @{psionkinetic508}"></button></td>
+                                        <td><input type="text" name="attr_psionkinetic-macro508" title="@{psionkinetic-macro508}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_kinetic-macro508" title="%{kinetic-macro508}" value="@{psionkinetic-macro508}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost608" title="@{PSP-cost608}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </ul>
                         </div>
+                    </div>
+                    <br>
+                    <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Psychoportive Sciences</b></h4>
+                            <h4>Psychometabolic Sciences</h4>
                             <ul>
-                                <table>
+                                <table class="sheet-table-white">
                                     <tr>
-                                        <td><input type="text" name="attr_portation-science515" title="@{portation-science515}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod515" title="@{powerscore-nomod515}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod515" title="@{powerscore-mod515}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod515" title="@{psionic-mod515}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Portation-Science515" title="%{Portation-Science515}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod515})]]&le;[[@{powerscore-nomod515}+(@{powerscore-mod515})]] @{portation-science515}"></button></td>
-                                        <td><input type="text" name="attr_psionportation-science-macro515" title="@{psionportation-science-macro515}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-science-macro515" title="%{portation-science-macro515}" value="@{psionportation-science-macro515}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost615" title="@{PSP-cost615}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_metabolic-science521" title="@{metabolic-science521}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod521" title="@{powerscore-nomod521}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod521" title="@{powerscore-mod521}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Metabolic-Science521" title="%{Metabolic-Science521}" value="/roll [[1d20cs[[{@{powerscore-nomod521}+(@{powerscore-mod521})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod521}+(@{powerscore-mod521})+(@{misc-mod}),19}kl1]] @{metabolic-science521}"></button></td>
+                                        <td><input type="text" name="attr_psionmetabolic-science-macro521" title="@{psionmetabolic-science-macro521}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_metabolic-science-macro521" title="%{metabolic-science-macro521}" value="@{psionmetabolic-science-macro521}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost621" title="@{PSP-cost621}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_portation-science516" title="@{portation-science516}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod516" title="@{powerscore-nomod516}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod516" title="@{powerscore-mod516}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod516" title="@{psionic-mod516}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Portation-Science516" title="%{Portation-Science516}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod516})]]&le;[[@{powerscore-nomod516}+(@{powerscore-mod516})]] @{portation-science516}"></button></td>
-                                        <td><input type="text" name="attr_psionportation-science-macro516" title="@{psionportation-science-macro516}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-science-macro516" title="%{portation-science-macro516}" value="@{psionportation-science-macro516}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost616" title="@{PSP-cost616}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_metabolic-science522" title="@{metabolic-science522}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod522" title="@{powerscore-nomod522}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod522" title="@{powerscore-mod522}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Metabolic-Science522" title="%{Metabolic-Science522}" value="/roll [[1d20cs[[{@{powerscore-nomod522}+(@{powerscore-mod522})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod522}+(@{powerscore-mod522})+(@{misc-mod}),19}kl1]] @{metabolic-science522}"></button></td>
+                                        <td><input type="text" name="attr_psionmetabolic-science-macro522" title="@{psionmetabolic-science-macro522}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_metabolic-science-macro522" title="%{metabolic-science-macro522}" value="@{psionmetabolic-science-macro522}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost622" title="@{PSP-cost622}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_portation-science517" title="@{portation-science517}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod517" title="@{powerscore-nomod517}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod517" title="@{powerscore-mod517}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod517" title="@{psionic-mod517}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Portation-Science517" title="%{Portation-Science517}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod517})]]&le;[[@{powerscore-nomod517}+(@{powerscore-mod517})]] @{portation-science517}"></button></td>
-                                        <td><input type="text" name="attr_psionportation-science-macro517" title="@{psionportation-science-macro517}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-science-macro517" title="%{portation-science-macro517}" value="@{psionportation-science-macro517}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost617" title="@{PSP-cost617}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_metabolic-science523" title="@{metabolic-science523}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod523" title="@{powerscore-nomod523}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod523" title="@{powerscore-mod523}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Metabolic-Science523" title="%{Metabolic-Science523}" value="/roll [[1d20cs[[{@{powerscore-nomod523}+(@{powerscore-mod523})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod523}+(@{powerscore-mod523})+(@{misc-mod}),19}kl1]] @{metabolic-science523}"></button></td>
+                                        <td><input type="text" name="attr_psionmetabolic-science-macro523" title="@{psionmetabolic-science-macro523}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_metabolic-science-macro523" title="%{metabolic-science-macro523}" value="@{psionmetabolic-science-macro523}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost623" title="@{PSP-cost623}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </ul>
                         </div>
-                    </div>
-                    <br>
-                    <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Psychometabolism Devotions</b></h4>
+                            <h4>Psychometabolic Devotions</h4>
                             <ul>
-                                <table>
+                                <table class="sheet-table-white">
                                     <tr>
                                         <td><input type="text" name="attr_psionmetabolic518" title="@{psionmetabolic518}" class="sheet-medium"></td>
                                         <td><input type="text" name="attr_powerscore-nomod518" title="@{powerscore-nomod518}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod518" title="@{powerscore-mod518}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod518" title="@{psionic-mod518}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Metabolic-Devotion518" title="%{Metabolic-Devotion518}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod518})]]&le;[[@{powerscore-nomod518}+(@{powerscore-mod518})]] @{psionmetabolic518}"></button></td>
-                                        <td><input type="text" name="attr_psionmetabolic-macro518" title="@{psionmetabolic-macro518}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-macro518" title="%{metabolic-macro518}" value="@{psionmetabolic-macro518}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod518" title="@{powerscore-mod518}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Metabolic-Devotion518" title="%{Metabolic-Devotion518}" value="/roll [[1d20cs[[{@{powerscore-nomod518}+(@{powerscore-mod518})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod518}+(@{powerscore-mod518})+(@{misc-mod}),19}kl1]] @{psionmetabolic518}"></button></td>
+                                        <td><input type="text" name="attr_psionmetabolic-macro518" title="@{psionmetabolic-macro518}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_metabolic-macro518" title="%{metabolic-macro518}" value="@{psionmetabolic-macro518}"></button></td>
                                         <td><input type="text" name="attr_PSP-cost618" title="@{PSP-cost618}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psionmetabolic519" title="@{psionmetabolic519}" class="sheet-medium"></td>
                                         <td><input type="text" name="attr_powerscore-nomod519" title="@{powerscore-nomod519}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod519" title="@{powerscore-mod519}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod519" title="@{psionic-mod519}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Metabolic-Devotion519" title="%{Metabolic-Devotion519}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod519})]]&le;[[@{powerscore-nomod519}+(@{powerscore-mod519})]] @{psionmetabolic519}"></button></td>
-                                        <td><input type="text" name="attr_psionmetabolic-macro519" title="@{psionmetabolic-macro519}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-macro519" title="%{metabolic-macro519}" value="@{psionmetabolic-macro519}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod519" title="@{powerscore-mod519}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Metabolic-Devotion519" title="%{Metabolic-Devotion519}" value="/roll [[1d20cs[[{@{powerscore-nomod519}+(@{powerscore-mod519})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod519}+(@{powerscore-mod519})+(@{misc-mod}),19}kl1]] @{psionmetabolic519}"></button></td>
+                                        <td><input type="text" name="attr_psionmetabolic-macro519" title="@{psionmetabolic-macro519}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_metabolic-macro519" title="%{metabolic-macro519}" value="@{psionmetabolic-macro519}"></button></td>
                                         <td><input type="text" name="attr_PSP-cost619" title="@{PSP-cost619}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psionmetabolic520" title="@{psionmetabolic520}" class="sheet-medium"></td>
                                         <td><input type="text" name="attr_powerscore-nomod520" title="@{powerscore-nomod520}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod520" title="@{powerscore-mod520}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod520" title="@{psionic-mod520}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Metabolic-Devotion520" title="%{Metabolic-Devotion520}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod520})]]&le;[[@{powerscore-nomod520}+(@{powerscore-mod520})]] @{psionmetabolic520}"></button></td>
-                                        <td><input type="text" name="attr_psionmetabolic-macro520" title="@{psionmetabolic-macro520}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-macro520" title="%{metabolic-macro520}" value="@{psionmetabolic-macro520}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod520" title="@{powerscore-mod520}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Metabolic-Devotion520" title="%{Metabolic-Devotion520}" value="/roll [[1d20cs[[{@{powerscore-nomod520}+(@{powerscore-mod520})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod520}+(@{powerscore-mod520})+(@{misc-mod}),19}kl1]] @{psionmetabolic520}"></button></td>
+                                        <td><input type="text" name="attr_psionmetabolic-macro520" title="@{psionmetabolic-macro520}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_metabolic-macro520" title="%{metabolic-macro520}" value="@{psionmetabolic-macro520}"></button></td>
                                         <td><input type="text" name="attr_PSP-cost620" title="@{PSP-cost620}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </ul>
                         </div>
+                    </div>
+                    <br>
+                    <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Psychometabolism Sciences</b></h4>
+                            <h4>Psychoportive Sciences</h4>
                             <ul>
-                                <table>
+                                <table class="sheet-table-white">
                                     <tr>
-                                        <td><input type="text" name="attr_metabolic-science521" title="@{metabolic-science521}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod521" title="@{powerscore-nomod521}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod521" title="@{powerscore-mod521}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod521" title="@{psionic-mod521}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Metabolic-Science521" title="%{Metabolic-Science521}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod521})]]&le;[[@{powerscore-nomod521}+(@{powerscore-mod521})]] @{metabolic-science521}"></button></td>
-                                        <td><input type="text" name="attr_psionmetabolic-science-macro521" title="@{psionmetabolic-science-macro521}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-science-macro521" title="%{metabolic-science-macro521}" value="@{psionmetabolic-science-macro521}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost621" title="@{PSP-cost621}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_portation-science515" title="@{portation-science515}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod515" title="@{powerscore-nomod515}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod515" title="@{powerscore-mod515}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Portation-Science515" title="%{Portation-Science515}" value="/roll [[1d20cs[[{@{powerscore-nomod515}+(@{powerscore-mod515})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod515}+(@{powerscore-mod515})+(@{misc-mod}),19}kl1]] @{portation-science515}"></button></td>
+                                        <td><input type="text" name="attr_psionportation-science-macro515" title="@{psionportation-science-macro515}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_portation-science-macro515" title="%{portation-science-macro515}" value="@{psionportation-science-macro515}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost615" title="@{PSP-cost615}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_metabolic-science522" title="@{metabolic-science522}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod522" title="@{powerscore-nomod522}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod522" title="@{powerscore-mod522}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod522" title="@{psionic-mod522}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Metabolic-Science522" title="%{Metabolic-Science522}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod522})]]&le;[[@{powerscore-nomod522}+(@{powerscore-mod522})]] @{metabolic-science522}"></button></td>
-                                        <td><input type="text" name="attr_psionmetabolic-science-macro522" title="@{psionmetabolic-science-macro522}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-science-macro522" title="%{metabolic-science-macro522}" value="@{psionmetabolic-science-macro522}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost622" title="@{PSP-cost622}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_portation-science516" title="@{portation-science516}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod516" title="@{powerscore-nomod516}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod516" title="@{powerscore-mod516}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Portation-Science516" title="%{Portation-Science516}" value="/roll [[1d20cs[[{@{powerscore-nomod516}+(@{powerscore-mod516})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod516}+(@{powerscore-mod516})+(@{misc-mod}),19}kl1]] @{portation-science516}"></button></td>
+                                        <td><input type="text" name="attr_psionportation-science-macro516" title="@{psionportation-science-macro516}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_portation-science-macro516" title="%{portation-science-macro516}" value="@{psionportation-science-macro516}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost616" title="@{PSP-cost616}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_metabolic-science523" title="@{metabolic-science523}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod523" title="@{powerscore-nomod523}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod523" title="@{powerscore-mod523}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod523" title="@{psionic-mod523}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Metabolic-Science523" title="%{Metabolic-Science523}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod523})]]&le;[[@{powerscore-nomod523}+(@{powerscore-mod523})]] @{metabolic-science523}"></button></td>
-                                        <td><input type="text" name="attr_psionmetabolic-science-macro523" title="@{psionmetabolic-science-macro523}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-science-macro523" title="%{metabolic-science-macro523}" value="@{psionmetabolic-science-macro523}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost623" title="@{PSP-cost623}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_portation-science517" title="@{portation-science517}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod517" title="@{powerscore-nomod517}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod517" title="@{powerscore-mod517}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Portation-Science517" title="%{Portation-Science517}" value="/roll [[1d20cs[[{@{powerscore-nomod517}+(@{powerscore-mod517})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod517}+(@{powerscore-mod517})+(@{misc-mod}),19}kl1]] @{portation-science517}"></button></td>
+                                        <td><input type="text" name="attr_psionportation-science-macro517" title="@{psionportation-science-macro517}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_portation-science-macro517" title="%{portation-science-macro517}" value="@{psionportation-science-macro517}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost617" title="@{PSP-cost617}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </ul>
                         </div>
-                    </div>
-                    <br>
-                    <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Clairsentient Devotions</b></h4>
+                            <h4>Psychoportive Devotions</h4>
                             <ul>
-                                <table>
+                                <table class="sheet-table-white">
                                     <tr>
-                                        <td><input type="text" name="attr_psionclair524" title="@{psionclair524}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod524" title="@{powerscore-nomod524}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod524" title="@{powerscore-mod524}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod524" title="@{psionic-mod524}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Clair-Devotion524" title="%{Clair-Devotion524}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod524})]]&le;[[@{powerscore-nomod524}+(@{powerscore-mod524})]] @{psionclair524}"></button></td>
-                                        <td><input type="text" name="attr_psionclair-macro524" title="@{psionclair-macro524}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-macro524" title="%{clair-macro524}" value="@{psionclair-macro524}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost624" title="@{PSP-cost624}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionportation512" title="@{psionportation512}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod512" title="@{powerscore-nomod512}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod512" title="@{powerscore-mod512}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Portation-Devotion512" title="%{Portation-Devotion512}" value="/roll [[1d20cs[[{@{powerscore-nomod512}+(@{powerscore-mod512})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod512}+(@{powerscore-mod512})+(@{misc-mod}),19}kl1]] @{psionportation512}"></button></td>
+                                        <td><input type="text" name="attr_psionportation-macro512" title="@{psionportation-macro512}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_portation-macro512" title="%{portation-macro512}" value="@{psionportation-macro512}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost612" title="@{PSP-cost612}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionclair525" title="@{psionclair525}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod525" title="@{powerscore-nomod525}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod525" title="@{powerscore-mod525}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod525" title="@{psionic-mod525}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Clair-Devotion525" title="%{Clair-Devotion525}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod525})]]&le;[[@{powerscore-nomod525}+(@{powerscore-mod525})]] @{psionclair525}"></button></td>
-                                        <td><input type="text" name="attr_psionclair-macro525" title="@{psionclair-macro525}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-macro525" title="%{clair-macro525}" value="@{psionclair-macro525}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost625" title="@{PSP-cost625}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionportation513" title="@{psionportation513}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod513" title="@{powerscore-nomod513}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod513" title="@{powerscore-mod513}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Portation-Devotion513" title="%{Portation-Devotion513}" value="/roll [[1d20cs[[{@{powerscore-nomod513}+(@{powerscore-mod513})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod513}+(@{powerscore-mod513})+(@{misc-mod}),19}kl1]] @{psionportation513}"></button></td>
+                                        <td><input type="text" name="attr_psionportation-macro513" title="@{psionportation-macro513}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_portation-macro513" title="%{portation-macro513}" value="@{psionportation-macro513}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost613" title="@{PSP-cost613}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionclair526" title="@{psionclair526}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod526" title="@{powerscore-nomod526}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod526" title="@{powerscore-mod526}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod526" title="@{psionic-mod526}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Clair-Devotion526" title="%{Clair-Devotion526}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod526})]]&le;[[@{powerscore-nomod526}+(@{powerscore-mod526})]] @{psionclair526}"></button></td>
-                                        <td><input type="text" name="attr_psionclair-macro526" title="@{psionclair-macro526}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-macro526" title="%{clair-macro526}" value="@{psionclair-macro526}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost626" title="@{PSP-cost626}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionportation514" title="@{psionportation514}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod514" title="@{powerscore-nomod514}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod514" title="@{powerscore-mod514}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Portation-Devotion514" title="%{Portation-Devotion514}" value="/roll [[1d20cs[[{@{powerscore-nomod514}+(@{powerscore-mod514})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod514}+(@{powerscore-mod514})+(@{misc-mod}),19}kl1]] @{psionportation514}"></button></td>
+                                        <td><input type="text" name="attr_psionportation-macro514" title="@{psionportation-macro514}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_portation-macro514" title="%{portation-macro514}" value="@{psionportation-macro514}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost614" title="@{PSP-cost614}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </ul>
                         </div>
+                    </div>
+                    <br>
+                    <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Clairsentient Sciences</b></h4>
+                            <h4>Telepathic Sciences</h4>
                             <ul>
-                                <table>
+                                <table class="sheet-table-white">
                                     <tr>
-                                        <td><input type="text" name="attr_clair-science527" title="@{clair-science527}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod527" title="@{powerscore-nomod527}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod527" title="@{powerscore-mod527}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod527" title="@{psionic-mod527}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Clair-Science527" title="%{Clair-Science527}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod527})]]&le;[[@{powerscore-nomod527}+(@{powerscore-mod527})]] @{clair-science527}"></button></td>
-                                        <td><input type="text" name="attr_psionclai-science-macro527" title="@{psionclair-science-macro527}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-science-macro527" title="%{clair-science-macro527}" value="@{psionclair-science-macro527}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost627" title="@{PSP-cost627}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_telepathic-science503" title="@{telepathic-science503}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod503" title="@{powerscore-nomod503}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod503" title="@{powerscore-mod503}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Telepathy-Science503" title="%{Telepathy-Science503}" value="/roll [[1d20cs[[{@{powerscore-nomod503}+(@{powerscore-mod503})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod503}+(@{powerscore-mod503})+(@{misc-mod}),19}kl1]] @{telepathic-science503}"></button></td>
+                                        <td><input type="text" name="attr_psiontelepathic-science-macro503" title="@{psiontelepathic-science-macro503}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_telepathic-science-macro503" title="%{telepathic-science-macro503}" value="@{psiontelepathic-science-macro503}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost603" title="@{PSP-cost603}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_clair-science528" title="@{clair-science528}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod528" title="@{powerscore-nomod528}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod528" title="@{powerscore-mod528}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod528" title="@{psionic-mod528}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Clair-Science528" title="%{Clair-Science528}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod528})]]&le;[[@{powerscore-nomod528}+(@{powerscore-mod528})]] @{clair-science528}"></button></td>
-                                        <td><input type="text" name="attr_psionclair-science-macro528" title="@{psionclair-science-macro528}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-science-macro528" title="%{clair-science-macro528}" value="@{psionclair-science-macro528}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost628" title="@{PSP-cost628}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_telepathic-science504" title="@{telepathic-science504}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod504" title="@{powerscore-nomod504}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod504" title="@{powerscore-mod504}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Telepathy-Science504" title="%{Telepathy-Science504}" value="/roll [[1d20cs[[{@{powerscore-nomod504}+(@{powerscore-mod504})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod504}+(@{powerscore-mod504})+(@{misc-mod}),19}kl1]] @{telepathic-science504}"></button></td>
+                                        <td><input type="text" name="attr_psiontelepathic-science-macro504" title="@{psiontelepathic-science-macro504}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_telepathic-science-macro504" title="%{telepathic-science-macro504}" value="@{psiontelepathic-science-macro504}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost604" title="@{PSP-cost604}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_clair-science529" title="@{clair-science529}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod529" title="@{powerscore-nomod529}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod529" title="@{powerscore-mod529}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod529" title="@{psionic-mod529}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Clair-Science529" title="%{Clair-Science529}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod529})]]&le;[[@{powerscore-nomod529}+(@{powerscore-mod529})]] @{clair-science529}"></button></td>
-                                        <td><input type="text" name="attr_psionclair-science-macro529" title="@{psionclair-science-macro529}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-science-macro529" title="%{clair-science-macro529}" value="@{psionclair-science-macro529}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost629" title="@{PSP-cost629}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_telepathic-science505" title="@{telepathic-science505}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod505" title="@{powerscore-nomod505}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod505" title="@{powerscore-mod505}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Telepathy-Science505" title="%{Telepathy-Science505}" value="/roll [[1d20cs[[{@{powerscore-nomod505}+(@{powerscore-mod505})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod505}+(@{powerscore-mod505})+(@{misc-mod}),19}kl1]] @{telepathic-science505}"></button></td>
+                                        <td><input type="text" name="attr_psiontelepathic-science-macro505" title="@{psiontelepathic-science-macro505}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_telepathic-science-macro505" title="%{telepathic-science-macro505}" value="@{psiontelepathic-science-macro505}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost605" title="@{PSP-cost605}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </ul>
                         </div>
-                    </div>
-                    <br>
-                    <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Metapsionic Devotions</b></h4>
+                            <h4>Telepathic Devotions</h4>
                             <ul>
-                                <table>
+                                <table class="sheet-table-white">
                                     <tr>
-                                        <td><input type="text" name="attr_psionmeta536" title="@{psionmeta536}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod536" title="@{powerscore-nomod536}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod536" title="@{powerscore-mod536}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod536" title="@{psionic-mod536}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Meta-Devotion536" title="%{Meta-Devotion536}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod536})]]&le;[[@{powerscore-nomod536}+(@{powerscore-mod536})]] @{psionmeta536}"></button></td>
-                                        <td><input type="text" name="attr_psionmeta-macro536" title="@{psionmeta-macro536}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-macro536" title="%{meta-macro536}" value="@{psionmeta-macro536}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost636" title="@{PSP-cost636}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psiontelepathic500" title="@{psiontelepathic500}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod500" title="@{powerscore-nomod500}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod500" title="@{powerscore-mod500}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Telepathy-Devotion500" title="%{Telepathy-Devotion500}" value="/roll [[1d20cs[[{@{powerscore-nomod500}+(@{powerscore-mod500})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod500}+(@{powerscore-mod500})+(@{misc-mod}),19}kl1]] @{psiontelepathic500}"></button></td>
+                                        <td><input type="text" name="attr_psiontelepathic-macro500" title="@{psiontelepathic-macro500}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_telepathic-macro500" title="%{telepathic-macro500}" value="@{psiontelepathic-macro500}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost600" title="@{PSP-cost600}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionmeta537" title="@{psionmeta537}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod537" title="@{powerscore-nomod537}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod537" title="@{powerscore-mod537}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod537" title="@{psionic-mod537}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Meta-Devotion537" title="%{Meta-Devotion537}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod537})]]&le;[[@{powerscore-nomod537}+(@{powerscore-mod537})]] @{psionmeta537}"></button></td>
-                                        <td><input type="text" name="attr_psionmeta-macro537" title="@{psionmeta-macro537}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-macro537" title="%{meta-macro537}" value="@{psionmeta-macro537}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost637" title="@{PSP-cost637}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psiontelepathic501" title="@{psiontelepathic501}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod501" title="@{powerscore-nomod501}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod501" title="@{powerscore-mod501}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Telepathy-Devotion501" title="%{Telepathy-Devotion501}" value="/roll [[1d20cs[[{@{powerscore-nomod501}+(@{powerscore-mod501})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod501}+(@{powerscore-mod501})+(@{misc-mod}),19}kl1]] @{psiontelepathic501}"></button></td>
+                                        <td><input type="text" name="attr_psiontelepathic-macro501" title="@{psiontelepathic-macro501}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_telepathic-macro501" title="%{telepathic-macro501}" value="@{psiontelepathic-macro501}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost601" title="@{PSP-cost601}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionmeta538" title="@{psionmeta538}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod538" title="@{powerscore-nomod538}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod538" title="@{powerscore-mod538}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod538" title="@{psionic-mod538}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Meta-Devotion538" title="%{Meta-Devotion538}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod538})]]&le;[[@{powerscore-nomod538}+(@{powerscore-mod538})]] @{psionmeta538}"></button></td>
-                                        <td><input type="text" name="attr_psionmeta-macro538" title="@{psionmeta-macro538}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-macro538" title="%{meta-macro538}" value="@{psionmeta-macro538}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost638" title="@{PSP-cost638}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psiontelepathic502" title="@{psiontelepathic502}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod502" title="@{powerscore-nomod502}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod502" title="@{powerscore-mod502}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Telepathy-Devotion502" title="%{Telepathy-Devotion502}" value="/roll [[1d20cs[[{@{powerscore-nomod502}+(@{powerscore-mod502})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod502}+(@{powerscore-mod502})+(@{misc-mod}),19}kl1]] @{psiontelepathic502}"></button></td>
+                                        <td><input type="text" name="attr_psiontelepathic-macro502" title="@{psiontelepathic-macro502}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_telepathic-macro502" title="%{telepathic-macro502}" value="@{psiontelepathic-macro502}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost602" title="@{PSP-cost602}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </ul>
                         </div>
+                    </div>
+                    <br>
+                    <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Metapsionic Sciences</b></h4>
+                            <h4>Metapsionic Sciences</h4>
                             <ul>
-                                <table>
+                                <table class="sheet-table-white">
                                     <tr>
                                         <td><input type="text" name="attr_meta-science539" title="@{meta-science539}" class="sheet-medium"></td>
                                         <td><input type="text" name="attr_powerscore-nomod539" title="@{powerscore-nomod539}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod539" title="@{powerscore-mod539}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod539" title="@{psionic-mod539}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Meta-Science539" title="%{Meta-Science539}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod539})]]&le;[[@{powerscore-nomod539}+(@{powerscore-mod539})]] @{meta-science539}"></button></td>
-                                        <td><input type="text" name="attr_psionmeta-science-macro539" title="@{psionmeta-science-macro539}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-science-macro539" title="%{meta-science-macro539}" value="@{psionmeta-science-macro539}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod539" title="@{powerscore-mod539}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Meta-Science539" title="%{Meta-Science539}" value="/roll [[1d20cs[[{@{powerscore-nomod539}+(@{powerscore-mod539})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod539}+(@{powerscore-mod539})+(@{misc-mod}),19}kl1]] @{meta-science539}"></button></td>
+                                        <td><input type="text" name="attr_psionmeta-science-macro539" title="@{psionmeta-science-macro539}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_meta-science-macro539" title="%{meta-science-macro539}" value="@{psionmeta-science-macro539}"></button></td>
                                         <td><input type="text" name="attr_PSP-cost639" title="@{PSP-cost639}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_meta-science540" title="@{meta-science540}" class="sheet-medium"></td>
                                         <td><input type="text" name="attr_powerscore-nomod540" title="@{powerscore-nomod540}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod540" title="@{powerscore-mod540}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod540" title="@{psionic-mod540}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Meta-Science540" title="%{Meta-Science540}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod540})]]&le;[[@{powerscore-nomod540}+(@{powerscore-mod540})]] @{meta-science540}"></button></td>
-                                        <td><input type="text" name="attr_psionmeta-science-macro540" title="@{psionmeta-science-macro540}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-science-macro540" title="%{meta-science-macro540}" value="@{psionmeta-science-macro540}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod540" title="@{powerscore-mod540}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Meta-Science540" title="%{Meta-Science540}" value="/roll [[1d20cs[[{@{powerscore-nomod540}+(@{powerscore-mod540})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod540}+(@{powerscore-mod540})+(@{misc-mod}),19}kl1]] @{meta-science540}"></button></td>
+                                        <td><input type="text" name="attr_psionmeta-science-macro540" title="@{psionmeta-science-macro540}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_meta-science-macro540" title="%{meta-science-macro540}" value="@{psionmeta-science-macro540}"></button></td>
                                         <td><input type="text" name="attr_PSP-cost640" title="@{PSP-cost640}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_meta-science541" title="@{meta-science541}" class="sheet-medium"></td>
                                         <td><input type="text" name="attr_powerscore-nomod541" title="@{powerscore-nomod541}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod541" title="@{powerscore-mod541}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod541" title="@{psionic-mod541}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Meta-Science541" title="%{Meta-Science541}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod541})]]&le;[[@{powerscore-nomod541}+(@{powerscore-mod541})]] @{meta-science541}"></button></td>
-                                        <td><input type="text" name="attr_psionmeta-science-macro541" title="@{psionmeta-science-macro541}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-science-macro541" title="%{meta-science-macro541}" value="@{psionmeta-science-macro541}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod541" title="@{powerscore-mod541}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Meta-Science541" title="%{Meta-Science541}" value="/roll [[1d20cs[[{@{powerscore-nomod541}+(@{powerscore-mod541})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod541}+(@{powerscore-mod541})+(@{misc-mod}),19}kl1]] @{meta-science541}"></button></td>
+                                        <td><input type="text" name="attr_psionmeta-science-macro541" title="@{psionmeta-science-macro541}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_meta-science-macro541" title="%{meta-science-macro541}" value="@{psionmeta-science-macro541}"></button></td>
                                         <td><input type="text" name="attr_PSP-cost641" title="@{PSP-cost641}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </ul>
                         </div>
+                        <div class="sheet-col">
+                            <h4>Metapsionic Devotions</h4>
+                            <ul>
+                                <table class="sheet-table-white">
+                                    <tr>
+                                        <td><input type="text" name="attr_psionmeta536" title="@{psionmeta536}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod536" title="@{powerscore-nomod536}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod536" title="@{powerscore-mod536}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Meta-Devotion536" title="%{Meta-Devotion536}" value="/roll [[1d20cs[[{@{powerscore-nomod536}+(@{powerscore-mod536})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod536}+(@{powerscore-mod536})+(@{misc-mod}),19}kl1]] @{psionmeta536}"></button></td>
+                                        <td><input type="text" name="attr_psionmeta-macro536" title="@{psionmeta-macro536}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_meta-macro536" title="%{meta-macro536}" value="@{psionmeta-macro536}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost636" title="@{PSP-cost636}" placeholder="#" class="sheet-small"/></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name="attr_psionmeta537" title="@{psionmeta537}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod537" title="@{powerscore-nomod537}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod537" title="@{powerscore-mod537}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Meta-Devotion537" title="%{Meta-Devotion537}" value="/roll [[1d20cs[[{@{powerscore-nomod537}+(@{powerscore-mod537})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod537}+(@{powerscore-mod537})+(@{misc-mod}),19}kl1]] @{psionmeta537}"></button></td>
+                                        <td><input type="text" name="attr_psionmeta-macro537" title="@{psionmeta-macro537}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_meta-macro537" title="%{meta-macro537}" value="@{psionmeta-macro537}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost637" title="@{PSP-cost637}" placeholder="#" class="sheet-small"/></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name="attr_psionmeta538" title="@{psionmeta538}" class="sheet-medium"></td>
+                                        <td><input type="text" name="attr_powerscore-nomod538" title="@{powerscore-nomod538}" placeholder="@{}" class="sheet-small"></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod538" title="@{powerscore-mod538}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Meta-Devotion538" title="%{Meta-Devotion538}" value="/roll [[1d20cs[[{@{powerscore-nomod538}+(@{powerscore-mod538})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod538}+(@{powerscore-mod538})+(@{misc-mod}),19}kl1]] @{psionmeta538}"></button></td>
+                                        <td><input type="text" name="attr_psionmeta-macro538" title="@{psionmeta-macro538}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_meta-macro538" title="%{meta-macro538}" value="@{psionmeta-macro538}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost638" title="@{PSP-cost638}" placeholder="#" class="sheet-small"/></td>
+                                    </tr>
+                                </table>
+                            </ul>
+                        </div>
                     </div>
                     <br>
                     <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Attack Modes</b></h4>
+                            <h4>Attack Modes</h4>
                             <ul>
-                                <table>
+                                <table class="sheet-table-white">
                                     <tr>
                                         <td><input type="text" name="attr_psionattacking530" title="@{psionattacking530}" class="sheet-medium"></td>
                                         <td><input type="text" name="attr_powerscore-nomod530" title="@{powerscore-nomod530}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod530" title="@{powerscore-mod530}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod530" title="@{psionic-mod530}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Attacking530" title="%{Attacking530}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod530})]]&le;[[@{powerscore-nomod530}+(@{powerscore-mod530})]] @{psionattacking530}"></button></td>
-                                        <td><input type="text" name="attr_psionattacking-macro530" title="@{psionattacking-macro530}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_attacking-macro530" title="%{attacking-macro530}" value="@{psionattacking-macro530}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod530" title="@{powerscore-mod530}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Attacking530" title="%{Attacking530}" value="/roll [[1d20cs[[{@{powerscore-nomod530}+(@{powerscore-mod530})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod530}+(@{powerscore-mod530})+(@{misc-mod}),19}kl1]] @{psionattacking530}"></button></td>
+                                        <td><input type="text" name="attr_psionattacking-macro530" title="@{psionattacking-macro530}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_attacking-macro530" title="%{attacking-macro530}" value="@{psionattacking-macro530}"></button></td>
                                         <td><input type="text" name="attr_PSP-cost630" title="@{PSP-cost630}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psionattacking531" title="@{psionattacking531}" class="sheet-medium"></td>
                                         <td><input type="text" name="attr_powerscore-nomod531" title="@{powerscore-nomod531}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod531" title="@{powerscore-mod531}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod531" title="@{psionic-mod531}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Attacking531" title="%{Attacking531}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod531})]]&le;[[@{powerscore-nomod531}+(@{powerscore-mod531})]] @{psionattacking531}"></button></td>
-                                        <td><input type="text" name="attr_psionattacking-macro531" title="@{psionattacking-macro531}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_attacking-macro531" title="%{attacking-macro531}" value="@{psionattacking-macro531}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod531" title="@{powerscore-mod531}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Attacking531" title="%{Attacking531}" value="/roll [[1d20cs[[{@{powerscore-nomod531}+(@{powerscore-mod531})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod531}+(@{powerscore-mod531})+(@{misc-mod}),19}kl1]] @{psionattacking531}"></button></td>
+                                        <td><input type="text" name="attr_psionattacking-macro531" title="@{psionattacking-macro531}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_attacking-macro531" title="%{attacking-macro531}" value="@{psionattacking-macro531}"></button></td>
                                         <td><input type="text" name="attr_PSP-cost631" title="@{PSP-cost631}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psionattacking532" title="@{psionattacking532}" class="sheet-medium"></td>
                                         <td><input type="text" name="attr_powerscore-nomod532" title="@{powerscore-nomod532}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod532" title="@{powerscore-mod532}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod532" title="@{psionic-mod532}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Attacking532" title="%{Attacking532}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod532})]]&le;[[@{powerscore-nomod532}+(@{powerscore-mod532})]] @{psionattacking532}"></button></td>
-                                        <td><input type="text" name="attr_psionattacking-macro532" title="@{psionattacking-macro532}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_attacking-macro532" title="%{attacking-macro532}" value="@{psionattacking-macro532}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod532" title="@{powerscore-mod532}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Attacking532" title="%{Attacking532}" value="/roll [[1d20cs[[{@{powerscore-nomod532}+(@{powerscore-mod532})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod532}+(@{powerscore-mod532})+(@{misc-mod}),19}kl1]] @{psionattacking532}"></button></td>
+                                        <td><input type="text" name="attr_psionattacking-macro532" title="@{psionattacking-macro532}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_attacking-macro532" title="%{attacking-macro532}" value="@{psionattacking-macro532}"></button></td>
                                         <td><input type="text" name="attr_PSP-cost632" title="@{PSP-cost632}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </ul>
                         </div>
                         <div class="sheet-col">
-                            <h4><b>Defense Modes</b></h4>
+                            <h4>Defense Modes</h4>
                             <ul>
-                                <table>
+                                <table class="sheet-table-white">
                                     <tr>
                                         <td><input type="text" name="attr_psiondefending533" title="@{psiondefending533}" class="sheet-medium"></td>
                                         <td><input type="text" name="attr_powerscore-nomod533" title="@{powerscore-nomod533}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod533" title="@{powerscore-mod533}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod533" title="@{psionic-mod533}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Defending533" title="%{Defending533}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod533})]]&le;[[@{powerscore-nomod533}+(@{powerscore-mod533})]] @{psiondefending533}"></button></td>
-                                        <td><input type="text" name="attr_psiondefending-macro533" title="@{psiondefending-macro533}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_defending-macro533" title="%{defending-macro533}" value="@{psiondefending-macro533}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod533" title="@{powerscore-mod533}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Defending533" title="%{Defending533}" value="/roll [[1d20cs[[{@{powerscore-nomod533}+(@{powerscore-mod533})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod533}+(@{powerscore-mod533})+(@{misc-mod}),19}kl1]] @{psiondefending533}"></button></td>
+                                        <td><input type="text" name="attr_psiondefending-macro533" title="@{psiondefending-macro533}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_defending-macro533" title="%{defending-macro533}" value="@{psiondefending-macro533}"></button></td>
                                         <td><input type="text" name="attr_PSP-cost633" title="@{PSP-cost633}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psiondefending534" title="@{psiondefending534}" class="sheet-medium"></td>
                                         <td><input type="text" name="attr_powerscore-nomod534" title="@{powerscore-nomod534}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod534" title="@{powerscore-mod534}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod534" title="@{psionic-mod534}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Defending534" title="%{Defending534}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod534})]]&le;[[@{powerscore-nomod534}+(@{powerscore-mod534})]] @{psiondefending534}"></button></td>
-                                        <td><input type="text" name="attr_psiondefending-macro534" title="@{psiondefending-macro534}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_defending-macro534" title="%{defending-macro534}" value="@{psiondefending-macro534}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod534" title="@{powerscore-mod534}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Defending534" title="%{Defending534}" value="/roll [[1d20cs[[{@{powerscore-nomod534}+(@{powerscore-mod534})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod534}+(@{powerscore-mod534})+(@{misc-mod}),19}kl1]] @{psiondefending534}"></button></td>
+                                        <td><input type="text" name="attr_psiondefending-macro534" title="@{psiondefending-macro534}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_defending-macro534" title="%{defending-macro534}" value="@{psiondefending-macro534}"></button></td>
                                         <td><input type="text" name="attr_PSP-cost634" title="@{PSP-cost634}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psiondefending535" title="@{psiondefending535}" class="sheet-medium"></td>
                                         <td><input type="text" name="attr_powerscore-nomod535" title="@{powerscore-nomod535}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod535" title="@{powerscore-mod535}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod535" title="@{psionic-mod535}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Defending535" title="%{Defending535}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod535})]]&le;[[@{powerscore-nomod535}+(@{powerscore-mod535})]] @{psiondefending535}"></button></td>
-                                        <td><input type="text" name="attr_psiondefending-macro535" title="@{psiondefending-macro535}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_defending-macro535" title="%{defending-macro535}" value="@{psiondefending-macro535}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_powerscore-mod535" title="@{powerscore-mod535}" placeholder="#" class="sheet-tiny"></td>
+                                        <td><button type="roll" name="roll_Defending535" title="%{Defending535}" value="/roll [[1d20cs[[{@{powerscore-nomod535}+(@{powerscore-mod535})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod535}+(@{powerscore-mod535})+(@{misc-mod}),19}kl1]] @{psiondefending535}"></button></td>
+                                        <td><input type="text" name="attr_psiondefending-macro535" title="@{psiondefending-macro535}" class="sheet-track" placeholder="Macro"></td>
+                                        <td><button type="roll" name="roll_defending-macro535" title="%{defending-macro535}" value="@{psiondefending-macro535}"></button></td>
                                         <td><input type="text" name="attr_PSP-cost635" title="@{PSP-cost635}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
@@ -17893,34 +17842,34 @@ <h4><b>Defense Modes</b></h4>
                     <div class="sheet-2colrow">
                         <div class="sheet-col">
                             <h4>Psionic Strength Points</h4>
-                            <table style='width:250px;'>
+                            <table class="sheet-table-white sheet-default-header-first-row sheet-default-header-first-column" style='width:250px;'>
                                 <tr>
-                                    <td class="sheet-default-header" style="width:100px;">Value</td>
-                                    <td class="sheet-default-header" style="width:50px;">Current</td>
-                                    <td class="sheet-default-header" style="width:15px;">/</td>
-                                    <td class="sheet-default-header" style="width:60px;">Maximum</td>
-                                    <td class="sheet-default-header" style="width:25px;">Speed</td>
+                                    <td style="width:100px;">Value</td>
+                                    <td style="width:50px;">Current</td>
+                                    <td style="width:15px;">/</td>
+                                    <td style="width:60px;">Maximum</td>
+                                    <td style="width:25px;">Speed</td>
                                 </tr>
                                 <tr>
-                                    <td class="sheet-default-header" style=" width:100px;">PSP:</td>
+                                    <td>PSP:</td>
                                     <td><input type="number" name="attr_PSP500" title="@{PSP500}" class="sheet-short" placeholder="PSP"/></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold; width:15px">/</td>
+                                    <td>/</td>
                                     <td><input type="number" name="attr_PSP500_max" title="@{PSP500|max}" class="sheet-short"/></td>
                                 </tr>
                                 <tr>
-                                    <td class="sheet-default-header" style="width:100px;">Temp PSP:</td>
+                                    <td>Temp PSP:</td>
                                     <td><input type="number" name="attr_tempPSP500" title="@{tempPSP500}" class="sheet-short" placeholder="Temp"/></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold; width:15px;">/</td>
+                                    <td>/</td>
                                     <td><input type="number" name="attr_tempPSP500_max" title="@{tempPSP500|max}" class="sheet-short"/></td>
                                 </tr>
                                 <tr>
-                                    <td class="sheet-default-header" style="width:100px;">Stored PSP:</td>
+                                    <td>Stored PSP:</td>
                                     <td><input type="number" name="attr_storedPSP500" title="@{storedPSP500}" class="sheet-short" placeholder="Stored"/></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold; width:15px;">/</td>
+                                    <td>/</td>
                                     <td><input type="number" name="attr_storedPSP500_max" title="@{storedPSP500|max}" class="sheet-short"/></td>
                                 </tr>
                                 <tr>
-                                    <td class="sheet-default-header" style="width: 25px;">Speed</td>
+                                    <td>Speed</td>
                                     <td></td>
                                     <td></td>
                                     <td><input type="text" name="attr_psispeed501" title="@{psispeed501}" class="sheet-small"></td>
@@ -17929,33 +17878,43 @@ <h4>Psionic Strength Points</h4>
                             </table>
                         </div>
                         <div class="sheet-col">
-                            <h4><b>Psionic Proficiencies</b></h4>
+                            <h4>Psionic Proficiencies</h4>
                             <ul>
-                                <table>
+                                <table class="sheet-table-white">
                                     <tr>
                                         <td><input type="text" name="attr_psiprofname500" title="@{psiprofname500}" placeholder="Name of NWP"></td>
                                         <td><input type="text" name="attr_psiprofstatnum500" title="@{psiprofstatnum500}" placeholder="@{}" class="sheet-short"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod500" title="@{psiprofmod500}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots500" title="@{psiprofslots500}" class="sheet-short" placeholder="#"><button type="roll" name="roll_Psiprof500" title="%{Psiprof500}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum500})+(@{psiprofmod500})]] @{psiprofname500}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_psiprofmod500" title="@{psiprofmod500}" value="0" class="sheet-short"></td>
+                                        <td><input type="number" name="attr_psiprofslots500" title="@{psiprofslots500}" class="sheet-short" placeholder="#"></td>
+                                        <td><button type="roll" name="roll_Psiprof500" title="%{Psiprof500}" value="&{template:2Echeck} {{checkvs=@{psiprofname500} Check}} {{character=@{henchname5}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psiprofstatnum500})+(@{psiprofmod500})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psiprofname501" title="@{psiprofname501}" placeholder="Name of NWP"></td>
                                         <td><input type="text" name="attr_psiprofstatnum501" title="@{psiprofstatnum501}" placeholder="@{}" class="sheet-short"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod501" title="@{psiprofmod501}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots501" title="@{psiprofslots501}" class="sheet-short" placeholder="#"><button type="roll" name="roll_Psiprof501" title="%{Psiprof501}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum501})+(@{psiprofmod501})]] @{psiprofname501}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_psiprofmod501" title="@{psiprofmod501}" value="0" class="sheet-short"></td>
+                                        <td><input type="number" name="attr_psiprofslots501" title="@{psiprofslots501}" class="sheet-short" placeholder="#"></td>
+                                        <td><button type="roll" name="roll_Psiprof501" title="%{Psiprof501}" value="&{template:2Echeck} {{checkvs=@{psiprofname501} Check}} {{character=@{henchname5}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psiprofstatnum501})+(@{psiprofmod501})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psiprofname502" title="@{psiprofname502}" placeholder="Name of NWP"></td>
                                         <td><input type="text" name="attr_psiprofstatnum502" title="@{psiprofstatnum502}" placeholder="@{}" class="sheet-short"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod502" title="@{psiprofmod502}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots502" title="@{psiprofslots502}" class="sheet-short" placeholder="#"><button type="roll" name="roll_Psiprof502" title="%{Psiprof502}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum502})+(@{psiprofmod502})]] @{psiprofname502}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_psiprofmod502" title="@{psiprofmod502}" value="0" class="sheet-short"></td>
+                                        <td><input type="number" name="attr_psiprofslots502" title="@{psiprofslots502}" class="sheet-short" placeholder="#"></td>
+                                        <td><button type="roll" name="roll_Psiprof502" title="%{Psiprof502}" value="&{template:2Echeck} {{checkvs=@{psiprofname502} Check}} {{character=@{henchname5}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psiprofstatnum502})+(@{psiprofmod502})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psiprofname503" title="@{psiprofname503}" placeholder="Name of NWP"></td>
                                         <td><input type="text" name="attr_psiprofstatnum503" title="@{psiprofstatnum503}" placeholder="@{}" class="sheet-short"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod503" title="@{psiprofmod503}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots503" title="@{psiprofslots503}" class="sheet-short" placeholder="#"><button type="roll" name="roll_Psiprof503" title="%{Psiprof503}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum503})+(@{psiprofmod503})]] @{psiprofname503}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_psiprofmod503" title="@{psiprofmod503}" value="0" class="sheet-short"></td>
+                                        <td><input type="number" name="attr_psiprofslots503" title="@{psiprofslots503}" class="sheet-short" placeholder="#"></td>
+                                        <td><button type="roll" name="roll_Psiprof503" title="%{Psiprof503}" value="&{template:2Echeck} {{checkvs=@{psiprofname503} Check}} {{character=@{henchname5}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psiprofstatnum503})+(@{psiprofmod503})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psiprofname504" title="@{psiprofname504}" placeholder="Name of NWP"></td>
                                         <td><input type="text" name="attr_psiprofstatnum504" title="@{psiprofstatnum504}" placeholder="@{}" class="sheet-short"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod504" title="@{psiprofmod504}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots504" title="@{psiprofslots504}" class="sheet-short" placeholder="#"><button type="roll" name="roll_Psiprof504" title="%{Psiprof504}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum504})+(@{psiprofmod504})]] @{psiprofname504}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_psiprofmod504" title="@{psiprofmod504}" value="0" class="sheet-short"></td>
+                                        <td><input type="number" name="attr_psiprofslots504" title="@{psiprofslots504}" class="sheet-short" placeholder="#"></td>
+                                        <td><button type="roll" name="roll_Psiprof504" title="%{Psiprof504}" value="&{template:2Echeck} {{checkvs=@{psiprofname504} Check}} {{character=@{henchname5}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psiprofstatnum504})+(@{psiprofmod504})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                     </tr>
                                 </table>
                             </ul>
@@ -17980,76 +17939,76 @@ <h4>Psionics Revised</h4>
                     <br>
                     <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Telepathy Devotions</b></h4>
-                            <table>
+                            <h4>Clairsentient Sciences</h4>
+                            <table class="sheet-default-header-first-row">
                                 <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
+                                    <td>Ability Name</td>
+                                    <td>MThAC0<br>Adj.</td>
+                                    <td>MAC</td>
+                                    <td>MThAC0</td>
+                                    <td>Macro</td>
+                                    <td>PSP<br>Cost</td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-telepathy-name700" title="@{psionic-telepathy-name700}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj700" title="@{mthac0adj700}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac700" title="@{mac700}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0700" title="@{MThAC0700}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit700" title="%{mthac02-hit700}" value="@{henchname5} hits a MAC of [[@{MThAC0700}-(1d20+(@{mthac0adj700})+(@{misc-mod}))]]&le;[[@{mac700}]] using their @{psionic-telepathy-name700}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro700" title="@{psionic-macro700}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check700" title="%{psionic-macro3-check700}" value="@{psionic-macro700}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost700" title="@{PSP-cost700}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-clairsentience-science-name727" title="@{psionic-clairsentience-science-name727}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj727" title="@{mthac0adj727}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac727" title="@{mac727}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0727" title="@{MThAC0727}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit727" title="%{mthac011-hit727}" value="@{henchname5} hits a MAC of [[@{MThAC0727}-(1d20+(@{mthac0adj727})+(@{misc-mod}))]]&le;[[@{mac727}]] using their @{psionic-clairsentience-science-name727}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro727" title="@{psionic-macro727}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check727" title="%{psionic-macro12-check727}" value="@{psionic-macro727}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost727" title="@{PSP-cost727}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-telepathy-name701" title="@{psionic-telepathy-name701}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj701" title="@{mthac0adj701}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac701" title="@{mac701}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0701" title="@{MThAC0701}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit701" title="%{mthac02-hit701}" value="@{henchname5} hits a MAC of [[@{MThAC0701}-(1d20+(@{mthac0adj701})+(@{misc-mod}))]]&le;[[@{mac701}]] using their @{psionic-telepathy-name701}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro701" title="@{psionic-macro701}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check701" title="%{psionic-macro3-check701}" value="@{psionic-macro701}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost701" title="@{PSP-cost701}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-clairsentience-science-name728" title="@{psionic-clairsentience-science-name728}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj728" title="@{mthac0adj728}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac728" title="@{mac728}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0728" title="@{MThAC0728}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit728" title="%{mthac011-hit728}" value="@{henchname5} hits a MAC of [[@{MThAC0728}-(1d20+(@{mthac0adj728})+(@{misc-mod}))]]&le;[[@{mac728}]] using their @{psionic-clairsentience-science-name728}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro728" title="@{psionic-macro728}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check728" title="%{psionic-macro12-check728}" value="@{psionic-macro728}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost728" title="@{PSP-cost728}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-telepathy-name702" title="@{psionic-telepathy-name702}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj702" title="@{mthac0adj702}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac702" title="@{mac702}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0702" title="@{MThAC0702}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit702" title="%{mthac02-hit702}" value="@{henchname5} hits a MAC of [[@{MThAC0702}-(1d20+(@{mthac0adj702})+(@{misc-mod}))]]&le;[[@{mac702}]] using their @{psionic-telepathy-name702}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro702" title="@{psionic-macro702}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check702" title="%{psionic-macro3-check702}" value="@{psionic-macro702}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost702" title="@{PSP-cost702}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-clairsentience-science-name729" title="@{psionic-clairsentience-science-name729}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj729" title="@{mthac0adj729}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac729" title="@{mac729}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0729" title="@{MThAC0729}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit729" title="%{mthac011-hit729}" value="@{henchname5} hits a MAC of [[@{MThAC0729}-(1d20+(@{mthac0adj729})+(@{misc-mod}))]]&le;[[@{mac729}]] using their @{psionic-clairsentience-science-name729}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro729" title="@{psionic-macro729}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check729" title="%{psionic-macro12-check729}" value="@{psionic-macro729}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost729" title="@{PSP-cost729}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                             </table>
                         </div>
                         <div class="sheet-col">
-                            <h4><b>Telepathy Sciences</b></h4>
-                            <table>
+                            <h4>Clairsentient Devotions</h4>
+                            <table class="sheet-default-header-first-row">
                                 <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
+                                    <td>Ability Name</td>
+                                    <td>MThAC0<br>Adj.</td>
+                                    <td>MAC</td>
+                                    <td>MThAC0</td>
+                                    <td>Macro</td>
+                                    <td>PSP<br>Cost</td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-telepathy-science-name703" title="@{psionic-telepathy-science-name703}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj703" title="@{mthac0adj703}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac703" title="@{mac703}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0703" title="@{MThAC0703}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit703" title="%{mthac03-hit703}" value="@{henchname5} hits a MAC of [[@{MThAC0703}-(1d20+(@{mthac0adj703})+(@{misc-mod}))]]&le;[[@{mac703}]] using their @{psionic-telepathy-science-name703}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro703" title="@{psionic-macro703}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check703" title="%{psionic-macro4-check703}" value="@{psionic-macro703}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost703" title="@{PSP-cost703}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-clairsentience-name724" title="@{psionic-clairsentience-name724}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj724" title="@{mthac0adj724}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac724" title="@{mac724}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0724" title="@{MThAC0724}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit724" title="%{mthac010-hit724}" value="@{henchname5} hits a MAC of [[@{MThAC0724}-(1d20+(@{mthac0adj724})+(@{misc-mod}))]]&le;[[@{mac724}]] using their @{psionic-clairsentience-name724}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro724" title="@{psionic-macro724}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check724" title="%{psionic-macro11-check724}" value="@{psionic-macro724}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost724" title="@{PSP-cost724}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-telepathy-science-name704" title="@{psionic-telepathy-science-name704}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj704" title="@{mthac0adj704}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac704" title="@{mac704}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0704" title="@{MThAC0704}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit704" title="%{mthac03-hit704}" value="@{henchname5} hits a MAC of [[@{MThAC0704}-(1d20+(@{mthac0adj704})+(@{misc-mod}))]]&le;[[@{mac704}]] using their @{psionic-telepathy-science-name704}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro704" title="@{psionic-macro704}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check704" title="%{psionic-macro4-check704}" value="@{psionic-macro704}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost704" title="@{PSP-cost704}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-clairsentience-name725" title="@{psionic-clairsentience-name725}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj725" title="@{mthac0adj725}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac725" title="@{mac725}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0725" title="@{MThAC0725}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit725" title="%{mthac010-hit725}" value="@{henchname5} hits a MAC of [[@{MThAC0725}-(1d20+(@{mthac0adj725})+(@{misc-mod}))]]&le;[[@{mac725}]] using their @{psionic-clairsentience-name725}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro725" title="@{psionic-macro725}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check725" title="%{psionic-macro11-check725}" value="@{psionic-macro725}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost725" title="@{PSP-cost725}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-telepathy-science-name705" title="@{psionic-telepathy-science-name705}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj705" title="@{mthac0adj705}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac705" title="@{mac705}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0705" title="@{MThAC0705}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit705" title="%{mthac03-hit705}" value="@{henchname5} hits a MAC of [[@{MThAC0705}-(1d20+(@{mthac0adj705})+(@{misc-mod}))]]&le;[[@{mac705}]] using their @{psionic-telepathy-science-name705}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro705" title="@{psionic-macro705}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check705" title="%{psionic-macro4-check705}" value="@{psionic-macro705}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost705" title="@{PSP-cost705}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-clairsentience-name726" title="@{psionic-clairsentience-name726}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj726" title="@{mthac0adj726}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac726" title="@{mac726}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0726" title="@{MThAC0726}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit726" title="%{mthac010-hit726}" value="@{henchname5} hits a MAC of [[@{MThAC0726}-(1d20+(@{mthac0adj726})+(@{misc-mod}))]]&le;[[@{mac726}]] using their @{psionic-clairsentience-name726}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro726" title="@{psionic-macro726}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check726" title="%{psionic-macro11-check726}" value="@{psionic-macro726}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost726" title="@{PSP-cost726}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                             </table>
                         </div>
@@ -18057,52 +18016,15 @@ <h4><b>Telepathy Sciences</b></h4>
                     <br>
                     <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Psychokinesis Devotions</b></h4>
-                            <table>
-                                <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychokinesis-name706" title="@{psionic-psychokinesis-name706}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj706" title="@{mthac0adj706}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac706" title="@{mac706}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0706" title="@{MThAC0706}" class="sheet-small" value="20"><button type="roll" name="roll_mthac04-hit706" title="%{mthac04-hit706}" value="@{henchname5} hits a MAC of [[@{MThAC0706}-(1d20+(@{mthac0adj706})+(@{misc-mod}))]]&le;[[@{mac706}]] using their @{psionic-psychokinesis-name706}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro706" title="@{psionic-macro706}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro5-check706" title="%{psionic-macro5-check706}" value="@{psionic-macro706}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost706" title="@{PSP-cost706}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychokinesis-name707" title="@{psionic-psychokinesis-name707}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj707" title="@{mthac0adj707}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac707" title="@{mac707}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0707" title="@{MThAC0707}" class="sheet-small" value="20"><button type="roll" name="roll_mthac04-hit707" title="%{mthac04-hit707}" value="@{henchname5} hits a MAC of [[@{MThAC0707}-(1d20+(@{mthac0adj707})+(@{misc-mod}))]]&le;[[@{mac707}]] using their @{psionic-psychokinesis-name707}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro707" title="@{psionic-macro707}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro5-check707" title="%{psionic-macro5-check707}" value="@{psionic-macro707}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost707" title="@{PSP-cost707}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychokinesis-name708" title="@{psionic-psychokinesis-name708}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj708" title="@{mthac0adj708}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac708" title="@{mac708}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0708" title="@{MThAC0708}" class="sheet-small" value="20"><button type="roll" name="roll_mthac04-hit708" title="%{mthac04-hit708}" value="@{henchname5} hits a MAC of [[@{MThAC0708}-(1d20+(@{mthac0adj708})+(@{misc-mod}))]]&le;[[@{mac708}]] using their @{psionic-psychokinesis-name708}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro708" title="@{psionic-macro708}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro5-check708" title="%{psionic-macro5-check708}" value="@{psionic-macro708}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost708" title="@{PSP-cost708}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </div>
-                        <div class="sheet-col">
-                            <h4><b>Psychokinesis Sciences</b></h4>
-                            <table>
+                            <h4>Psychokinectic Sciences</h4>
+                            <table class="sheet-default-header-first-row">
                                 <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
+                                    <td>Ability Name</td>
+                                    <td>MThAC0<br>Adj.</td>
+                                    <td>MAC</td>
+                                    <td>MThAC0</td>
+                                    <td>Macro</td>
+                                    <td>PSP<br>Cost</td>
                                 </tr>
                                 <tr>
                                     <td><input type="text" name="attr_psionic-psychokinesis-science-name709" title="@{psionic-psychokinesis-science-name709}" class="sheet-midtext" placeholder="Ability Name"/></td>
@@ -18130,96 +18052,93 @@ <h4><b>Psychokinesis Sciences</b></h4>
                                 </tr>
                             </table>
                         </div>
-                    </div>
-                    <br>
-                    <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Psychoportive Devotions</b></h4>
-                            <table>
+                            <h4>Psychokinectic Devotions</h4>
+                            <table class="sheet-default-header-first-row">
                                 <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
+                                    <td>Ability Name</td>
+                                    <td>MThAC0<br>Adj.</td>
+                                    <td>MAC</td>
+                                    <td>MThAC0</td>
+                                    <td>Macro</td>
+                                    <td>PSP<br>Cost</td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-psychoportation-name712" title="@{psionic-psychoportation-name712}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj712" title="@{mthac0adj712}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac712" title="@{mac712}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0712" title="@{MThAC0712}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit712" title="%{mthac06-hit712}" value="@{henchname5} hits a MAC of [[@{MThAC0712}-(1d20+(@{mthac0adj712})+(@{misc-mod}))]]&le;[[@{mac712}]] using their @{psionic-psychoportation-name712}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro712" title="@{psionic-macro712}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check712" title="%{psionic-macro7-check712}" value="@{psionic-macro712}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost712" title="@{PSP-cost712}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-psychokinesis-name706" title="@{psionic-psychokinesis-name706}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj706" title="@{mthac0adj706}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac706" title="@{mac706}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0706" title="@{MThAC0706}" class="sheet-small" value="20"><button type="roll" name="roll_mthac04-hit706" title="%{mthac04-hit706}" value="@{henchname5} hits a MAC of [[@{MThAC0706}-(1d20+(@{mthac0adj706})+(@{misc-mod}))]]&le;[[@{mac706}]] using their @{psionic-psychokinesis-name706}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro706" title="@{psionic-macro706}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro5-check706" title="%{psionic-macro5-check706}" value="@{psionic-macro706}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost706" title="@{PSP-cost706}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-psychoportation-name713" title="@{psionic-psychoportation-name713}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj713" title="@{mthac0adj713}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac713" title="@{mac713}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0713" title="@{MThAC0713}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit713" title="%{mthac06-hit713}" value="@{henchname5} hits a MAC of [[@{MThAC0713}-(1d20+(@{mthac0adj713})+(@{misc-mod}))]]&le;[[@{mac713}]] using their @{psionic-psychoportation-name713}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro713" title="@{psionic-macro713}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check713" title="%{psionic-macro7-check713}" value="@{psionic-macro713}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost713" title="@{PSP-cost713}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-psychokinesis-name707" title="@{psionic-psychokinesis-name707}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj707" title="@{mthac0adj707}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac707" title="@{mac707}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0707" title="@{MThAC0707}" class="sheet-small" value="20"><button type="roll" name="roll_mthac04-hit707" title="%{mthac04-hit707}" value="@{henchname5} hits a MAC of [[@{MThAC0707}-(1d20+(@{mthac0adj707})+(@{misc-mod}))]]&le;[[@{mac707}]] using their @{psionic-psychokinesis-name707}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro707" title="@{psionic-macro707}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro5-check707" title="%{psionic-macro5-check707}" value="@{psionic-macro707}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost707" title="@{PSP-cost707}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-psychoportation-name714" title="@{psionic-psychoportation-name714}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj714" title="@{mthac0adj714}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac714" title="@{mac714}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0714" title="@{MThAC0714}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit714" title="%{mthac06-hit714}" value="@{henchname5} hits a MAC of [[@{MThAC0714}-(1d20+(@{mthac0adj714})+(@{misc-mod}))]]&le;[[@{mac714}]] using their @{psionic-psychoportation-name714}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro714" title="@{psionic-macro714}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check714" title="%{psionic-macro7-check714}" value="@{psionic-macro714}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost714" title="@{PSP-cost714}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-psychokinesis-name708" title="@{psionic-psychokinesis-name708}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj708" title="@{mthac0adj708}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac708" title="@{mac708}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0708" title="@{MThAC0708}" class="sheet-small" value="20"><button type="roll" name="roll_mthac04-hit708" title="%{mthac04-hit708}" value="@{henchname5} hits a MAC of [[@{MThAC0708}-(1d20+(@{mthac0adj708})+(@{misc-mod}))]]&le;[[@{mac708}]] using their @{psionic-psychokinesis-name708}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro708" title="@{psionic-macro708}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro5-check708" title="%{psionic-macro5-check708}" value="@{psionic-macro708}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost708" title="@{PSP-cost708}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                             </table>
                         </div>
+                    </div>
+                    <br>
+                    <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Psychoportive Sciences</b></h4>
-                            <table>
+                            <h4>Psychometabolic Sciences</h4>
+                            <table class="sheet-default-header-first-row">
                                 <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
+                                    <td>Ability Name</td>
+                                    <td>MThAC0<br>Adj.</td>
+                                    <td>MAC</td>
+                                    <td>MThAC0</td>
+                                    <td>Macro</td>
+                                    <td>PSP<br>Cost</td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-psychoportation-science-name715" title="@{psionic-psychoportation-science-name715}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj715" title="@{mthac0adj715}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac715" title="@{mac715}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0715" title="@{MThAC0715}" class="sheet-small" value="20"><button type="roll" name="roll_mthac07-hit715" title="%{mthac07-hit715}" value="@{henchname5} hits a MAC of [[@{MThAC0715}-(1d20+(@{mthac0adj715})+(@{misc-mod}))]]&le;[[@{mac715}]] using their @{psionic-psychoportation-science-name715}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro715" title="@{psionic-macro715}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro8-check715" title="%{psionic-macro8-check715}" value="@{psionic-macro715}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost715" title="@{PSP-cost715}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-psychometabolism-science-name721" title="@{psionic-psychometabolism-science-name721}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj721" title="@{mthac0adj721}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac721" title="@{mac721}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0721" title="@{MThAC0721}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit721" title="%{mthac09-hit721}" value="@{henchname5} hits a MAC of [[@{MThAC0721}-(1d20+(@{mthac0adj721})+(@{misc-mod}))]]&le;[[@{mac721}]] using their @{psionic-psychometabolism-science-name721}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro721" title="@{psionic-macro721}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check721" title="%{psionic-macro10-check721}" value="@{psionic-macro721}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost721" title="@{PSP-cost721}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-psychoportation-science-name716" title="@{psionic-psychoportation-science-name716}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj716" title="@{mthac0adj716}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac716" title="@{mac716}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0716" title="@{MThAC0716}" class="sheet-small" value="20"><button type="roll" name="roll_mthac07-hit716" title="%{mthac07-hit716}" value="@{henchname5} hits a MAC of [[@{MThAC0716}-(1d20+(@{mthac0adj716})+(@{misc-mod}))]]&le;[[@{mac716}]] using their @{psionic-psychoportation-science-name716}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro716" title="@{psionic-macro716}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro8-check716" title="%{psionic-macro8-check716}" value="@{psionic-macro716}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost716" title="@{PSP-cost716}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-psychometabolism-science-name722" title="@{psionic-psychometabolism-science-name722}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj722" title="@{mthac0adj722}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac722" title="@{mac722}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0722" title="@{MThAC0722}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit722" title="%{mthac09-hit722}" value="@{henchname5} hits a MAC of [[@{MThAC0722}-(1d20+(@{mthac0adj722})+(@{misc-mod}))]]&le;[[@{mac722}]] using their @{psionic-psychometabolism-science-name722}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro722" title="@{psionic-macro722}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check722" title="%{psionic-macro10-check722}" value="@{psionic-macro722}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost722" title="@{PSP-cost722}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-psychoportation-science-name717" title="@{psionic-psychoportation-science-name717}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj717" title="@{mthac0adj717}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac717" title="@{mac717}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0717" title="@{MThAC0717}" class="sheet-small" value="20"><button type="roll" name="roll_mthac07-hit717" title="%{mthac07-hit717}" value="@{henchname5} hits a MAC of [[@{MThAC0717}-(1d20+(@{mthac0adj717})+(@{misc-mod}))]]&le;[[@{mac717}]] using their @{psionic-psychoportation-science-name717}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro717" title="@{psionic-macro717}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro8-check717" title="%{psionic-macro8-check717}" value="@{psionic-macro717}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost717" title="@{PSP-cost717}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-psychometabolism-science-name723" title="@{psionic-psychometabolism-science-name723}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj723" title="@{mthac0adj723}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac723" title="@{mac723}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0723" title="@{MThAC0723}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit723" title="%{mthac09-hit723}" value="@{henchname5} hits a MAC of [[@{MThAC0723}-(1d20+(@{mthac0adj723})+(@{misc-mod}))]]&le;[[@{mac723}]] using their @{psionic-psychometabolism-science-name723}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro723" title="@{psionic-macro723}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check723" title="%{psionic-macro10-check723}" value="@{psionic-macro723}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost723" title="@{PSP-cost723}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                             </table>
                         </div>
-                    </div>
-                    <br>
-                    <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Psychometabolism Devotions</b></h4>
-                            <table>
+                            <h4>Psychometabolic Devotions</h4>
+                            <table class="sheet-default-header-first-row">
                                 <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
+                                    <td>Ability Name</td>
+                                    <td>MThAC0<br>Adj.</td>
+                                    <td>MAC</td>
+                                    <td>MThAC0</td>
+                                    <td>Macro</td>
+                                    <td>PSP<br>Cost</td>
                                 </tr>
                                 <tr>
                                     <td><input type="text" name="attr_psionic-psychometabolism-name718" title="@{psionic-psychometabolism-name718}" class="sheet-midtext" placeholder="Ability Name"/></td>
@@ -18247,40 +18166,80 @@ <h4><b>Psychometabolism Devotions</b></h4>
                                 </tr>
                             </table>
                         </div>
+                    </div>
+                    <br>
+                    <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Psychometabolism Sciences</b></h4>
-                            <table>
+                            <h4>Psychoportive Sciences</h4>
+                            <table class="sheet-default-header-first-row">
                                 <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
+                                    <td>Ability Name</td>
+                                    <td>MThAC0<br>Adj.</td>
+                                    <td>MAC</td>
+                                    <td>MThAC0</td>
+                                    <td>Macro</td>
+                                    <td>PSP<br>Cost</td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-psychometabolism-science-name721" title="@{psionic-psychometabolism-science-name721}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj721" title="@{mthac0adj721}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac721" title="@{mac721}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0721" title="@{MThAC0721}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit721" title="%{mthac09-hit721}" value="@{henchname5} hits a MAC of [[@{MThAC0721}-(1d20+(@{mthac0adj721})+(@{misc-mod}))]]&le;[[@{mac721}]] using their @{psionic-psychometabolism-science-name721}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro721" title="@{psionic-macro721}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check721" title="%{psionic-macro10-check721}" value="@{psionic-macro721}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost721" title="@{PSP-cost721}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-psychoportation-science-name715" title="@{psionic-psychoportation-science-name715}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj715" title="@{mthac0adj715}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac715" title="@{mac715}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0715" title="@{MThAC0715}" class="sheet-small" value="20"><button type="roll" name="roll_mthac07-hit715" title="%{mthac07-hit715}" value="@{henchname5} hits a MAC of [[@{MThAC0715}-(1d20+(@{mthac0adj715})+(@{misc-mod}))]]&le;[[@{mac715}]] using their @{psionic-psychoportation-science-name715}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro715" title="@{psionic-macro715}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro8-check715" title="%{psionic-macro8-check715}" value="@{psionic-macro715}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost715" title="@{PSP-cost715}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-psychometabolism-science-name722" title="@{psionic-psychometabolism-science-name722}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj722" title="@{mthac0adj722}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac722" title="@{mac722}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0722" title="@{MThAC0722}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit722" title="%{mthac09-hit722}" value="@{henchname5} hits a MAC of [[@{MThAC0722}-(1d20+(@{mthac0adj722})+(@{misc-mod}))]]&le;[[@{mac722}]] using their @{psionic-psychometabolism-science-name722}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro722" title="@{psionic-macro722}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check722" title="%{psionic-macro10-check722}" value="@{psionic-macro722}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost722" title="@{PSP-cost722}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-psychoportation-science-name716" title="@{psionic-psychoportation-science-name716}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj716" title="@{mthac0adj716}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac716" title="@{mac716}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0716" title="@{MThAC0716}" class="sheet-small" value="20"><button type="roll" name="roll_mthac07-hit716" title="%{mthac07-hit716}" value="@{henchname5} hits a MAC of [[@{MThAC0716}-(1d20+(@{mthac0adj716})+(@{misc-mod}))]]&le;[[@{mac716}]] using their @{psionic-psychoportation-science-name716}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro716" title="@{psionic-macro716}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro8-check716" title="%{psionic-macro8-check716}" value="@{psionic-macro716}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost716" title="@{PSP-cost716}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-psychometabolism-science-name723" title="@{psionic-psychometabolism-science-name723}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj723" title="@{mthac0adj723}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac723" title="@{mac723}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0723" title="@{MThAC0723}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit723" title="%{mthac09-hit723}" value="@{henchname5} hits a MAC of [[@{MThAC0723}-(1d20+(@{mthac0adj723})+(@{misc-mod}))]]&le;[[@{mac723}]] using their @{psionic-psychometabolism-science-name723}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro723" title="@{psionic-macro723}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check723" title="%{psionic-macro10-check723}" value="@{psionic-macro723}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost723" title="@{PSP-cost723}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-psychoportation-science-name717" title="@{psionic-psychoportation-science-name717}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj717" title="@{mthac0adj717}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac717" title="@{mac717}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0717" title="@{MThAC0717}" class="sheet-small" value="20"><button type="roll" name="roll_mthac07-hit717" title="%{mthac07-hit717}" value="@{henchname5} hits a MAC of [[@{MThAC0717}-(1d20+(@{mthac0adj717})+(@{misc-mod}))]]&le;[[@{mac717}]] using their @{psionic-psychoportation-science-name717}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro717" title="@{psionic-macro717}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro8-check717" title="%{psionic-macro8-check717}" value="@{psionic-macro717}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost717" title="@{PSP-cost717}" placeholder="#" class="sheet-small"/></td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div class="sheet-col">
+                            <h4>Psychoportive Devotions</h4>
+                            <table class="sheet-default-header-first-row">
+                                <tr>
+                                    <td>Ability Name</td>
+                                    <td>MThAC0<br>Adj.</td>
+                                    <td>MAC</td>
+                                    <td>MThAC0</td>
+                                    <td>Macro</td>
+                                    <td>PSP<br>Cost</td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name="attr_psionic-psychoportation-name712" title="@{psionic-psychoportation-name712}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj712" title="@{mthac0adj712}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac712" title="@{mac712}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0712" title="@{MThAC0712}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit712" title="%{mthac06-hit712}" value="@{henchname5} hits a MAC of [[@{MThAC0712}-(1d20+(@{mthac0adj712})+(@{misc-mod}))]]&le;[[@{mac712}]] using their @{psionic-psychoportation-name712}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro712" title="@{psionic-macro712}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check712" title="%{psionic-macro7-check712}" value="@{psionic-macro712}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost712" title="@{PSP-cost712}" placeholder="#" class="sheet-small"/></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name="attr_psionic-psychoportation-name713" title="@{psionic-psychoportation-name713}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj713" title="@{mthac0adj713}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac713" title="@{mac713}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0713" title="@{MThAC0713}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit713" title="%{mthac06-hit713}" value="@{henchname5} hits a MAC of [[@{MThAC0713}-(1d20+(@{mthac0adj713})+(@{misc-mod}))]]&le;[[@{mac713}]] using their @{psionic-psychoportation-name713}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro713" title="@{psionic-macro713}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check713" title="%{psionic-macro7-check713}" value="@{psionic-macro713}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost713" title="@{PSP-cost713}" placeholder="#" class="sheet-small"/></td>
+                                </tr>
+                                <tr>
+                                    <td><input type="text" name="attr_psionic-psychoportation-name714" title="@{psionic-psychoportation-name714}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj714" title="@{mthac0adj714}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac714" title="@{mac714}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0714" title="@{MThAC0714}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit714" title="%{mthac06-hit714}" value="@{henchname5} hits a MAC of [[@{MThAC0714}-(1d20+(@{mthac0adj714})+(@{misc-mod}))]]&le;[[@{mac714}]] using their @{psionic-psychoportation-name714}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro714" title="@{psionic-macro714}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check714" title="%{psionic-macro7-check714}" value="@{psionic-macro714}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost714" title="@{PSP-cost714}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                             </table>
                         </div>
@@ -18288,91 +18247,91 @@ <h4><b>Psychometabolism Sciences</b></h4>
                     <br>
                     <div class="sheet-2colrow">
                         <div class="sheet-col">
-                            <h4><b>Clairsentient Devotions</b></h4>
-                            <table>
+                            <h4>Telepathic Sciences</h4>
+                            <table class="sheet-default-header-first-row">
                                 <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
+                                    <td>Ability Name</td>
+                                    <td>MThAC0<br>Adj.</td>
+                                    <td>MAC</td>
+                                    <td>MThAC0</td>
+                                    <td>Macro</td>
+                                    <td>PSP<br>Cost</td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-clairsentience-name724" title="@{psionic-clairsentience-name724}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj724" title="@{mthac0adj724}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac724" title="@{mac724}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0724" title="@{MThAC0724}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit724" title="%{mthac010-hit724}" value="@{henchname5} hits a MAC of [[@{MThAC0724}-(1d20+(@{mthac0adj724})+(@{misc-mod}))]]&le;[[@{mac724}]] using their @{psionic-clairsentience-name724}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro724" title="@{psionic-macro724}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check724" title="%{psionic-macro11-check724}" value="@{psionic-macro724}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost724" title="@{PSP-cost724}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-telepathy-science-name703" title="@{psionic-telepathy-science-name703}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj703" title="@{mthac0adj703}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac703" title="@{mac703}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0703" title="@{MThAC0703}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit703" title="%{mthac03-hit703}" value="@{henchname5} hits a MAC of [[@{MThAC0703}-(1d20+(@{mthac0adj703})+(@{misc-mod}))]]&le;[[@{mac703}]] using their @{psionic-telepathy-science-name703}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro703" title="@{psionic-macro703}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check703" title="%{psionic-macro4-check703}" value="@{psionic-macro703}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost703" title="@{PSP-cost703}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-clairsentience-name725" title="@{psionic-clairsentience-name725}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj725" title="@{mthac0adj725}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac725" title="@{mac725}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0725" title="@{MThAC0725}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit725" title="%{mthac010-hit725}" value="@{henchname5} hits a MAC of [[@{MThAC0725}-(1d20+(@{mthac0adj725})+(@{misc-mod}))]]&le;[[@{mac725}]] using their @{psionic-clairsentience-name725}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro725" title="@{psionic-macro725}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check725" title="%{psionic-macro11-check725}" value="@{psionic-macro725}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost725" title="@{PSP-cost725}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-telepathy-science-name704" title="@{psionic-telepathy-science-name704}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj704" title="@{mthac0adj704}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac704" title="@{mac704}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0704" title="@{MThAC0704}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit704" title="%{mthac03-hit704}" value="@{henchname5} hits a MAC of [[@{MThAC0704}-(1d20+(@{mthac0adj704})+(@{misc-mod}))]]&le;[[@{mac704}]] using their @{psionic-telepathy-science-name704}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro704" title="@{psionic-macro704}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check704" title="%{psionic-macro4-check704}" value="@{psionic-macro704}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost704" title="@{PSP-cost704}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-clairsentience-name726" title="@{psionic-clairsentience-name726}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj726" title="@{mthac0adj726}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac726" title="@{mac726}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0726" title="@{MThAC0726}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit1726" title="%{mthac010-hit726}" value="@{henchname5} hits a MAC of [[@{MThAC0726}-(1d20+(@{mthac0adj726})+(@{misc-mod}))]]&le;[[@{mac726}]] using their @{psionic-clairsentience-name726}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro726" title="@{psionic-macro726}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check726" title="%{psionic-macro11-check726}" value="@{psionic-macro726}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost726" title="@{PSP-cost726}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-telepathy-science-name705" title="@{psionic-telepathy-science-name705}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj705" title="@{mthac0adj705}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac705" title="@{mac705}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0705" title="@{MThAC0705}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit705" title="%{mthac03-hit705}" value="@{henchname5} hits a MAC of [[@{MThAC0705}-(1d20+(@{mthac0adj705})+(@{misc-mod}))]]&le;[[@{mac705}]] using their @{psionic-telepathy-science-name705}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro705" title="@{psionic-macro705}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check705" title="%{psionic-macro4-check705}" value="@{psionic-macro705}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost705" title="@{PSP-cost705}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                             </table>
                         </div>
                         <div class="sheet-col">
-                            <h4><b>Clairsentient Sciences</b></h4>
-                            <table>
+                            <h4>Telepathic Devotions</h4>
+                            <table class="sheet-default-header-first-row">
                                 <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
+                                    <td>Ability Name</td>
+                                    <td>MThAC0<br>Adj.</td>
+                                    <td>MAC</td>
+                                    <td>MThAC0</td>
+                                    <td>Macro</td>
+                                    <td>PSP<br>Cost</td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-clairsentience-science-name727" title="@{psionic-clairsentience-science-name727}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj727" title="@{mthac0adj727}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac727" title="@{mac727}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0727" title="@{MThAC0727}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit727" title="%{mthac011-hit727}" value="@{henchname5} hits a MAC of [[@{MThAC0727}-(1d20+(@{mthac0adj727})+(@{misc-mod}))]]&le;[[@{mac727}]] using their @{psionic-clairsentience-science-name727}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro727" title="@{psionic-macro727}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check727" title="%{psionic-macro12-check727}" value="@{psionic-macro727}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost727" title="@{PSP-cost727}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-telepathy-name700" title="@{psionic-telepathy-name700}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj700" title="@{mthac0adj700}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac700" title="@{mac700}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0700" title="@{MThAC0700}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit700" title="%{mthac02-hit700}" value="@{henchname5} hits a MAC of [[@{MThAC0700}-(1d20+(@{mthac0adj700})+(@{misc-mod}))]]&le;[[@{mac700}]] using their @{psionic-telepathy-name700}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro700" title="@{psionic-macro700}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check700" title="%{psionic-macro3-check700}" value="@{psionic-macro700}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost700" title="@{PSP-cost700}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-clairsentience-science-name728" title="@{psionic-clairsentience-science-name728}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj728" title="@{mthac0adj728}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac728" title="@{mac728}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0728" title="@{MThAC0728}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit728" title="%{mthac011-hit728}" value="@{henchname5} hits a MAC of [[@{MThAC0728}-(1d20+(@{mthac0adj728})+(@{misc-mod}))]]&le;[[@{mac728}]] using their @{psionic-clairsentience-science-name728}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro728" title="@{psionic-macro728}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check728" title="%{psionic-macro12-check728}" value="@{psionic-macro728}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost728" title="@{PSP-cost728}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-telepathy-name701" title="@{psionic-telepathy-name701}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj701" title="@{mthac0adj701}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac701" title="@{mac701}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0701" title="@{MThAC0701}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit701" title="%{mthac02-hit701}" value="@{henchname5} hits a MAC of [[@{MThAC0701}-(1d20+(@{mthac0adj701})+(@{misc-mod}))]]&le;[[@{mac701}]] using their @{psionic-telepathy-name701}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro701" title="@{psionic-macro701}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check701" title="%{psionic-macro3-check701}" value="@{psionic-macro701}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost701" title="@{PSP-cost701}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                                 <tr>
-                                    <td><input type="text" name="attr_psionic-clairsentience-science-name729" title="@{psionic-clairsentience-science-name729}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj729" title="@{mthac0adj729}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac729" title="@{mac729}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0729" title="@{MThAC0729}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit1729" title="%{mthac011-hit729}" value="@{henchname5} hits a MAC of [[@{MThAC0729}-(1d20+(@{mthac0adj729})+(@{misc-mod}))]]&le;[[@{mac729}]] using their @{psionic-clairsentience-science-name729}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro729" title="@{psionic-macro729}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check729" title="%{psionic-macro12-check729}" value="@{psionic-macro729}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost729" title="@{PSP-cost729}" placeholder="#" class="sheet-small"/></td>
+                                    <td><input type="text" name="attr_psionic-telepathy-name702" title="@{psionic-telepathy-name702}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                    <td><input type="text" name="attr_mthac0adj702" title="@{mthac0adj702}" class="sheet-short" value="0"></td>
+                                    <td><input type="text" name="attr_mac702" title="@{mac702}" class="sheet-small" value="10"></td>
+                                    <td><input type="text" name="attr_MThAC0702" title="@{MThAC0702}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit702" title="%{mthac02-hit702}" value="@{henchname5} hits a MAC of [[@{MThAC0702}-(1d20+(@{mthac0adj702})+(@{misc-mod}))]]&le;[[@{mac702}]] using their @{psionic-telepathy-name702}"></button></td>
+                                    <td><input type="text" name="attr_psionic-macro702" title="@{psionic-macro702}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check702" title="%{psionic-macro3-check702}" value="@{psionic-macro702}"></button></td>
+                                    <td><input type="text" name="attr_PSP-cost702" title="@{PSP-cost702}" placeholder="#" class="sheet-small"/></td>
                                 </tr>
                             </table>
                         </div>
                     </div>
                     <br>
-                    <h4><b>Psionic Attack Modes</b></h4>
-                    <table>
+                    <h4>Psionic Attack Modes</h4>
+                    <table class="sheet-default-header-first-row">
                         <tr>
-                            <td class="sheet-default-header">Attack Name</td>
-                            <td class="sheet-default-header">Attack<br>Speed</td>
-                            <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                            <td class="sheet-default-header">MThAC0</td>
-                            <td class="sheet-default-header">Damage</td>
-                            <td class="sheet-default-header">Macro</td>
-                            <td class="sheet-default-header">PSP<br>Cost</td>
+                            <td>Attack Name</td>
+                            <td>Attack<br>Speed</td>
+                            <td>MThAC0<br>Adj.</td>
+                            <td>MThAC0</td>
+                            <td>Damage</td>
+                            <td>Macro</td>
+                            <td>PSP<br>Cost</td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_psionic-attack-name730" title="@{psionic-attack-name730}" class="sheet-display" placeholder="Ability Name"/></td>
@@ -18423,12 +18382,12 @@ <h4><b>Psionic Attack Modes</b></h4>
                     <br>
                     <div class="sheet-3colrow">
                         <div class="sheet-col">
-                            <h4><b>Psionic Defense Modes</b></h4>
-                            <table>
+                            <h4>Psionic Defense Modes</h4>
+                            <table class="sheet-default-header-first-row">
                                 <tr>
-                                    <td class="sheet-default-header">Defense Name</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
+                                    <td>Defense Name</td>
+                                    <td>Macro</td>
+                                    <td>PSP<br>Cost</td>
                                 </tr>
                                 <tr>
                                     <td><input type="text" name="attr_psionic-defense-name733" title="@{psionic-defense-name733}" class="sheet-midtext" placeholder="Defense Name"/></td>
@@ -18449,78 +18408,78 @@ <h4><b>Psionic Defense Modes</b></h4>
                         </div>
                         <div class="sheet-col">
                             <h4>Psionic Strength Points</h4>
-                            <table style='width:250px;'>
+                            <table class="sheet-table-white sheet-default-header-first-row sheet-default-header-first-column" style='width:250px;'>
                                 <tr>
-                                    <td class="sheet-default-header" style="width:100px;">Value</td>
-                                    <td class="sheet-default-header" style="width:50px;">Current</td>
-                                    <td class="sheet-default-header" style="width:15px;">/</td>
-                                    <td class="sheet-default-header" style="width:60px;">Maximum</td>
-                                    <td class="sheet-default-header" style="width:25px;">Speed</td>
+                                    <td style="width:100px;">Value</td>
+                                    <td style="width:50px;">Current</td>
+                                    <td style="width:15px;">/</td>
+                                    <td style="width:60px;">Maximum</td>
+                                    <td style="width:25px;">Speed</td>
                                 </tr>
                                 <tr>
-                                    <td class="sheet-default-header" style="width:100px;">PSP:</td>
+                                    <td>PSP:</td>
                                     <td><input type="number" name="attr_PSP500" title="@{PSP500}" class="sheet-short" placeholder="PSP"/></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                    <td>/</td>
                                     <td><input type="number" name="attr_PSP500_max" title="@{PSP500|max}" class="sheet-short"/></td>
                                     <td><button type="roll" name="roll_psispeed501" title="%{psispeed501}" value="/gmroll [[{([[1d10]]-(@{misc-mod})), 1}kh1]] [Psionic Power]&{tracker}"></button></td>
                                 </tr>
                                 <tr>
-                                    <td class="sheet-default-header" style="width:100px;">Temp PSP:</td>
+                                    <td>Temp PSP:</td>
                                     <td><input type="number" name="attr_tempPSP500" title="@{tempPSP500}" class="sheet-short" placeholder="Temp"/></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                    <td>/</td>
                                     <td><input type="number" name="attr_tempPSP500_max" title="@{tempPSP500|max}" class="sheet-short"/></td>
                                 </tr>
                                 <tr>
-                                    <td class="sheet-default-header" style="width:100px;">Stored PSP:</td>
+                                    <td>Stored PSP:</td>
                                     <td><input type="number" name="attr_storedPSP500" title="@{storedPSP500}" class="sheet-short" placeholder="Stored"/></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                    <td>/</td>
                                     <td><input type="number" name="attr_storedPSP500_max" title="@{storedPSP500|max}" class="sheet-short"/></td>
                                 </tr>
                                 <tr>
-                                    <td class="sheet-default-header" style="width:100px;">MAC</td>
+                                    <td>MAC</td>
                                     <td><input type="number" name="attr_selfMAC500" title="@{selfMAC500}" class="sheet-short"/></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                    <td>/</td>
                                     <td><input type="number" name="attr_temp-selfMAC500" title="@{temp-selfMAC500}" class="sheet-short"/></td>
                                 </tr>
                             </table>
                         </div>
                         <div class="sheet-col">
-                            <h4><b>Psionic NWP's</b></h4>
-                            <table>
+                            <h4>Psionic NWP's</h4>
+                            <table class="sheet-table-white">
                                 <tr>
                                     <td><input type="text" name="attr_psinwp500" title="@{psinwp500}" class="sheet-maxtext" placeholder="Name of NWP"></td>
                                     <td><input type="text" name="attr_psinwpstat500" title="@{psinwpstat500}" placeholder="@{}" class="sheet-small"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod500" title="@{psinwpmod500}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots500" title="@{psinwpslots500}" class="sheet-small" placeholder="#">
-                                        <button type="roll" name="roll_psinwps505" title="%{psinwps505}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat500})+(@{psinwpmod500})]] @{psinwp500}"></button>
-                                    </td>
+                                    <td>&plusmn;<input type="text" name="attr_psinwpmod500" title="@{psinwpmod500}" value="0" class="sheet-small"></td>
+                                    <td><input type="text" name="attr_psinwpslots500" title="@{psinwpslots500}" class="sheet-small" placeholder="#"></td>
+                                    <td><button type="roll" name="roll_psinwps500" title="%{psinwps500}" value="&{template:2Echeck} {{checkvs=@{psinwp500} Check}} {{character=@{henchname5}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psinwpstat500})+(@{psinwpmod500})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                 </tr>
                                 <tr>
                                     <td><input type="text" name="attr_psinwp501" title="@{psinwp501}" class="sheet-maxtext" placeholder="Name of NWP"></td>
                                     <td><input type="text" name="attr_psinwpstat501" title="@{psinwpstat501}" placeholder="@{}" class="sheet-small"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod501" title="@{psinwpmod501}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots501" title="@{psinwpslots501}" class="sheet-small" placeholder="#">
-                                        <button type="roll" name="roll_psinwps506" title="%{psinwps506}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat501})+(@{psinwpmod501})]] @{psinwp501}"></button>
-                                    </td>
+                                    <td>&plusmn;<input type="text" name="attr_psinwpmod501" title="@{psinwpmod501}" value="0" class="sheet-small"></td>
+                                    <td><input type="text" name="attr_psinwpslots501" title="@{psinwpslots501}" class="sheet-small" placeholder="#"></td>
+                                    <td><button type="roll" name="roll_psinwps501" title="%{psinwps501}" value="&{template:2Echeck} {{checkvs=@{psinwp501} Check}} {{character=@{henchname5}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psinwpstat501})+(@{psinwpmod501})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                 </tr>
                                 <tr>
                                     <td><input type="text" name="attr_psinwp502" title="@{psinwp502}" class="sheet-maxtext" placeholder="Name of NWP"></td>
                                     <td><input type="text" name="attr_psinwpstat502" title="@{psinwpstat502}" placeholder="@{}" class="sheet-small"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod502" title="@{psinwpmod502}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots502" title="@{psinwpslots502}" class="sheet-small" placeholder="#">
-                                        <button type="roll" name="roll_psinwps507" title="%{psinwps507}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat502})+(@{psinwpmod502})]] @{psinwp502}"></button>
-                                    </td>
+                                    <td>&plusmn;<input type="text" name="attr_psinwpmod502" title="@{psinwpmod502}" value="0" class="sheet-small"></td>
+                                    <td><input type="text" name="attr_psinwpslots502" title="@{psinwpslots502}" class="sheet-small" placeholder="#"></td>
+                                    <td><button type="roll" name="roll_psinwps502" title="%{psinwps502}" value="&{template:2Echeck} {{checkvs=@{psinwp502} Check}} {{character=@{henchname5}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psinwpstat502})+(@{psinwpmod502})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                 </tr>
                                 <tr>
                                     <td><input type="text" name="attr_psinwp503" title="@{psinwp503}" class="sheet-maxtext" placeholder="Name of NWP"></td>
                                     <td><input type="text" name="attr_psinwpstat503" title="@{psinwpstat503}" placeholder="@{}" class="sheet-small"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod503" title="@{psinwpmod503}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots503" title="@{psinwpslots503}" class="sheet-small" placeholder="#">
-                                        <button type="roll" name="roll_psinwps508" title="%{psinwps508}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat503})+(@{psinwpmod503})]] @{psinwp503}"></button>
-                                    </td>
+                                    <td>&plusmn;<input type="text" name="attr_psinwpmod503" title="@{psinwpmod503}" value="0" class="sheet-small"></td>
+                                    <td><input type="text" name="attr_psinwpslots503" title="@{psinwpslots503}" class="sheet-small" placeholder="#"></td>
+                                    <td><button type="roll" name="roll_psinwps503" title="%{psinwps503}" value="&{template:2Echeck} {{checkvs=@{psinwp503} Check}} {{character=@{henchname5}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psinwpstat503})+(@{psinwpmod503})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                 </tr>
                                 <tr>
                                     <td><input type="text" name="attr_psinwp504" title="@{psinwp504}" class="sheet-maxtext" placeholder="Name of NWP"></td>
                                     <td><input type="text" name="attr_psinwpstat504" title="@{psinwpstat504}" placeholder="@{}" class="sheet-small"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod504" title="@{psinwpmod504}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots504" title="@{psinwpslots504}" class="sheet-small" placeholder="#">
-                                        <button type="roll" name="roll_psinwps509" title="%{psinwps509}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat504})+(@{psinwpmod504})]] @{psinwp504}"></button>
-                                    </td>
+                                    <td>&plusmn;<input type="text" name="attr_psinwpmod504" title="@{psinwpmod504}" value="0" class="sheet-small"></td>
+                                    <td><input type="text" name="attr_psinwpslots504" title="@{psinwpslots504}" class="sheet-small" placeholder="#"></td>
+                                    <td><button type="roll" name="roll_psinwps504" title="%{psinwps504}" value="&{template:2Echeck} {{checkvs=@{psinwp504} Check}} {{character=@{henchname5}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psinwpstat504})+(@{psinwpmod504})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                 </tr>
                             </table>
                         </div>
@@ -18617,15 +18576,15 @@ <h4>Notes</h4>
                 <hr>
                 <hr>
                 <fieldset name="repeating_hench5" class="repeating_hench5">
-                    <table>
+                    <table class="sheet-default-header-first-row">
                         <tr>
-                            <td class="sheet-default-header">Name</td>
-                            <td class="sheet-default-header">AC</td>
-                            <td class="sheet-default-header">Race</td>
-                            <td class="sheet-default-header">Level</td>
-                            <td class="sheet-default-header">Class</td>
-                            <td class="sheet-default-header">HP/Max</td>
-                            <td class="sheet-default-header">Units</td>
+                            <td>Name</td>
+                            <td>AC</td>
+                            <td>Race</td>
+                            <td>Level</td>
+                            <td>Class</td>
+                            <td>HP/Max</td>
+                            <td>Units</td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_henchname55" title="@{repeating_hench5_$X_henchname55}"></td>
@@ -18705,16 +18664,16 @@ <h4>Weapons / Attacks</h4>
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
-                            <td><button type="roll" name="roll_hench55parsave" title="%{repeating_hench5_$X_hench55parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55parsave" title="%{repeating_hench5_$X_hench55poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55deasave" title="%{repeating_hench5_$X_hench55deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55rodsave" title="%{repeating_hench5_$X_hench55rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55stasave" title="%{repeating_hench5_$X_hench55stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55wansave" title="%{repeating_hench5_$X_hench55wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55petsave" title="%{repeating_hench5_$X_hench55petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55polsave" title="%{repeating_hench5_$X_hench55polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55bresave" title="%{repeating_hench5_$X_hench55bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55spesave" title="%{repeating_hench5_$X_hench55spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench55parsave" title="%{repeating_hench5_$X_hench55parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench55parsave" title="%{repeating_hench5_$X_hench55poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench55deasave" title="%{repeating_hench5_$X_hench55deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench55rodsave" title="%{repeating_hench5_$X_hench55rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench55stasave" title="%{repeating_hench5_$X_hench55stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench55wansave" title="%{repeating_hench5_$X_hench55wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench55petsave" title="%{repeating_hench5_$X_hench55petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench55polsave" title="%{repeating_hench5_$X_hench55polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench55bresave" title="%{repeating_hench5_$X_hench55bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench55spesave" title="%{repeating_hench5_$X_hench55spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname55}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench55spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_hench55partar" title="@{repeating_hench5_$X_hench55partar}" class="sheet-small"></td>
@@ -18731,7 +18690,7 @@ <h4>Weapons / Attacks</h4>
                     </table>
                     <hr>
                     <input type="radio" name="attr_tab23" class="sheet-tab sheet-tab67" value="1" checked/><span class="sheet-tab sheet-tab67">Psionic Core</span>&nbsp;
-                    <input type="radio" name="attr_tab23" class="sheet-tab sheet-tab68" value="2"/><span class="sheet-tab sheet-tab68">Psionic S/P</span><br><br>
+                    <input type="radio" name="attr_tab23" class="sheet-tab sheet-tab68" value="2"/><span class="sheet-tab sheet-tab68">Psionic S&P</span><br><br>
     
                     <div class="sheet-tab-content sheet-section-psionics-standard-repeat">
                         <h4>Psionics Core</h4>
@@ -18739,72 +18698,71 @@ <h4>Psionics Core</h4>
                         <label>You can use + to denote different sources of bonuses.</label>
                         <br>
                         <br>
-    
                         <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Telepathy Devotions</b></h4>
+                                <h4>Clairsentient Sciences</h4>
                                 <ul>
-                                    <table>
+                                    <table class="sheet-table-white">
                                         <tr>
-                                            <td><input type="text" name="attr_psiontelepathic500" title="@{repeating_hench5_$X_psiontelepathic500}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod500" title="@{repeating_hench5_$X_powerscore-nomod500}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod500" title="@{repeating_hench5_$X_powerscore-mod500}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod500" title="@{repeating_hench5_$X_psionic-mod500}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Telepathy-Devotion500" title="%{repeating_hench5_$X_Telepathy-Devotion500}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod500})]]&le;[[@{powerscore-nomod500}+(@{powerscore-mod500})]] @{psiontelepathic500}"></button></td>
-                                            <td><input type="text" name="attr_psiontelepathic-macro500" title="@{repeating_hench5_$X_psiontelepathic-macro500}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-macro500" title="%{repeating_hench5_$X_telepathic-macro500}" value="@{psiontelepathic-macro500}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost600" title="@{repeating_hench5_$X_PSP-cost600}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_clair-science527" title="@{repeating_hench5_$X_clair-science527}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod527" title="@{repeating_hench5_$X_powerscore-nomod527}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod527" title="@{repeating_hench5_$X_powerscore-mod527}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Clair-Science527" title="%{repeating_hench5_$X_Clair-Science527}" value="/roll [[1d20cs[[{@{powerscore-nomod527}+(@{powerscore-mod527})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod527}+(@{powerscore-mod527})+(@{misc-mod}),19}kl1]] @{clair-science527}"></button></td>
+                                            <td><input type="text" name="attr_psionclair-science-macro527" title="@{repeating_hench5_$X_psionclair-science-macro527}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_clair-science-macro527" title="%{repeating_hench5_$X_clair-science-macro527}" value="@{psionclair-science-macro527}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost627" title="@{repeating_hench5_$X_PSP-cost627}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
-                                            <td><input type="text" name="attr_psiontelepathic501" title="@{repeating_hench5_$X_psiontelepathic501}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod501" title="@{repeating_hench5_$X_powerscore-nomod501}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod501" title="@{repeating_hench5_$X_powerscore-mod501}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod501" title="@{repeating_hench5_$X_psionic-mod501}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Telepathy-Devotion501" title="%{repeating_hench5_$X_Telepathy-Devotion501}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod501})]]&le;[[@{powerscore-nomod501}+(@{powerscore-mod501})]] @{psiontelepathic501}"></button></td>
-                                            <td><input type="text" name="attr_psiontelepathic-macro501" title="@{repeating_hench5_$X_psiontelepathic-macro501}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-macro501" title="%{repeating_hench5_$X_telepathic-macro501}" value="@{psiontelepathic-macro501}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost601" title="@{repeating_hench5_$X_PSP-cost601}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_clair-science528" title="@{repeating_hench5_$X_clair-science528}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod528" title="@{repeating_hench5_$X_powerscore-nomod528}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod528" title="@{repeating_hench5_$X_powerscore-mod528}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Clair-Science528" title="%{repeating_hench5_$X_Clair-Science528}" value="/roll [[1d20cs[[{@{powerscore-nomod528}+(@{powerscore-mod528})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod528}+(@{powerscore-mod528})+(@{misc-mod}),19}kl1]] @{clair-science528}"></button></td>
+                                            <td><input type="text" name="attr_psionclair-science-macro528" title="@{repeating_hench5_$X_psionclair-science-macro528}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_clair-science-macro528" title="%{repeating_hench5_$X_clair-science-macro528}" value="@{psionclair-science-macro528}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost628" title="@{repeating_hench5_$X_PSP-cost628}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
-                                            <td><input type="text" name="attr_psiontelepathic502" title="@{repeating_hench5_$X_psiontelepathic502}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod502" title="@{repeating_hench5_$X_powerscore-nomod502}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod502" title="@{repeating_hench5_$X_powerscore-mod502}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod502" title="@{repeating_hench5_$X_psionic-mod502}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Telepathy-Devotion502" title="%{repeating_hench5_$X_Telepathy-Devotion502}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod502})]]&le;[[@{powerscore-nomod502}+(@{powerscore-mod502})]] @{psiontelepathic502}"></button></td>
-                                            <td><input type="text" name="attr_psiontelepathic-macro502" title="@{repeating_hench5_$X_psiontelepathic-macro502}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-macro502" title="%{repeating_hench5_$X_telepathic-macro502}" value="@{psiontelepathic-macro502}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost602" title="@{repeating_hench5_$X_PSP-cost602}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_clair-science529" title="@{repeating_hench5_$X_clair-science529}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod529" title="@{repeating_hench5_$X_powerscore-nomod529}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod529" title="@{repeating_hench5_$X_powerscore-mod529}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Clair-Science529" title="%{repeating_hench5_$X_Clair-Science529}" value="/roll [[1d20cs[[{@{powerscore-nomod529}+(@{powerscore-mod529})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod529}+(@{powerscore-mod529})+(@{misc-mod}),19}kl1]] @{clair-science529}"></button></td>
+                                            <td><input type="text" name="attr_psionclair-science-macro529" title="@{repeating_hench5_$X_psionclair-science-macro529}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_clair-science-macro529" title="%{repeating_hench5_$X_clair-science-macro529}" value="@{psionclair-science-macro529}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost629" title="@{repeating_hench5_$X_PSP-cost629}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                     </table>
                                 </ul>
                             </div>
                             <div class="sheet-col">
-                                <h4><b>Telepathy Sciences</b></h4>
+                                <h4>Clairsentient Devotions</h4>
                                 <ul>
-                                    <table>
+                                    <table class="sheet-table-white">
                                         <tr>
-                                            <td><input type="text" name="attr_telepathic-science503" title="@{repeating_hench5_$X_telepathic-science503}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod503" title="@{repeating_hench5_$X_powerscore-nomod503}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod503" title="@{repeating_hench5_$X_powerscore-mod503}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod503" title="@{repeating_hench5_$X_psionic-mod503}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Telepathy-Science503" title="%{repeating_hench5_$X_Telepathy-Science503}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod503})]]&le;[[@{powerscore-nomod503}+(@{powerscore-mod503})]] @{telepathic-science503}"></button></td>
-                                            <td><input type="text" name="attr_psiontelepathic-science-macro503" title="@{repeating_hench5_$X_psiontelepathic-science-macro503}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-science-macro503" title="%{repeating_hench5_$X_telepathic-science-macro503}" value="@{psiontelepathic-science-macro503}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost603" title="@{repeating_hench5_$X_PSP-cost603}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_psionclair524" title="@{repeating_hench5_$X_psionclair524}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod524" title="@{repeating_hench5_$X_powerscore-nomod524}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod524" title="@{repeating_hench5_$X_powerscore-mod524}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Clair-Devotion524" title="%{repeating_hench5_$X_Clair-Devotion524}" value="/roll [[1d20cs[[{@{powerscore-nomod524}+(@{powerscore-mod524})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod524}+(@{powerscore-mod524})+(@{misc-mod}),19}kl1]] @{psionclair524}"></button></td>
+                                            <td><input type="text" name="attr_psionclair-macro524" title="@{repeating_hench5_$X_psionclair-macro524}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_clair-macro524" title="%{repeating_hench5_$X_clair-macro524}" value="@{psionclair-macro524}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost624" title="@{repeating_hench5_$X_PSP-cost624}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
-                                            <td><input type="text" name="attr_telepathic-science504" title="@{repeating_hench5_$X_telepathic-science504}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod504" title="@{repeating_hench5_$X_powerscore-nomod504}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod504" title="@{repeating_hench5_$X_powerscore-mod504}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod504" title="@{repeating_hench5_$X_psionic-mod504}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Telepathy-Science504" title="%{repeating_hench5_$X_Telepathy-Science504}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod504})]]&le;[[@{powerscore-nomod504}+(@{powerscore-mod504})]] @{telepathic-science504}"></button></td>
-                                            <td><input type="text" name="attr_psiontelepathic-science-macro504" title="@{repeating_hench5_$X_psiontelepathic-science-macro504}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-science-macro504" title="%{repeating_hench5_$X_telepathic-science-macro504}" value="@{psiontelepathic-science-macro504}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost604" title="@{repeating_hench5_$X_PSP-cost604}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_psionclair525" title="@{repeating_hench5_$X_psionclair525}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod525" title="@{repeating_hench5_$X_powerscore-nomod525}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod525" title="@{repeating_hench5_$X_powerscore-mod525}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Clair-Devotion525" title="%{repeating_hench5_$X_Clair-Devotion525}" value="/roll [[1d20cs[[{@{powerscore-nomod525}+(@{powerscore-mod525})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod525}+(@{powerscore-mod525})+(@{misc-mod}),19}kl1]] @{psionclair525}"></button></td>
+                                            <td><input type="text" name="attr_psionclair-macro525" title="@{repeating_hench5_$X_psionclair-macro525}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_clair-macro525" title="%{repeating_hench5_$X_clair-macro525}" value="@{psionclair-macro525}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost625" title="@{repeating_hench5_$X_PSP-cost625}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
-                                            <td><input type="text" name="attr_telepathic-science505" title="@{repeating_hench5_$X_telepathic-science505}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod505" title="@{repeating_hench5_$X_powerscore-nomod505}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod505" title="@{repeating_hench5_$X_powerscore-mod505}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod505" title="@{repeating_hench5_$X_psionic-mod505}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Telepathy-Science505" title="%{repeating_hench5_$X_Telepathy-Science505}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod505})]]&le;[[@{powerscore-nomod505}+(@{powerscore-mod505})]] @{telepathic-science505}"></button></td>
-                                            <td><input type="text" name="attr_psiontelepathic-macro505" title="@{repeating_hench5_$X_psiontelepathic-science-macro505}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-science-macro505" title="%{repeating_hench5_$X_telepathic-science-macro505}" value="@{psiontelepathic-science-macro505}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost605" title="@{repeating_hench5_$X_PSP-cost605}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_psionclair526" title="@{repeating_hench5_$X_psionclair526}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod526" title="@{repeating_hench5_$X_powerscore-nomod526}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod526" title="@{repeating_hench5_$X_powerscore-mod526}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Clair-Devotion526" title="%{repeating_hench5_$X_Clair-Devotion526}" value="/roll [[1d20cs[[{@{powerscore-nomod526}+(@{powerscore-mod526})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod526}+(@{powerscore-mod526})+(@{misc-mod}),19}kl1]] @{psionclair526}"></button></td>
+                                            <td><input type="text" name="attr_psionclair-macro526" title="@{repeating_hench5_$X_psionclair-macro526}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_clair-macro526" title="%{repeating_hench5_$X_clair-macro526}" value="@{psionclair-macro526}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost626" title="@{repeating_hench5_$X_PSP-cost626}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                     </table>
                                 </ul>
@@ -18813,423 +18771,423 @@ <h4><b>Telepathy Sciences</b></h4>
                         <br>
                         <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Psychokinesis Devotions</b></h4>
-                                <ul>
-                                    <table>
-                                        <tr>
-                                            <td><input type="text" name="attr_psionkinetic506" title="@{repeating_hench5_$X_psionkinetic506}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod506" title="@{repeating_hench5_$X_powerscore-nomod506}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod506" title="@{repeating_hench5_$X_powerscore-mod506}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod506" title="@{repeating_hench5_$X_psionic-mod506}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Kinetic-Devotion506" title="%{repeating_hench5_$X_Kinetic-Devotion506}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod506})]]&le;[[@{powerscore-nomod506}+(@{powerscore-mod506})]] @{psionkinetic506}"></button></td>
-                                            <td><input type="text" name="attr_psionkinetic-macro506" title="@{repeating_hench5_$X_psionkinetic-macro506}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-macro506" title="%{repeating_hench5_$X_kinetic-macro506}" value="@{psionkinetic-macro506}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost606" title="@{repeating_hench5_$X_PSP-cost606}" placeholder="#" class="sheet-small"/></td>
-                                        </tr>
-                                        <tr>
-                                            <td><input type="text" name="attr_psionkinetic507" title="@{repeating_hench5_$X_psionkinetic507}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod507" title="@{repeating_hench5_$X_powerscore-nomod507}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod507" title="@{repeating_hench5_$X_powerscore-mod507}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod507" title="@{repeating_hench5_$X_psionic-mod507}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Kinetic-Devotion507" title="%{repeating_hench5_$X_Kinetic-Devotion507}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod507})]]&le;[[@{powerscore-nomod507}+(@{powerscore-mod507})]] @{psionkinetic507}"></button></td>
-                                            <td><input type="text" name="attr_psionkinetic-macro507" title="@{repeating_hench5_$X_psionkinetic-macro507}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-macro507" title="%{repeating_hench5_$X_kinetic-macro507}" value="@{psionkinetic-macro507}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost607" title="@{repeating_hench5_$X_PSP-cost607}" placeholder="#" class="sheet-small"/></td>
-                                        </tr>
-                                        <tr>
-                                            <td><input type="text" name="attr_psionkinetic508" title="@{repeating_hench5_$X_psionkinetic508}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod508" title="@{repeating_hench5_$X_powerscore-nomod508}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod508" title="@{repeating_hench5_$X_powerscore-mod508}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod508" title="@{repeating_hench5_$X_psionic-mod508}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Kinetic-Devotion508" title="%{repeating_hench5_$X_Kinetic-Devotion508}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod508})]]&le;[[@{powerscore-nomod508}+(@{powerscore-mod508})]] @{psionkinetic508}"></button></td>
-                                            <td><input type="text" name="attr_psionkinetic-macro508" title="@{repeating_hench5_$X_psionkinetic-macro508}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-macro508" title="%{repeating_hench5_$X_kinetic-macro508}" value="@{psionkinetic-macro508}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost608" title="@{repeating_hench5_$X_PSP-cost608}" placeholder="#" class="sheet-small"/></td>
-                                        </tr>
-                                    </table>
-                                </ul>
-                            </div>
-                            <div class="sheet-col">
-                                <h4><b>Psychokinesis Sciences</b></h4>
+                                <h4>Psychokinectic Sciences</h4>
                                 <ul>
-                                    <table>
+                                    <table class="sheet-table-white">
                                         <tr>
                                             <td><input type="text" name="attr_kinetic-science509" title="@{repeating_hench5_$X_kinetic-science509}" class="sheet-medium"></td>
                                             <td><input type="text" name="attr_powerscore-nomod509" title="@{repeating_hench5_$X_powerscore-nomod509}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod509" title="@{repeating_hench5_$X_powerscore-mod509}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod509" title="@{repeating_hench5_$X_psionic-mod509}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Kinetic-Science509" title="%{repeating_hench5_$X_Kinetic-Science509}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod509})]]&le;[[@{powerscore-nomod509}+(@{powerscore-mod509})]] @{kinetic-science509}"></button></td>
-                                            <td><input type="text" name="attr_psionkinetic-science-macro509" title="@{repeating_hench5_$X_psionkinetic-science-macro509}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-science-macro509" title="%{repeating_hench5_$X_kinetic-science-macro509}" value="@{psionkinetic-science-macro509}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod509" title="@{repeating_hench5_$X_powerscore-mod509}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Kinetic-Science509" title="%{repeating_hench5_$X_Kinetic-Science509}" value="/roll [[1d20cs[[{@{powerscore-nomod509}+(@{powerscore-mod509})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod509}+(@{powerscore-mod509})+(@{misc-mod}),19}kl1]] @{kinetic-science509}"></button></td>
+                                            <td><input type="text" name="attr_psionkinetic-science-macro509" title="@{repeating_hench5_$X_psionkinetic-science-macro509}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_kinetic-science-macro509" title="%{repeating_hench5_$X_kinetic-science-macro509}" value="@{psionkinetic-science-macro509}"></button></td>
                                             <td><input type="text" name="attr_PSP-cost609" title="@{repeating_hench5_$X_PSP-cost609}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
                                             <td><input type="text" name="attr_kinetic-science510" title="@{repeating_hench5_$X_kinetic-science510}" class="sheet-medium"></td>
                                             <td><input type="text" name="attr_powerscore-nomod510" title="@{repeating_hench5_$X_powerscore-nomod510}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod510" title="@{repeating_hench5_$X_powerscore-mod510}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod510" title="@{repeating_hench5_$X_psionic-mod510}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Kinetic-Science510" title="%{repeating_hench5_$X_Kinetic-Science510}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod510})]]&le;[[@{powerscore-nomod510}+(@{powerscore-mod510})]] @{kinetic-science510}"></button></td>
-                                            <td><input type="text" name="attr_psionkinetic-science-macro510" title="@{repeating_hench5_$X_psionkinetic-science-macro510}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-science-macro510" title="%{repeating_hench5_$X_kinetic-science-macro510}" value="@{psionkinetic-science-macro510}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod510" title="@{repeating_hench5_$X_powerscore-mod510}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Kinetic-Science510" title="%{repeating_hench5_$X_Kinetic-Science510}" value="/roll [[1d20cs[[{@{powerscore-nomod510}+(@{powerscore-mod510})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod510}+(@{powerscore-mod510})+(@{misc-mod}),19}kl1]] @{kinetic-science510}"></button></td>
+                                            <td><input type="text" name="attr_psionkinetic-science-macro510" title="@{repeating_hench5_$X_psionkinetic-science-macro510}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_kinetic-science-macro510" title="%{repeating_hench5_$X_kinetic-science-macro510}" value="@{psionkinetic-science-macro510}"></button></td>
                                             <td><input type="text" name="attr_PSP-cost610" title="@{repeating_hench5_$X_PSP-cost610}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
                                             <td><input type="text" name="attr_kinetic-science511" title="@{repeating_hench5_$X_kinetic-science511}" class="sheet-medium"></td>
                                             <td><input type="text" name="attr_powerscore-nomod511" title="@{repeating_hench5_$X_powerscore-nomod511}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod511" title="@{repeating_hench5_$X_powerscore-mod511}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod511" title="@{repeating_hench5_$X_psionic-mod511}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Kinetic-Science511" title="%{repeating_hench5_$X_Kinetic-Science511}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod511})]]&le;[[@{powerscore-nomod511}+(@{powerscore-mod511})]] @{kinetic-science511}"></button></td>
-                                            <td><input type="text" name="attr_psionkinetic-science-macro511" title="@{repeating_hench5_$X_psionkinetic-science-macro511}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-science-macro511" title="%{repeating_hench5_$X_kinetic-science-macro511}" value="@{psionkinetic-science-macro511}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod511" title="@{repeating_hench5_$X_powerscore-mod511}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Kinetic-Science511" title="%{repeating_hench5_$X_Kinetic-Science511}" value="/roll [[1d20cs[[{@{powerscore-nomod511}+(@{powerscore-mod511})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod511}+(@{powerscore-mod511})+(@{misc-mod}),19}kl1]] @{kinetic-science511}"></button></td>
+                                            <td><input type="text" name="attr_psionkinetic-science-macro511" title="@{repeating_hench5_$X_psionkinetic-science-macro511}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_kinetic-science-macro511" title="%{repeating_hench5_$X_kinetic-science-macro511}" value="@{psionkinetic-science-macro511}"></button></td>
                                             <td><input type="text" name="attr_PSP-cost611" title="@{repeating_hench5_$X_PSP-cost611}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                     </table>
                                 </ul>
                             </div>
-                        </div>
-                        <br>
-                        <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Psychoportive Devotions</b></h4>
+                                <h4>Psychokinectic Devotions</h4>
                                 <ul>
-                                    <table>
+                                    <table class="sheet-table-white">
                                         <tr>
-                                            <td><input type="text" name="attr_psionportation512" title="@{repeating_hench5_$X_psionportation512}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod512" title="@{repeating_hench5_$X_powerscore-nomod512}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod512" title="@{repeating_hench5_$X_powerscore-mod512}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod512" title="@{repeating_hench5_$X_psionic-mod512}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Portation-Devotion512" title="%{repeating_hench5_$X_Portation-Devotion512}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod512})]]&le;[[@{powerscore-nomod512}+(@{powerscore-mod512})]] @{psionportation512}"></button></td>
-                                            <td><input type="text" name="attr_psionportation-macro512" title="@{repeating_hench5_$X_psionportation-macro512}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-macro512" title="%{repeating_hench5_$X_portation-macro512}" value="@{psionportation-macro512}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost612" title="@{repeating_hench5_$X_PSP-cost612}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_psionkinetic506" title="@{repeating_hench5_$X_psionkinetic506}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod506" title="@{repeating_hench5_$X_powerscore-nomod506}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod506" title="@{repeating_hench5_$X_powerscore-mod506}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Kinetic-Devotion506" title="%{repeating_hench5_$X_Kinetic-Devotion506}" value="/roll [[1d20cs[[{@{powerscore-nomod506}+(@{powerscore-mod506})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod506}+(@{powerscore-mod506})+(@{misc-mod}),19}kl1]] @{psionkinetic506}"></button></td>
+                                            <td><input type="text" name="attr_psionkinetic-macro506" title="@{repeating_hench5_$X_psionkinetic-macro506}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_kinetic-macro506" title="%{repeating_hench5_$X_kinetic-macro506}" value="@{psionkinetic-macro506}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost606" title="@{repeating_hench5_$X_PSP-cost606}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
-                                            <td><input type="text" name="attr_psionportation513" title="@{repeating_hench5_$X_psionportation513}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod513" title="@{repeating_hench5_$X_powerscore-nomod513}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod513" title="@{repeating_hench5_$X_powerscore-mod513}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod513" title="@{repeating_hench5_$X_psionic-mod513}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Portation-Devotion513" title="%{repeating_hench5_$X_Portation-Devotion513}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod513})]]&le;[[@{powerscore-nomod513}+(@{powerscore-mod513})]] @{psionportation513}"></button></td>
-                                            <td><input type="text" name="attr_psionportation-macro513" title="@{repeating_hench5_$X_psionportation-macro513}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-macro513" title="%{repeating_hench5_$X_portation-macro513}" value="@{psionportation-macro513}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost613" title="@{repeating_hench5_$X_PSP-cost613}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_psionkinetic507" title="@{repeating_hench5_$X_psionkinetic507}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod507" title="@{repeating_hench5_$X_powerscore-nomod507}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod507" title="@{repeating_hench5_$X_powerscore-mod507}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Kinetic-Devotion507" title="%{repeating_hench5_$X_Kinetic-Devotion507}" value="/roll [[1d20cs[[{@{powerscore-nomod507}+(@{powerscore-mod507})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod507}+(@{powerscore-mod507})+(@{misc-mod}),19}kl1]] @{psionkinetic507}"></button></td>
+                                            <td><input type="text" name="attr_psionkinetic-macro507" title="@{repeating_hench5_$X_psionkinetic-macro507}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_kinetic-macro507" title="%{repeating_hench5_$X_kinetic-macro507}" value="@{psionkinetic-macro507}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost607" title="@{repeating_hench5_$X_PSP-cost607}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
-                                            <td><input type="text" name="attr_psionportation514" title="@{repeating_hench5_$X_psionportation514}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod514" title="@{repeating_hench5_$X_powerscore-nomod514}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod514" title="@{repeating_hench5_$X_powerscore-mod514}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod514" title="@{repeating_hench5_$X_psionic-mod514}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Portation-Devotion514" title="%{repeating_hench5_$X_Portation-Devotion514}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod514})]]&le;[[@{powerscore-nomod514}+(@{powerscore-mod514})]] @{psionportation514}"></button></td>
-                                            <td><input type="text" name="attr_psionportation-macro514" title="@{repeating_hench5_$X_psionportation-macro514}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-macro514" title="%{repeating_hench5_$X_portation-macro514}" value="@{psionportation-macro514}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost614" title="@{repeating_hench5_$X_PSP-cost614}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_psionkinetic508" title="@{repeating_hench5_$X_psionkinetic508}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod508" title="@{repeating_hench5_$X_powerscore-nomod508}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod508" title="@{repeating_hench5_$X_powerscore-mod508}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Kinetic-Devotion508" title="%{repeating_hench5_$X_Kinetic-Devotion508}" value="/roll [[1d20cs[[{@{powerscore-nomod508}+(@{powerscore-mod508})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod508}+(@{powerscore-mod508})+(@{misc-mod}),19}kl1]] @{psionkinetic508}"></button></td>
+                                            <td><input type="text" name="attr_psionkinetic-macro508" title="@{repeating_hench5_$X_psionkinetic-macro508}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_kinetic-macro508" title="%{repeating_hench5_$X_kinetic-macro508}" value="@{psionkinetic-macro508}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost608" title="@{repeating_hench5_$X_PSP-cost608}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                     </table>
                                 </ul>
                             </div>
+                        </div>
+                        <br>
+                        <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Psychoportive Sciences</b></h4>
+                                <h4>Psychometabolic Sciences</h4>
                                 <ul>
-                                    <table>
+                                    <table class="sheet-table-white">
                                         <tr>
-                                            <td><input type="text" name="attr_portation-science515" title="@{repeating_hench5_$X_portation-science515}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod515" title="@{repeating_hench5_$X_powerscore-nomod515}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod515" title="@{repeating_hench5_$X_powerscore-mod515}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod515" title="@{repeating_hench5_$X_psionic-mod515}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Portation-Science515" title="%{repeating_hench5_$X_Portation-Science515}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod515})]]&le;[[@{powerscore-nomod515}+(@{powerscore-mod515})]] @{portation-science515}"></button></td>
-                                            <td><input type="text" name="attr_psionportation-science-macro515" title="@{repeating_hench5_$X_psionportation-science-macro515}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-science-macro515" title="%{repeating_hench5_$X_portation-science-macro515}" value="@{psionportation-science-macro515}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost615" title="@{repeating_hench5_$X_PSP-cost615}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_metabolic-science521" title="@{repeating_hench5_$X_metabolic-science521}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod521" title="@{repeating_hench5_$X_powerscore-nomod521}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod521" title="@{repeating_hench5_$X_powerscore-mod521}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Metabolic-Science521" title="%{repeating_hench5_$X_Metabolic-Science521}" value="/roll [[1d20cs[[{@{powerscore-nomod521}+(@{powerscore-mod521})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod521}+(@{powerscore-mod521})+(@{misc-mod}),19}kl1]] @{metabolic-science521}"></button></td>
+                                            <td><input type="text" name="attr_psionmetabolic-science-macro521" title="@{repeating_hench5_$X_psionmetabolic-science-macro521}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_metabolic-science-macro521" title="%{repeating_hench5_$X_metabolic-science-macro521}" value="@{psionmetabolic-science-macro521}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost621" title="@{repeating_hench5_$X_PSP-cost621}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
-                                            <td><input type="text" name="attr_portation-science516" title="@{repeating_hench5_$X_portation-science516}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod516" title="@{repeating_hench5_$X_powerscore-nomod516}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod516" title="@{repeating_hench5_$X_powerscore-mod516}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod516" title="@{repeating_hench5_$X_psionic-mod516}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Portation-Science516" title="%{repeating_hench5_$X_Portation-Science516}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod516})]]&le;[[@{powerscore-nomod516}+(@{powerscore-mod516})]] @{portation-science516}"></button></td>
-                                            <td><input type="text" name="attr_psionportation-science-macro516" title="@{repeating_hench5_$X_psionportation-science-macro516}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-science-macro516" title="%{repeating_hench5_$X_portation-science-macro516}" value="@{psionportation-science-macro516}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost616" title="@{repeating_hench5_$X_PSP-cost616}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_metabolic-science522" title="@{repeating_hench5_$X_metabolic-science522}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod522" title="@{repeating_hench5_$X_powerscore-nomod522}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod522" title="@{repeating_hench5_$X_powerscore-mod522}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Metabolic-Science522" title="%{repeating_hench5_$X_Metabolic-Science522}" value="/roll [[1d20cs[[{@{powerscore-nomod522}+(@{powerscore-mod522})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod522}+(@{powerscore-mod522})+(@{misc-mod}),19}kl1]] @{metabolic-science522}"></button></td>
+                                            <td><input type="text" name="attr_psionmetabolic-science-macro522" title="@{repeating_hench5_$X_psionmetabolic-science-macro522}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_metabolic-science-macro522" title="%{repeating_hench5_$X_metabolic-science-macro522}" value="@{psionmetabolic-science-macro522}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost622" title="@{repeating_hench5_$X_PSP-cost622}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
-                                            <td><input type="text" name="attr_portation-science517" title="@{repeating_hench5_$X_portation-science517}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod517" title="@{repeating_hench5_$X_powerscore-nomod517}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod517" title="@{repeating_hench5_$X_powerscore-mod517}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod517" title="@{repeating_hench5_$X_psionic-mod517}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Portation-Science517" title="%{repeating_hench5_$X_Portation-Science517}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod517})]]&le;[[@{powerscore-nomod517}+(@{powerscore-mod517})]] @{portation-science517}"></button></td>
-                                            <td><input type="text" name="attr_psionportation-science-macro517" title="@{repeating_hench5_$X_psionportation-science-macro517}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-science-macro517" title="%{repeating_hench5_$X_portation-science-macro517}" value="@{repeating_hench5_$X_psionportation-science-macro517}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost617" title="@{repeating_hench5_$X_PSP-cost617}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_metabolic-science523" title="@{repeating_hench5_$X_metabolic-science523}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod523" title="@{repeating_hench5_$X_powerscore-nomod523}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod523" title="@{repeating_hench5_$X_powerscore-mod523}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Metabolic-Science523" title="%{repeating_hench5_$X_Metabolic-Science523}" value="/roll [[1d20cs[[{@{powerscore-nomod523}+(@{powerscore-mod523})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod523}+(@{powerscore-mod523})+(@{misc-mod}),19}kl1]] @{metabolic-science523}"></button></td>
+                                            <td><input type="text" name="attr_psionmetabolic-science-macro523" title="@{repeating_hench5_$X_psionmetabolic-science-macro523}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_metabolic-science-macro523" title="%{repeating_hench5_$X_metabolic-science-macro523}" value="@{psionmetabolic-science-macro523}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost623" title="@{repeating_hench5_$X_PSP-cost623}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                     </table>
                                 </ul>
                             </div>
-                        </div>
-                        <br>
-                        <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Psychometabolism Devotions</b></h4>
+                                <h4>Psychometabolic Devotions</h4>
                                 <ul>
-                                    <table>
+                                    <table class="sheet-table-white">
                                         <tr>
                                             <td><input type="text" name="attr_psionmetabolic518" title="@{repeating_hench5_$X_psionmetabolic518}" class="sheet-medium"></td>
                                             <td><input type="text" name="attr_powerscore-nomod518" title="@{repeating_hench5_$X_powerscore-nomod518}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod518" title="@{repeating_hench5_$X_powerscore-mod518}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod518" title="@{repeating_hench5_$X_psionic-mod518}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Metabolic-Devotion518" title="%{repeating_hench5_$X_Metabolic-Devotion518}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod518})]]&le;[[@{powerscore-nomod518}+(@{powerscore-mod518})]] @{psionmetabolic518}"></button></td>
-                                            <td><input type="text" name="attr_psionmetabolic-macro518" title="@{repeating_hench5_$X_psionmetabolic-macro518}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-macro518" title="%{repeating_hench5_$X_metabolic-macro518}" value="@{psionmetabolic-macro518}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod518" title="@{repeating_hench5_$X_powerscore-mod518}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Metabolic-Devotion518" title="%{repeating_hench5_$X_Metabolic-Devotion518}" value="/roll [[1d20cs[[{@{powerscore-nomod518}+(@{powerscore-mod518})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod518}+(@{powerscore-mod518})+(@{misc-mod}),19}kl1]] @{psionmetabolic518}"></button></td>
+                                            <td><input type="text" name="attr_psionmetabolic-macro518" title="@{repeating_hench5_$X_psionmetabolic-macro518}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_metabolic-macro518" title="%{repeating_hench5_$X_metabolic-macro518}" value="@{psionmetabolic-macro518}"></button></td>
                                             <td><input type="text" name="attr_PSP-cost618" title="@{repeating_hench5_$X_PSP-cost618}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
                                             <td><input type="text" name="attr_psionmetabolic519" title="@{repeating_hench5_$X_psionmetabolic519}" class="sheet-medium"></td>
                                             <td><input type="text" name="attr_powerscore-nomod519" title="@{repeating_hench5_$X_powerscore-nomod519}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod519" title="@{repeating_hench5_$X_powerscore-mod519}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod519" title="@{repeating_hench5_$X_psionic-mod519}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Metabolic-Devotion519" title="%{repeating_hench5_$X_Metabolic-Devotion519}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod519})]]&le;[[@{powerscore-nomod519}+(@{powerscore-mod519})]] @{psionmetabolic519}"></button></td>
-                                            <td><input type="text" name="attr_psionmetabolic-macro519" title="@{repeating_hench5_$X_psionmetabolic-macro519}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-macro519" title="%{repeating_hench5_$X_metabolic-macro519}" value="@{psionmetabolic-macro519}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod519" title="@{repeating_hench5_$X_powerscore-mod519}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Metabolic-Devotion519" title="%{repeating_hench5_$X_Metabolic-Devotion519}" value="/roll [[1d20cs[[{@{powerscore-nomod519}+(@{powerscore-mod519})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod519}+(@{powerscore-mod519})+(@{misc-mod}),19}kl1]] @{psionmetabolic519}"></button></td>
+                                            <td><input type="text" name="attr_psionmetabolic-macro519" title="@{repeating_hench5_$X_psionmetabolic-macro519}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_metabolic-macro519" title="%{repeating_hench5_$X_metabolic-macro519}" value="@{psionmetabolic-macro519}"></button></td>
                                             <td><input type="text" name="attr_PSP-cost619" title="@{repeating_hench5_$X_PSP-cost619}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
                                             <td><input type="text" name="attr_psionmetabolic520" title="@{repeating_hench5_$X_psionmetabolic520}" class="sheet-medium"></td>
                                             <td><input type="text" name="attr_powerscore-nomod520" title="@{repeating_hench5_$X_powerscore-nomod520}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod520" title="@{repeating_hench5_$X_powerscore-mod520}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod520" title="@{repeating_hench5_$X_psionic-mod520}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Metabolic-Devotion520" title="%{repeating_hench5_$X_Metabolic-Devotion520}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod520})]]&le;[[@{powerscore-nomod520}+(@{powerscore-mod520})]] @{psionmetabolic520}"></button></td>
-                                            <td><input type="text" name="attr_psionmetabolic-macro520" title="@{repeating_hench5_$X_psionmetabolic-macro520}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-macro520" title="%{repeating_hench5_$X_metabolic-macro520}" value="@{psionmetabolic-macro520}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod520" title="@{repeating_hench5_$X_powerscore-mod520}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Metabolic-Devotion520" title="%{repeating_hench5_$X_Metabolic-Devotion520}" value="/roll [[1d20cs[[{@{powerscore-nomod520}+(@{powerscore-mod520})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod520}+(@{powerscore-mod520})+(@{misc-mod}),19}kl1]] @{psionmetabolic520}"></button></td>
+                                            <td><input type="text" name="attr_psionmetabolic-macro520" title="@{repeating_hench5_$X_psionmetabolic-macro520}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_metabolic-macro520" title="%{repeating_hench5_$X_metabolic-macro520}" value="@{psionmetabolic-macro520}"></button></td>
                                             <td><input type="text" name="attr_PSP-cost620" title="@{repeating_hench5_$X_PSP-cost620}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                     </table>
                                 </ul>
                             </div>
+                        </div>
+                        <br>
+                        <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Psychometabolism Sciences</b></h4>
+                                <h4>Psychoportive Sciences</h4>
                                 <ul>
-                                    <table>
+                                    <table class="sheet-table-white">
                                         <tr>
-                                            <td><input type="text" name="attr_metabolic-science521" title="@{repeating_hench5_$X_metabolic-science521}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod521" title="@{repeating_hench5_$X_powerscore-nomod521}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod521" title="@{repeating_hench5_$X_powerscore-mod521}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod521" title="@{repeating_hench5_$X_psionic-mod521}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Metabolic-Science521" title="%{repeating_hench5_$X_Metabolic-Science521}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod521})]]&le;[[@{powerscore-nomod521}+(@{powerscore-mod521})]] @{metabolic-science521}"></button></td>
-                                            <td><input type="text" name="attr_psionmetabolic-science-macro521" title="@{repeating_hench5_$X_psionmetabolic-science-macro521}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-science-macro521" title="%{repeating_hench5_$X_metabolic-science-macro521}" value="@{psionmetabolic-science-macro521}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost621" title="@{repeating_hench5_$X_PSP-cost621}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_portation-science515" title="@{repeating_hench5_$X_portation-science515}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod515" title="@{repeating_hench5_$X_powerscore-nomod515}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod515" title="@{repeating_hench5_$X_powerscore-mod515}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Portation-Science515" title="%{repeating_hench5_$X_Portation-Science515}" value="/roll [[1d20cs[[{@{powerscore-nomod515}+(@{powerscore-mod515})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod515}+(@{powerscore-mod515})+(@{misc-mod}),19}kl1]] @{portation-science515}"></button></td>
+                                            <td><input type="text" name="attr_psionportation-science-macro515" title="@{repeating_hench5_$X_psionportation-science-macro515}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_portation-science-macro515" title="%{repeating_hench5_$X_portation-science-macro515}" value="@{psionportation-science-macro515}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost615" title="@{repeating_hench5_$X_PSP-cost615}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
-                                            <td><input type="text" name="attr_metabolic-science522" title="@{repeating_hench5_$X_metabolic-science522}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod522" title="@{repeating_hench5_$X_powerscore-nomod522}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod522" title="@{repeating_hench5_$X_powerscore-mod522}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod522" title="@{repeating_hench5_$X_psionic-mod522}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Metabolic-Science522" title="%{repeating_hench5_$X_Metabolic-Science522}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod522})]]&le;[[@{powerscore-nomod522}+(@{powerscore-mod522})]] @{metabolic-science522}"></button></td>
-                                            <td><input type="text" name="attr_psionmetabolic-science-macro522" title="@{repeating_hench5_$X_psionmetabolic-science-macro522}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-science-macro522" title="%{repeating_hench5_$X_metabolic-science-macro522}" value="@{psionmetabolic-science-macro522}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost622" title="@{repeating_hench5_$X_PSP-cost622}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_portation-science516" title="@{repeating_hench5_$X_portation-science516}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod516" title="@{repeating_hench5_$X_powerscore-nomod516}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod516" title="@{repeating_hench5_$X_powerscore-mod516}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Portation-Science516" title="%{repeating_hench5_$X_Portation-Science516}" value="/roll [[1d20cs[[{@{powerscore-nomod516}+(@{powerscore-mod516})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod516}+(@{powerscore-mod516})+(@{misc-mod}),19}kl1]] @{portation-science516}"></button></td>
+                                            <td><input type="text" name="attr_psionportation-science-macro516" title="@{repeating_hench5_$X_psionportation-science-macro516}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_portation-science-macro516" title="%{repeating_hench5_$X_portation-science-macro516}" value="@{psionportation-science-macro516}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost616" title="@{repeating_hench5_$X_PSP-cost616}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
-                                            <td><input type="text" name="attr_metabolic-science523" title="@{repeating_hench5_$X_metabolic-science523}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod523" title="@{repeating_hench5_$X_powerscore-nomod523}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod523" title="@{repeating_hench5_$X_powerscore-mod523}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod523" title="@{repeating_hench5_$X_psionic-mod523}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Metabolic-Science523" title="%{repeating_hench5_$X_Metabolic-Science523}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod523})]]&le;[[@{powerscore-nomod523}+(@{powerscore-mod523})]] @{metabolic-science523}"></button></td>
-                                            <td><input type="text" name="attr_psionmetabolic-science-macro523" title="@{repeating_hench5_$X_psionmetabolic-science-macro523}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-science-macro523" title="%{repeating_hench5_$X_metabolic-science-macro523}" value="@{psionmetabolic-science-macro523}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost623" title="@{repeating_hench5_$X_PSP-cost623}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_portation-science517" title="@{repeating_hench5_$X_portation-science517}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod517" title="@{repeating_hench5_$X_powerscore-nomod517}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod517" title="@{repeating_hench5_$X_powerscore-mod517}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Portation-Science517" title="%{repeating_hench5_$X_Portation-Science517}" value="/roll [[1d20cs[[{@{powerscore-nomod517}+(@{powerscore-mod517})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod517}+(@{powerscore-mod517})+(@{misc-mod}),19}kl1]] @{portation-science517}"></button></td>
+                                            <td><input type="text" name="attr_psionportation-science-macro517" title="@{repeating_hench5_$X_psionportation-science-macro517}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_portation-science-macro517" title="%{repeating_hench5_$X_portation-science-macro517}" value="@{psionportation-science-macro517}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost617" title="@{repeating_hench5_$X_PSP-cost617}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                     </table>
                                 </ul>
                             </div>
-                        </div>
-                        <br>
-                        <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Clairsentient Devotions</b></h4>
+                                <h4>Psychoportive Devotions</h4>
                                 <ul>
-                                    <table>
+                                    <table class="sheet-table-white">
                                         <tr>
-                                            <td><input type="text" name="attr_psionclair524" title="@{repeating_hench5_$X_psionclair524}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod524" title="@{repeating_hench5_$X_powerscore-nomod524}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod524" title="@{repeating_hench5_$X_powerscore-mod524}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod524" title="@{repeating_hench5_$X_psionic-mod524}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Clair-Devotion524" title="%{repeating_hench5_$X_Clair-Devotion524}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod524})]]&le;[[@{powerscore-nomod524}+(@{powerscore-mod524})]] @{psionclair524}"></button></td>
-                                            <td><input type="text" name="attr_psionclair-macro524" title="@{repeating_hench5_$X_psionclair-macro524}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-macro524" title="%{repeating_hench5_$X_clair-macro524}" value="@{psionclair-macro524}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost624" title="@{repeating_hench5_$X_PSP-cost624}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_psionportation512" title="@{repeating_hench5_$X_psionportation512}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod512" title="@{repeating_hench5_$X_powerscore-nomod512}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod512" title="@{repeating_hench5_$X_powerscore-mod512}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Portation-Devotion512" title="%{repeating_hench5_$X_Portation-Devotion512}" value="/roll [[1d20cs[[{@{powerscore-nomod512}+(@{powerscore-mod512})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod512}+(@{powerscore-mod512})+(@{misc-mod}),19}kl1]] @{psionportation512}"></button></td>
+                                            <td><input type="text" name="attr_psionportation-macro512" title="@{repeating_hench5_$X_psionportation-macro512}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_portation-macro512" title="%{repeating_hench5_$X_portation-macro512}" value="@{psionportation-macro512}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost612" title="@{repeating_hench5_$X_PSP-cost612}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
-                                            <td><input type="text" name="attr_psionclair525" title="@{repeating_hench5_$X_psionclair525}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod525" title="@{repeating_hench5_$X_powerscore-nomod525}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod525" title="@{repeating_hench5_$X_powerscore-mod525}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod525" title="@{repeating_hench5_$X_psionic-mod525}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Clair-Devotion525" title="%{repeating_hench5_$X_Clair-Devotion525}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod525})]]&le;[[@{powerscore-nomod525}+(@{powerscore-mod525})]] @{psionclair525}"></button></td>
-                                            <td><input type="text" name="attr_psionclair-macro525" title="@{repeating_hench5_$X_psionclair-macro525}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-macro525" title="%{repeating_hench5_$X_clair-macro525}" value="@{psionclair-macro525}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost625" title="@{repeating_hench5_$X_PSP-cost625}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_psionportation513" title="@{repeating_hench5_$X_psionportation513}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod513" title="@{repeating_hench5_$X_powerscore-nomod513}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod513" title="@{repeating_hench5_$X_powerscore-mod513}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Portation-Devotion513" title="%{repeating_hench5_$X_Portation-Devotion513}" value="/roll [[1d20cs[[{@{powerscore-nomod513}+(@{powerscore-mod513})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod513}+(@{powerscore-mod513})+(@{misc-mod}),19}kl1]] @{psionportation513}"></button></td>
+                                            <td><input type="text" name="attr_psionportation-macro513" title="@{repeating_hench5_$X_psionportation-macro513}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_portation-macro513" title="%{repeating_hench5_$X_portation-macro513}" value="@{psionportation-macro513}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost613" title="@{repeating_hench5_$X_PSP-cost613}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
-                                            <td><input type="text" name="attr_psionclair526" title="@{repeating_hench5_$X_psionclair526}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod526" title="@{repeating_hench5_$X_powerscore-nomod526}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod526" title="@{repeating_hench5_$X_powerscore-mod526}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod526" title="@{repeating_hench5_$X_psionic-mod526}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Clair-Devotion526" title="%{repeating_hench5_$X_Clair-Devotion526}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod526})]]&le;[[@{powerscore-nomod526}+(@{powerscore-mod526})]] @{psionclair526}"></button></td>
-                                            <td><input type="text" name="attr_psionclair-macro526" title="@{repeating_hench5_$X_psionclair-macro526}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-macro526" title="%{repeating_hench5_$X_clair-macro526}" value="@{psionclair-macro526}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost626" title="@{repeating_hench5_$X_PSP-cost626}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_psionportation514" title="@{repeating_hench5_$X_psionportation514}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod514" title="@{repeating_hench5_$X_powerscore-nomod514}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod514" title="@{repeating_hench5_$X_powerscore-mod514}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Portation-Devotion514" title="%{repeating_hench5_$X_Portation-Devotion514}" value="/roll [[1d20cs[[{@{powerscore-nomod514}+(@{powerscore-mod514})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod514}+(@{powerscore-mod514})+(@{misc-mod}),19}kl1]] @{psionportation514}"></button></td>
+                                            <td><input type="text" name="attr_psionportation-macro514" title="@{repeating_hench5_$X_psionportation-macro514}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_portation-macro514" title="%{repeating_hench5_$X_portation-macro514}" value="@{psionportation-macro514}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost614" title="@{repeating_hench5_$X_PSP-cost614}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                     </table>
                                 </ul>
                             </div>
+                        </div>
+                        <br>
+                        <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Clairsentient Sciences</b></h4>
+                                <h4>Telepathic Sciences</h4>
                                 <ul>
-                                    <table>
+                                    <table class="sheet-table-white">
                                         <tr>
-                                            <td><input type="text" name="attr_clair-science527" title="@{repeating_hench5_$X_clair-science527}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod527" title="@{repeating_hench5_$X_powerscore-nomod527}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod527" title="@{repeating_hench5_$X_powerscore-mod527}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod527" title="@{repeating_hench5_$X_psionic-mod527}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Clair-Science527" title="%{repeating_hench5_$X_Clair-Science527}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod527})]]&le;[[@{powerscore-nomod527}+(@{powerscore-mod527})]] @{clair-science527}"></button></td>
-                                            <td><input type="text" name="attr_psionclair-science-macro527" title="@{repeating_hench5_$X_psionclair-science-macro527}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-science-macro527" title="%{repeating_hench5_$X_clair-science-macro527}" value="@{psionclair-science-macro527}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost627" title="@{repeating_hench5_$X_PSP-cost627}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_telepathic-science503" title="@{repeating_hench5_$X_telepathic-science503}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod503" title="@{repeating_hench5_$X_powerscore-nomod503}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod503" title="@{repeating_hench5_$X_powerscore-mod503}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Telepathy-Science503" title="%{repeating_hench5_$X_Telepathy-Science503}" value="/roll [[1d20cs[[{@{powerscore-nomod503}+(@{powerscore-mod503})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod503}+(@{powerscore-mod503})+(@{misc-mod}),19}kl1]] @{telepathic-science503}"></button></td>
+                                            <td><input type="text" name="attr_psiontelepathic-science-macro503" title="@{repeating_hench5_$X_psiontelepathic-science-macro503}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_telepathic-science-macro503" title="%{repeating_hench5_$X_telepathic-science-macro503}" value="@{psiontelepathic-science-macro503}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost603" title="@{repeating_hench5_$X_PSP-cost603}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
-                                            <td><input type="text" name="attr_clair-science528" title="@{repeating_hench5_$X_clair-science528}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod528" title="@{repeating_hench5_$X_powerscore-nomod528}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod528" title="@{repeating_hench5_$X_powerscore-mod528}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod528" title="@{repeating_hench5_$X_psionic-mod528}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Clair-Science528" title="%{repeating_hench5_$X_Clair-Science528}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod528})]]&le;[[@{powerscore-nomod528}+(@{powerscore-mod528})]] @{clair-science528}"></button></td>
-                                            <td><input type="text" name="attr_psionclair-science-macro528" title="@{repeating_hench5_$X_psionclair-science-macro528}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-science-macro528" title="%{repeating_hench5_$X_clair-science-macro528}" value="@{psionclair-science-macro528}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost628" title="@{repeating_hench5_$X_PSP-cost628}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_telepathic-science504" title="@{repeating_hench5_$X_telepathic-science504}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod504" title="@{repeating_hench5_$X_powerscore-nomod504}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod504" title="@{repeating_hench5_$X_powerscore-mod504}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Telepathy-Science504" title="%{repeating_hench5_$X_Telepathy-Science504}" value="/roll [[1d20cs[[{@{powerscore-nomod504}+(@{powerscore-mod504})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod504}+(@{powerscore-mod504})+(@{misc-mod}),19}kl1]] @{telepathic-science504}"></button></td>
+                                            <td><input type="text" name="attr_psiontelepathic-science-macro504" title="@{repeating_hench5_$X_psiontelepathic-science-macro504}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_telepathic-science-macro504" title="%{repeating_hench5_$X_telepathic-science-macro504}" value="@{psiontelepathic-science-macro504}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost604" title="@{repeating_hench5_$X_PSP-cost604}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
-                                            <td><input type="text" name="attr_clair-science529" title="@{repeating_hench5_$X_clair-science529}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod529" title="@{repeating_hench5_$X_powerscore-nomod529}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod529" title="@{repeating_hench5_$X_powerscore-mod529}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod529" title="@{repeating_hench5_$X_psionic-mod529}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Clair-Science529" title="%{repeating_hench5_$X_Clair-Science529}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod529})]]&le;[[@{powerscore-nomod529}+(@{powerscore-mod529})]] @{clair-science529}"></button></td>
-                                            <td><input type="text" name="attr_psionclair-science-macro529" title="@{repeating_hench5_$X_psionclair-science-macro529}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-science-macro529" title="%{repeating_hench5_$X_clair-science-macro529}" value="@{psionclair-science-macro529}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost629" title="@{repeating_hench5_$X_PSP-cost629}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_telepathic-science505" title="@{repeating_hench5_$X_telepathic-science505}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod505" title="@{repeating_hench5_$X_powerscore-nomod505}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod505" title="@{repeating_hench5_$X_powerscore-mod505}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Telepathy-Science505" title="%{repeating_hench5_$X_Telepathy-Science505}" value="/roll [[1d20cs[[{@{powerscore-nomod505}+(@{powerscore-mod505})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod505}+(@{powerscore-mod505})+(@{misc-mod}),19}kl1]] @{telepathic-science505}"></button></td>
+                                            <td><input type="text" name="attr_psiontelepathic-science-macro505" title="@{repeating_hench5_$X_psiontelepathic-science-macro505}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_telepathic-science-macro505" title="%{repeating_hench5_$X_telepathic-science-macro505}" value="@{psiontelepathic-science-macro505}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost605" title="@{repeating_hench5_$X_PSP-cost605}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                     </table>
                                 </ul>
                             </div>
-                        </div>
-                        <br>
-                        <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Metapsionic Devotions</b></h4>
+                                <h4>Telepathic Devotions</h4>
                                 <ul>
-                                    <table>
+                                    <table class="sheet-table-white">
                                         <tr>
-                                            <td><input type="text" name="attr_psionmeta536" title="@{repeating_hench5_$X_psionmeta536}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod536" title="@{repeating_hench5_$X_powerscore-nomod536}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod536" title="@{repeating_hench5_$X_powerscore-mod536}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod536" title="@{repeating_hench5_$X_psionic-mod536}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Meta-Devotion536" title="%{repeating_hench5_$X_Meta-Devotion536}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod536})]]&le;[[@{powerscore-nomod536}+(@{powerscore-mod536})]] @{psionmeta536}"></button></td>
-                                            <td><input type="text" name="attr_psionmeta-macro536" title="@{repeating_hench5_$X_psionmeta-macro536}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-macro536" title="%{repeating_hench5_$X_meta-macro536}" value="@{psionmeta-macro536}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost636" title="@{repeating_hench5_$X_PSP-cost636}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_psiontelepathic500" title="@{repeating_hench5_$X_psiontelepathic500}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod500" title="@{repeating_hench5_$X_powerscore-nomod500}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod500" title="@{repeating_hench5_$X_powerscore-mod500}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Telepathy-Devotion500" title="%{repeating_hench5_$X_Telepathy-Devotion500}" value="/roll [[1d20cs[[{@{powerscore-nomod500}+(@{powerscore-mod500})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod500}+(@{powerscore-mod500})+(@{misc-mod}),19}kl1]] @{psiontelepathic500}"></button></td>
+                                            <td><input type="text" name="attr_psiontelepathic-macro500" title="@{repeating_hench5_$X_psiontelepathic-macro500}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_telepathic-macro500" title="%{repeating_hench5_$X_telepathic-macro500}" value="@{psiontelepathic-macro500}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost600" title="@{repeating_hench5_$X_PSP-cost600}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
-                                            <td><input type="text" name="attr_psionmeta537" title="@{repeating_hench5_$X_psionmeta537}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod537" title="@{repeating_hench5_$X_powerscore-nomod537}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod537" title="@{repeating_hench5_$X_powerscore-mod537}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod537" title="@{repeating_hench5_$X_psionic-mod537}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Meta-Devotion537" title="%{repeating_hench5_$X_Meta-Devotion537}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod537})]]&le;[[@{powerscore-nomod537}+(@{powerscore-mod537})]] @{psionmeta537}"></button></td>
-                                            <td><input type="text" name="attr_psionmeta-macro537" title="@{repeating_hench5_$X_psionmeta-macro537}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-macro537" title="%{repeating_hench5_$X_meta-macro537}" value="@{psionmeta-macro537}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost637" title="@{repeating_hench5_$X_PSP-cost637}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_psiontelepathic501" title="@{repeating_hench5_$X_psiontelepathic501}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod501" title="@{repeating_hench5_$X_powerscore-nomod501}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod501" title="@{repeating_hench5_$X_powerscore-mod501}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Telepathy-Devotion501" title="%{repeating_hench5_$X_Telepathy-Devotion501}" value="/roll [[1d20cs[[{@{powerscore-nomod501}+(@{powerscore-mod501})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod501}+(@{powerscore-mod501})+(@{misc-mod}),19}kl1]] @{psiontelepathic501}"></button></td>
+                                            <td><input type="text" name="attr_psiontelepathic-macro501" title="@{repeating_hench5_$X_psiontelepathic-macro501}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_telepathic-macro501" title="%{repeating_hench5_$X_telepathic-macro501}" value="@{psiontelepathic-macro501}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost601" title="@{repeating_hench5_$X_PSP-cost601}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
-                                            <td><input type="text" name="attr_psionmeta538" title="@{repeating_hench5_$X_psionmeta538}" class="sheet-medium"></td>
-                                            <td><input type="text" name="attr_powerscore-nomod538" title="@{repeating_hench5_$X_powerscore-nomod538}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod538" title="@{repeating_hench5_$X_powerscore-mod538}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod538" title="@{repeating_hench5_$X_psionic-mod538}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Meta-Devotion538" title="%{repeating_hench5_$X_Meta-Devotion538}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod538})]]&le;[[@{powerscore-nomod538}+(@{powerscore-mod538})]] @{psionmeta538}"></button></td>
-                                            <td><input type="text" name="attr_psionmeta-macro538" title="@{repeating_hench5_$X_psionmeta-macro538}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-macro538" title="%{repeating_hench5_$X_meta-macro538}" value="@{psionmeta-macro538}"></button></td>
-                                            <td><input type="text" name="attr_PSP-cost638" title="@{repeating_hench5_$X_PSP-cost638}" placeholder="#" class="sheet-small"/></td>
+                                            <td><input type="text" name="attr_psiontelepathic502" title="@{repeating_hench5_$X_psiontelepathic502}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod502" title="@{repeating_hench5_$X_powerscore-nomod502}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod502" title="@{repeating_hench5_$X_powerscore-mod502}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Telepathy-Devotion502" title="%{repeating_hench5_$X_Telepathy-Devotion502}" value="/roll [[1d20cs[[{@{powerscore-nomod502}+(@{powerscore-mod502})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod502}+(@{powerscore-mod502})+(@{misc-mod}),19}kl1]] @{psiontelepathic502}"></button></td>
+                                            <td><input type="text" name="attr_psiontelepathic-macro502" title="@{repeating_hench5_$X_psiontelepathic-macro502}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_telepathic-macro502" title="%{repeating_hench5_$X_telepathic-macro502}" value="@{psiontelepathic-macro502}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost602" title="@{repeating_hench5_$X_PSP-cost602}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                     </table>
                                 </ul>
                             </div>
+                        </div>
+                        <br>
+                        <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Metapsionic Sciences</b></h4>
+                                <h4>Metapsionic Sciences</h4>
                                 <ul>
-                                    <table>
+                                    <table class="sheet-table-white">
                                         <tr>
                                             <td><input type="text" name="attr_meta-science539" title="@{repeating_hench5_$X_meta-science539}" class="sheet-medium"></td>
                                             <td><input type="text" name="attr_powerscore-nomod539" title="@{repeating_hench5_$X_powerscore-nomod539}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod539" title="@{repeating_hench5_$X_powerscore-mod539}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod539" title="@{repeating_hench5_$X_psionic-mod539}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Meta-Science539" title="%{repeating_hench5_$X_Meta-Science539}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod539})]]&le;[[@{powerscore-nomod539}+(@{powerscore-mod539})]] @{meta-science539}"></button></td>
-                                            <td><input type="text" name="attr_psionmeta-science-macro539" title="@{repeating_hench5_$X_psionmeta-science-macro539}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-science-macro539" title="%{repeating_hench5_$X_meta-science-macro539}" value="@{psionmeta-science-macro539}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod539" title="@{repeating_hench5_$X_powerscore-mod539}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Meta-Science539" title="%{repeating_hench5_$X_Meta-Science539}" value="/roll [[1d20cs[[{@{powerscore-nomod539}+(@{powerscore-mod539})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod539}+(@{powerscore-mod539})+(@{misc-mod}),19}kl1]] @{meta-science539}"></button></td>
+                                            <td><input type="text" name="attr_psionmeta-science-macro539" title="@{repeating_hench5_$X_psionmeta-science-macro539}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_meta-science-macro539" title="%{repeating_hench5_$X_meta-science-macro539}" value="@{psionmeta-science-macro539}"></button></td>
                                             <td><input type="text" name="attr_PSP-cost639" title="@{repeating_hench5_$X_PSP-cost639}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
                                             <td><input type="text" name="attr_meta-science540" title="@{repeating_hench5_$X_meta-science540}" class="sheet-medium"></td>
                                             <td><input type="text" name="attr_powerscore-nomod540" title="@{repeating_hench5_$X_powerscore-nomod540}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod540" title="@{repeating_hench5_$X_powerscore-mod540}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod540" title="@{repeating_hench5_$X_psionic-mod540}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Meta-Science540" title="%{repeating_hench5_$X_Meta-Science540}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod540})]]&le;[[@{powerscore-nomod540}+(@{powerscore-mod540})]] @{meta-science540}"></button></td>
-                                            <td><input type="text" name="attr_psionmeta-science-macro540" title="@{repeating_hench5_$X_psionmeta-science-macro540}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-science-macro540" title="%{meta-science-macro540}" value="@{psionmeta-science-macro540}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod540" title="@{repeating_hench5_$X_powerscore-mod540}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Meta-Science540" title="%{repeating_hench5_$X_Meta-Science540}" value="/roll [[1d20cs[[{@{powerscore-nomod540}+(@{powerscore-mod540})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod540}+(@{powerscore-mod540})+(@{misc-mod}),19}kl1]] @{meta-science540}"></button></td>
+                                            <td><input type="text" name="attr_psionmeta-science-macro540" title="@{repeating_hench5_$X_psionmeta-science-macro540}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_meta-science-macro540" title="%{repeating_hench5_$X_meta-science-macro540}" value="@{psionmeta-science-macro540}"></button></td>
                                             <td><input type="text" name="attr_PSP-cost640" title="@{repeating_hench5_$X_PSP-cost640}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
                                             <td><input type="text" name="attr_meta-science541" title="@{repeating_hench5_$X_meta-science541}" class="sheet-medium"></td>
                                             <td><input type="text" name="attr_powerscore-nomod541" title="@{repeating_hench5_$X_powerscore-nomod541}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod541" title="@{repeating_hench5_$X_powerscore-mod541}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod541" title="@{repeating_hench5_$X_psionic-mod541}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Meta-Science541" title="%{repeating_hench5_$X_Meta-Science541}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod541})]]&le;[[@{powerscore-nomod541}+(@{powerscore-mod541})]] @{meta-science541}"></button></td>
-                                            <td><input type="text" name="attr_psionmeta-science-macro541" title="@{repeating_hench5_$X_psionmeta-science-macro541}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-science-macro541" title="%{repeating_hench5_$X_meta-science-macro541}" value="@{psionmeta-science-macro541}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod541" title="@{repeating_hench5_$X_powerscore-mod541}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Meta-Science541" title="%{repeating_hench5_$X_Meta-Science541}" value="/roll [[1d20cs[[{@{powerscore-nomod541}+(@{powerscore-mod541})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod541}+(@{powerscore-mod541})+(@{misc-mod}),19}kl1]] @{meta-science541}"></button></td>
+                                            <td><input type="text" name="attr_psionmeta-science-macro541" title="@{repeating_hench5_$X_psionmeta-science-macro541}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_meta-science-macro541" title="%{repeating_hench5_$X_meta-science-macro541}" value="@{psionmeta-science-macro541}"></button></td>
                                             <td><input type="text" name="attr_PSP-cost641" title="@{repeating_hench5_$X_PSP-cost641}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                     </table>
                                 </ul>
                             </div>
+                            <div class="sheet-col">
+                                <h4>Metapsionic Devotions</h4>
+                                <ul>
+                                    <table class="sheet-table-white">
+                                        <tr>
+                                            <td><input type="text" name="attr_psionmeta536" title="@{repeating_hench5_$X_psionmeta536}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod536" title="@{repeating_hench5_$X_powerscore-nomod536}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod536" title="@{repeating_hench5_$X_powerscore-mod536}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Meta-Devotion536" title="%{repeating_hench5_$X_Meta-Devotion536}" value="/roll [[1d20cs[[{@{powerscore-nomod536}+(@{powerscore-mod536})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod536}+(@{powerscore-mod536})+(@{misc-mod}),19}kl1]] @{psionmeta536}"></button></td>
+                                            <td><input type="text" name="attr_psionmeta-macro536" title="@{repeating_hench5_$X_psionmeta-macro536}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_meta-macro536" title="%{repeating_hench5_$X_meta-macro536}" value="@{psionmeta-macro536}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost636" title="@{repeating_hench5_$X_PSP-cost636}" placeholder="#" class="sheet-small"/></td>
+                                        </tr>
+                                        <tr>
+                                            <td><input type="text" name="attr_psionmeta537" title="@{repeating_hench5_$X_psionmeta537}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod537" title="@{repeating_hench5_$X_powerscore-nomod537}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod537" title="@{repeating_hench5_$X_powerscore-mod537}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Meta-Devotion537" title="%{repeating_hench5_$X_Meta-Devotion537}" value="/roll [[1d20cs[[{@{powerscore-nomod537}+(@{powerscore-mod537})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod537}+(@{powerscore-mod537})+(@{misc-mod}),19}kl1]] @{psionmeta537}"></button></td>
+                                            <td><input type="text" name="attr_psionmeta-macro537" title="@{repeating_hench5_$X_psionmeta-macro537}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_meta-macro537" title="%{repeating_hench5_$X_meta-macro537}" value="@{psionmeta-macro537}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost637" title="@{repeating_hench5_$X_PSP-cost637}" placeholder="#" class="sheet-small"/></td>
+                                        </tr>
+                                        <tr>
+                                            <td><input type="text" name="attr_psionmeta538" title="@{repeating_hench5_$X_psionmeta538}" class="sheet-medium"></td>
+                                            <td><input type="text" name="attr_powerscore-nomod538" title="@{repeating_hench5_$X_powerscore-nomod538}" placeholder="@{}" class="sheet-small"></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod538" title="@{repeating_hench5_$X_powerscore-mod538}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Meta-Devotion538" title="%{repeating_hench5_$X_Meta-Devotion538}" value="/roll [[1d20cs[[{@{powerscore-nomod538}+(@{powerscore-mod538})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod538}+(@{powerscore-mod538})+(@{misc-mod}),19}kl1]] @{psionmeta538}"></button></td>
+                                            <td><input type="text" name="attr_psionmeta-macro538" title="@{repeating_hench5_$X_psionmeta-macro538}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_meta-macro538" title="%{repeating_hench5_$X_meta-macro538}" value="@{psionmeta-macro538}"></button></td>
+                                            <td><input type="text" name="attr_PSP-cost638" title="@{repeating_hench5_$X_PSP-cost638}" placeholder="#" class="sheet-small"/></td>
+                                        </tr>
+                                    </table>
+                                </ul>
+                            </div>
                         </div>
                         <br>
                         <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Attack Modes</b></h4>
+                                <h4>Attack Modes</h4>
                                 <ul>
-                                    <table>
+                                    <table class="sheet-table-white">
                                         <tr>
                                             <td><input type="text" name="attr_psionattacking530" title="@{repeating_hench5_$X_psionattacking530}" class="sheet-medium"></td>
                                             <td><input type="text" name="attr_powerscore-nomod530" title="@{repeating_hench5_$X_powerscore-nomod530}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod530" title="@{repeating_hench5_$X_powerscore-mod530}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod530" title="@{repeating_hench5_$X_psionic-mod530}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Attacking530" title="%{repeating_hench5_$X_Attacking530}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod530})]]&le;[[@{powerscore-nomod530}+(@{powerscore-mod530})]] @{psionattacking530}"></button></td>
-                                            <td><input type="text" name="attr_psionattacking-macro530" title="@{repeating_hench5_$X_psionattacking-macro530}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_attacking-macro530" title="%{repeating_hench5_$X_attacking-macro530}" value="@{psionattacking-macro530}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod530" title="@{repeating_hench5_$X_powerscore-mod530}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Attacking530" title="%{repeating_hench5_$X_Attacking530}" value="/roll [[1d20cs[[{@{powerscore-nomod530}+(@{powerscore-mod530})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod530}+(@{powerscore-mod530})+(@{misc-mod}),19}kl1]] @{psionattacking530}"></button></td>
+                                            <td><input type="text" name="attr_psionattacking-macro530" title="@{repeating_hench5_$X_psionattacking-macro530}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_attacking-macro530" title="%{repeating_hench5_$X_attacking-macro530}" value="@{psionattacking-macro530}"></button></td>
                                             <td><input type="text" name="attr_PSP-cost630" title="@{repeating_hench5_$X_PSP-cost630}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
                                             <td><input type="text" name="attr_psionattacking531" title="@{repeating_hench5_$X_psionattacking531}" class="sheet-medium"></td>
                                             <td><input type="text" name="attr_powerscore-nomod531" title="@{repeating_hench5_$X_powerscore-nomod531}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod531" title="@{repeating_hench5_$X_powerscore-mod531}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod531" title="@{repeating_hench5_$X_psionic-mod531}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Attacking531" title="%{repeating_hench5_$X_Attacking531}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod531})]]&le;[[@{powerscore-nomod531}+(@{powerscore-mod531})]] @{psionattacking531}"></button></td>
-                                            <td><input type="text" name="attr_psionattacking-macro531" title="@{repeating_hench5_$X_psionattacking-macro531}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_attacking-macro531" title="%{repeating_hench5_$X_attacking-macro531}" value="@{psionattacking-macro531}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod531" title="@{repeating_hench5_$X_powerscore-mod531}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Attacking531" title="%{repeating_hench5_$X_Attacking531}" value="/roll [[1d20cs[[{@{powerscore-nomod531}+(@{powerscore-mod531})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod531}+(@{powerscore-mod531})+(@{misc-mod}),19}kl1]] @{psionattacking531}"></button></td>
+                                            <td><input type="text" name="attr_psionattacking-macro531" title="@{repeating_hench5_$X_psionattacking-macro531}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_attacking-macro531" title="%{repeating_hench5_$X_attacking-macro531}" value="@{psionattacking-macro531}"></button></td>
                                             <td><input type="text" name="attr_PSP-cost631" title="@{repeating_hench5_$X_PSP-cost631}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
                                             <td><input type="text" name="attr_psionattacking532" title="@{repeating_hench5_$X_psionattacking532}" class="sheet-medium"></td>
                                             <td><input type="text" name="attr_powerscore-nomod532" title="@{repeating_hench5_$X_powerscore-nomod532}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod532" title="@{repeating_hench5_$X_powerscore-mod532}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod532" title="@{repeating_hench5_$X_psionic-mod532}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Attacking532" title="%{repeating_hench5_$X_Attacking532}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod532})]]&le;[[@{powerscore-nomod532}+(@{powerscore-mod532})]] @{psionattacking532}"></button></td>
-                                            <td><input type="text" name="attr_psionattacking-macro532" title="@{repeating_hench5_$X_psionattacking-macro532}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_attacking-macro532" title="%{repeating_hench5_$X_attacking-macro532}" value="@{psionattacking-macro532}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod532" title="@{repeating_hench5_$X_powerscore-mod532}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Attacking532" title="%{repeating_hench5_$X_Attacking532}" value="/roll [[1d20cs[[{@{powerscore-nomod532}+(@{powerscore-mod532})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod532}+(@{powerscore-mod532})+(@{misc-mod}),19}kl1]] @{psionattacking532}"></button></td>
+                                            <td><input type="text" name="attr_psionattacking-macro532" title="@{repeating_hench5_$X_psionattacking-macro532}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_attacking-macro532" title="%{repeating_hench5_$X_attacking-macro532}" value="@{psionattacking-macro532}"></button></td>
                                             <td><input type="text" name="attr_PSP-cost632" title="@{repeating_hench5_$X_PSP-cost632}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                     </table>
                                 </ul>
                             </div>
                             <div class="sheet-col">
-                                <h4><b>Defense Modes</b></h4>
+                                <h4>Defense Modes</h4>
                                 <ul>
-                                    <table>
+                                    <table class="sheet-table-white">
                                         <tr>
                                             <td><input type="text" name="attr_psiondefending533" title="@{repeating_hench5_$X_psiondefending533}" class="sheet-medium"></td>
                                             <td><input type="text" name="attr_powerscore-nomod533" title="@{repeating_hench5_$X_powerscore-nomod533}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod533" title="@{repeating_hench5_$X_powerscore-mod533}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod533" title="@{repeating_hench5_$X_psionic-mod533}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Defending533" title="%{repeating_hench5_$X_Defending533}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod533})]]&le;[[@{powerscore-nomod533}+(@{powerscore-mod533})]] @{psiondefending533}"></button></td>
-                                            <td><input type="text" name="attr_psiondefending-macro533" title="@{repeating_hench5_$X_psiondefending-macro533}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_defending-macro533" title="%{repeating_hench5_$X_defending-macro533}" value="@{psiondefending-macro533}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod533" title="@{repeating_hench5_$X_powerscore-mod533}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Defending533" title="%{repeating_hench5_$X_Defending533}" value="/roll [[1d20cs[[{@{powerscore-nomod533}+(@{powerscore-mod533})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod533}+(@{powerscore-mod533})+(@{misc-mod}),19}kl1]] @{psiondefending533}"></button></td>
+                                            <td><input type="text" name="attr_psiondefending-macro533" title="@{repeating_hench5_$X_psiondefending-macro533}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_defending-macro533" title="%{repeating_hench5_$X_defending-macro533}" value="@{psiondefending-macro533}"></button></td>
                                             <td><input type="text" name="attr_PSP-cost633" title="@{repeating_hench5_$X_PSP-cost633}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
                                             <td><input type="text" name="attr_psiondefending534" title="@{repeating_hench5_$X_psiondefending534}" class="sheet-medium"></td>
                                             <td><input type="text" name="attr_powerscore-nomod534" title="@{repeating_hench5_$X_powerscore-nomod534}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod534" title="@{repeating_hench5_$X_powerscore-mod534}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod534" title="@{repeating_hench5_$X_psionic-mod534}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Defending534" title="%{repeating_hench5_$X_Defending534}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod534})]]&le;[[@{powerscore-nomod534}+(@{powerscore-mod534})]] @{psiondefending534}"></button></td>
-                                            <td><input type="text" name="attr_psiondefending-macro534" title="@{repeating_hench5_$X_psiondefending-macro534}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_defending-macro534" title="%{repeating_hench5_$X_defending-macro534}" value="@{psiondefending-macro534}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod534" title="@{repeating_hench5_$X_powerscore-mod534}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Defending534" title="%{repeating_hench5_$X_Defending534}" value="/roll [[1d20cs[[{@{powerscore-nomod534}+(@{powerscore-mod534})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod534}+(@{powerscore-mod534})+(@{misc-mod}),19}kl1]] @{psiondefending534}"></button></td>
+                                            <td><input type="text" name="attr_psiondefending-macro534" title="@{repeating_hench5_$X_psiondefending-macro534}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_defending-macro534" title="%{repeating_hench5_$X_defending-macro534}" value="@{psiondefending-macro534}"></button></td>
                                             <td><input type="text" name="attr_PSP-cost634" title="@{repeating_hench5_$X_PSP-cost634}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                         <tr>
                                             <td><input type="text" name="attr_psiondefending535" title="@{repeating_hench5_$X_psiondefending535}" class="sheet-medium"></td>
                                             <td><input type="text" name="attr_powerscore-nomod535" title="@{repeating_hench5_$X_powerscore-nomod535}" placeholder="@{}" class="sheet-small"></td>
-                                            <td><input type="text" name="attr_powerscore-mod535" title="@{repeating_hench5_$X_powerscore-mod535}" placeholder="#" class="sheet-tiny"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod535" title="@{repeating_hench5_$X_psionic-mod535}" placeholder="#" class="sheet-tiny">
-                                                <button type="roll" name="roll_Defending535" title="%{repeating_hench5_$X_Defending535}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod535})]]&le;[[@{powerscore-nomod535}+(@{powerscore-mod535})]] @{psiondefending535}"></button></td>
-                                            <td><input type="text" name="attr_psiondefending-macro535" title="@{repeating_hench5_$X_psiondefending-macro535}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_defending-macro535" title="%{repeating_hench5_$X_defending-macro535}" value="@{psiondefending-macro535}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_powerscore-mod535" title="@{repeating_hench5_$X_powerscore-mod535}" placeholder="#" class="sheet-tiny"></td>
+                                            <td><button type="roll" name="roll_Defending535" title="%{repeating_hench5_$X_Defending535}" value="/roll [[1d20cs[[{@{powerscore-nomod535}+(@{powerscore-mod535})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod535}+(@{powerscore-mod535})+(@{misc-mod}),19}kl1]] @{psiondefending535}"></button></td>
+                                            <td><input type="text" name="attr_psiondefending-macro535" title="@{repeating_hench5_$X_psiondefending-macro535}" class="sheet-track" placeholder="Macro"></td>
+                                            <td><button type="roll" name="roll_defending-macro535" title="%{repeating_hench5_$X_defending-macro535}" value="@{psiondefending-macro535}"></button></td>
                                             <td><input type="text" name="attr_PSP-cost635" title="@{repeating_hench5_$X_PSP-cost635}" placeholder="#" class="sheet-small"/></td>
                                         </tr>
                                     </table>
@@ -19240,34 +19198,34 @@ <h4><b>Defense Modes</b></h4>
                         <div class="sheet-2colrow">
                             <div class="sheet-col">
                                 <h4>Psionic Strength Points</h4>
-                                <table style='width:250px;'>
+                                <table class="sheet-table-white sheet-default-header-first-row sheet-default-header-first-column" style='width:250px;'>
                                     <tr>
-                                        <td class="sheet-default-header" style="width:100px;">Value</td>
-                                        <td class="sheet-default-header" style="width:50px;">Current</td>
-                                        <td class="sheet-default-header" style="width:15px;">/</td>
-                                        <td class="sheet-default-header" style="width:60px;">Maximum</td>
-                                        <td class="sheet-default-header" style="width:25px;">Speed</td>
+                                        <td style="width:100px;">Value</td>
+                                        <td style="width:50px;">Current</td>
+                                        <td style="width:15px;">/</td>
+                                        <td style="width:60px;">Maximum</td>
+                                        <td style="width:25px;">Speed</td>
                                     </tr>
                                     <tr>
-                                        <td class="sheet-default-header" style=" width:100px;">PSP:</td>
+                                        <td>PSP:</td>
                                         <td><input type="number" name="attr_PSP500" title="@{repeating_hench5_$X_PSP500}" class="sheet-short" placeholder="PSP"/></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold; width:15px">/</td>
+                                        <td>/</td>
                                         <td><input type="number" name="attr_PSP500_max" title="@{repeating_hench5_$X_PSP500|max}" class="sheet-short"/></td>
                                     </tr>
                                     <tr>
-                                        <td class="sheet-default-header" style="width:100px;">Temp PSP:</td>
+                                        <td>Temp PSP:</td>
                                         <td><input type="number" name="attr_tempPSP500" title="@{repeating_hench5_$X_tempPSP500}" class="sheet-short" placeholder="Temp"/></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold; width:15px;">/</td>
+                                        <td>/</td>
                                         <td><input type="number" name="attr_tempPSP500_max" title="@{repeating_hench5_$X_tempPSP500|max}" class="sheet-short"/></td>
                                     </tr>
                                     <tr>
-                                        <td class="sheet-default-header" style="width:100px;">Stored PSP:</td>
+                                        <td>Stored PSP:</td>
                                         <td><input type="number" name="attr_storedPSP500" title="@{repeating_hench5_$X_storedPSP500}" class="sheet-short" placeholder="Stored"/></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold; width:15px;">/</td>
+                                        <td>/</td>
                                         <td><input type="number" name="attr_storedPSP500_max" title="@{repeating_hench5_$X_storedPSP500|max}" class="sheet-short"/></td>
                                     </tr>
                                     <tr>
-                                        <td class="sheet-default-header" style="width: 25px;">Speed</td>
+                                        <td>Speed</td>
                                         <td></td>
                                         <td></td>
                                         <td><input type="text" name="attr_psispeed501" title="@{repeating_hench5_$X_psispeed501}" class="sheet-small"></td>
@@ -19276,38 +19234,43 @@ <h4>Psionic Strength Points</h4>
                                 </table>
                             </div>
                             <div class="sheet-col">
-                                <h4><b>Psionic Proficiencies</b></h4>
+                                <h4>Psionic Proficiencies</h4>
                                 <ul>
-                                    <table>
+                                    <table class="sheet-table-white">
                                         <tr>
                                             <td><input type="text" name="attr_psiprofname500" title="@{repeating_hench5_$X_psiprofname500}" placeholder="Name of NWP"></td>
                                             <td><input type="text" name="attr_psiprofstatnum500" title="@{repeating_hench5_$X_psiprofstatnum500}" placeholder="@{}" class="sheet-short"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod500" title="@{repeating_hench5_$X_psiprofmod500}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots500" title="@{repeating_hench5_$X_psiprofslots500}" class="sheet-short" placeholder="#">
-                                                <button type="roll" name="roll_Psiprof500" title="%{repeating_hench5_$X_Psiprof500}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum500})+(@{psiprofmod500})]] @{psiprofname500}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_psiprofmod500" title="@{repeating_hench5_$X_psiprofmod500}" value="0" class="sheet-short"></td>
+                                            <td><input type="number" name="attr_psiprofslots500" title="@{repeating_hench5_$X_psiprofslots500}" class="sheet-short" placeholder="#"></td>
+                                            <td><button type="roll" name="roll_Psiprof500" title="%{repeating_hench5_$X_Psiprof500}" value="&{template:2Echeck} {{checkvs=@{psiprofname500} Check}} {{character=@{henchname55}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psiprofstatnum500})+(@{psiprofmod500})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                         </tr>
                                         <tr>
                                             <td><input type="text" name="attr_psiprofname501" title="@{repeating_hench5_$X_psiprofname501}" placeholder="Name of NWP"></td>
                                             <td><input type="text" name="attr_psiprofstatnum501" title="@{repeating_hench5_$X_psiprofstatnum501}" placeholder="@{}" class="sheet-short"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod501" title="@{repeating_hench5_$X_psiprofmod501}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots501" title="@{repeating_hench5_$X_psiprofslots501}" class="sheet-short" placeholder="#">
-                                                <button type="roll" name="roll_Psiprof501" title="%{repeating_hench5_$X_Psiprof501}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum501})+(@{psiprofmod501})]] @{psiprofname501}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_psiprofmod501" title="@{repeating_hench5_$X_psiprofmod501}" value="0" class="sheet-short"></td>
+                                            <td><input type="number" name="attr_psiprofslots501" title="@{repeating_hench5_$X_psiprofslots501}" class="sheet-short" placeholder="#"></td>
+                                            <td><button type="roll" name="roll_Psiprof501" title="%{repeating_hench5_$X_Psiprof501}" value="&{template:2Echeck} {{checkvs=@{psiprofname501} Check}} {{character=@{henchname55}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psiprofstatnum501})+(@{psiprofmod501})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                         </tr>
                                         <tr>
                                             <td><input type="text" name="attr_psiprofname502" title="@{repeating_hench5_$X_psiprofname502}" placeholder="Name of NWP"></td>
                                             <td><input type="text" name="attr_psiprofstatnum502" title="@{repeating_hench5_$X_psiprofstatnum502}" placeholder="@{}" class="sheet-short"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod502" title="@{repeating_hench5_$X_psiprofmod502}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots502" title="@{repeating_hench5_$X_psiprofslots502}" class="sheet-short" placeholder="#">
-                                                <button type="roll" name="roll_Psiprof502" title="%{repeating_hench5_$X_Psiprof502}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum502})+(@{psiprofmod502})]] @{psiprofname502}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_psiprofmod502" title="@{repeating_hench5_$X_psiprofmod502}" value="0" class="sheet-short"></td>
+                                            <td><input type="number" name="attr_psiprofslots502" title="@{repeating_hench5_$X_psiprofslots502}" class="sheet-short" placeholder="#"></td>
+                                            <td><button type="roll" name="roll_Psiprof502" title="%{repeating_hench5_$X_Psiprof502}" value="&{template:2Echeck} {{checkvs=@{psiprofname502} Check}} {{character=@{henchname55}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psiprofstatnum502})+(@{psiprofmod502})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                         </tr>
                                         <tr>
                                             <td><input type="text" name="attr_psiprofname503" title="@{repeating_hench5_$X_psiprofname503}" placeholder="Name of NWP"></td>
                                             <td><input type="text" name="attr_psiprofstatnum503" title="@{repeating_hench5_$X_psiprofstatnum503}" placeholder="@{}" class="sheet-short"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod503" title="@{repeating_hench5_$X_psiprofmod503}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots503" title="@{repeating_hench5_$X_psiprofslots503}" class="sheet-short" placeholder="#">
-                                                <button type="roll" name="roll_Psiprof503" title="%{repeating_hench5_$X_Psiprof503}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum503})+(@{psiprofmod503})]] @{psiprofname503}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_psiprofmod503" title="@{repeating_hench5_$X_psiprofmod503}" value="0" class="sheet-short"></td>
+                                            <td><input type="number" name="attr_psiprofslots503" title="@{repeating_hench5_$X_psiprofslots503}" class="sheet-short" placeholder="#"></td>
+                                            <td><button type="roll" name="roll_Psiprof503" title="%{repeating_hench5_$X_Psiprof503}" value="&{template:2Echeck} {{checkvs=@{psiprofname503} Check}} {{character=@{henchname55}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psiprofstatnum503})+(@{psiprofmod503})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                         </tr>
                                         <tr>
                                             <td><input type="text" name="attr_psiprofname504" title="@{repeating_hench5_$X_psiprofname504}" placeholder="Name of NWP"></td>
                                             <td><input type="text" name="attr_psiprofstatnum504" title="@{repeating_hench5_$X_psiprofstatnum504}" placeholder="@{}" class="sheet-short"></td>
-                                            <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod504" title="@{repeating_hench5_$X_psiprofmod504}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots504" title="@{repeating_hench5_$X_psiprofslots504}" class="sheet-short" placeholder="#">
-                                                <button type="roll" name="roll_Psiprof504" title="%{repeating_hench5_$X_Psiprof504}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum504})+(@{psiprofmod504})]] @{psiprofname504}"></button></td>
+                                            <td>&plusmn;<input type="text" name="attr_psiprofmod504" title="@{repeating_hench5_$X_psiprofmod504}" value="0" class="sheet-short"></td>
+                                            <td><input type="number" name="attr_psiprofslots504" title="@{repeating_hench5_$X_psiprofslots504}" class="sheet-short" placeholder="#"></td>
+                                            <td><button type="roll" name="roll_Psiprof504" title="%{repeating_hench5_$X_Psiprof504}" value="&{template:2Echeck} {{checkvs=@{psiprofname504} Check}} {{character=@{henchname55}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psiprofstatnum504})+(@{psiprofmod504})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                         </tr>
                                     </table>
                                 </ul>
@@ -19332,76 +19295,76 @@ <h4>Psionics Revised</h4>
                         <br>
                         <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Telepathy Devotions</b></h4>
-                                <table>
+                                <h4>Clairsentient Sciences</h4>
+                                <table class="sheet-default-header-first-row">
                                     <tr>
-                                        <td class="sheet-default-header">Ability Name</td>
-                                        <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                        <td class="sheet-default-header">MAC</td>
-                                        <td class="sheet-default-header">MThAC0</td>
-                                        <td class="sheet-default-header">Macro</td>
-                                        <td class="sheet-default-header">PSP<br>Cost</td>
+                                        <td>Ability Name</td>
+                                        <td>MThAC0<br>Adj.</td>
+                                        <td>MAC</td>
+                                        <td>MThAC0</td>
+                                        <td>Macro</td>
+                                        <td>PSP<br>Cost</td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-telepathy-name700" title="@{repeating_hench5_$X_psionic-telepathy-name700}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj700" title="@{repeating_hench5_$X_mthac0adj700}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac700" title="@{repeating_hench5_$X_mac700}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0700" title="@{repeating_hench5_$X_MThAC0700}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit700" title="%{repeating_hench5_$X_mthac02-hit700}" value="@{henchname55} hits a MAC of [[@{MThAC0700}-(1d20+(@{mthac0adj700})+(@{misc-mod}))]]&le;[[@{mac700}]] using their @{psionic-telepathy-name700}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro700" title="@{repeating_hench5_$X_psionic-macro700}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check700" title="%{repeating_hench5_$X_psionic-macro3-check700}" value="@{psionic-macro700}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost700" title="@{repeating_hench5_$X_PSP-cost700}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-clairsentience-science-name727" title="@{repeating_hench5_$X_psionic-clairsentience-science-name727}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj727" title="@{repeating_hench5_$X_mthac0adj727}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac727" title="@{repeating_hench5_$X_mac727}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0727" title="@{repeating_hench5_$X_MThAC0727}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit727" title="%{repeating_hench5_$X_mthac011-hit727}" value="@{henchname55} hits a MAC of [[@{MThAC0727}-(1d20+(@{mthac0adj727})+(@{misc-mod}))]]&le;[[@{mac727}]] using their @{psionic-clairsentience-science-name727}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro727" title="@{repeating_hench5_$X_psionic-macro727}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check727" title="%{repeating_hench5_$X_psionic-macro12-check727}" value="@{psionic-macro727}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost727" title="@{repeating_hench5_$X_PSP-cost727}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-telepathy-name701" title="@{repeating_hench5_$X_psionic-telepathy-name701}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj701" title="@{repeating_hench5_$X_mthac0adj701}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac701" title="@{repeating_hench5_$X_mac701}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0701" title="@{repeating_hench5_$X_MThAC0701}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit701" title="%{repeating_hench5_$X_mthac02-hit701}" value="@{henchname55} hits a MAC of [[@{MThAC0701}-(1d20+(@{mthac0adj701})+(@{misc-mod}))]]&le;[[@{mac701}]] using their @{psionic-telepathy-name701}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro701" title="@{repeating_hench5_$X_psionic-macro701}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check701" title="%{repeating_hench5_$X_psionic-macro3-check701}" value="@{psionic-macro701}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost701" title="@{repeating_hench5_$X_PSP-cost701}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-clairsentience-science-name728" title="@{repeating_hench5_$X_psionic-clairsentience-science-name728}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj728" title="@{repeating_hench5_$X_mthac0adj728}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac728" title="@{repeating_hench5_$X_mac728}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0728" title="@{repeating_hench5_$X_MThAC0728}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit728" title="%{repeating_hench5_$X_mthac011-hit728}" value="@{henchname55} hits a MAC of [[@{MThAC0728}-(1d20+(@{mthac0adj728})+(@{misc-mod}))]]&le;[[@{mac728}]] using their @{psionic-clairsentience-science-name728}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro728" title="@{repeating_hench5_$X_psionic-macro728}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check728" title="%{repeating_hench5_$X_psionic-macro12-check728}" value="@{psionic-macro728}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost728" title="@{repeating_hench5_$X_PSP-cost728}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-telepathy-name702" title="@{repeating_hench5_$X_psionic-telepathy-name702}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj702" title="@{repeating_hench5_$X_mthac0adj702}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac702" title="@{mrepeating_hench5_$X_ac702}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0702" title="@{repeating_hench5_$X_MThAC0702}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit702" title="%{repeating_hench5_$X_mthac02-hit702}" value="@{henchname55} hits a MAC of [[@{MThAC0702}-(1d20+(@{mthac0adj702})+(@{misc-mod}))]]&le;[[@{mac702}]] using their @{psionic-telepathy-name702}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro702" title="@{repeating_hench5_$X_psionic-macro702}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check702" title="%{repeating_hench5_$X_psionic-macro3-check702}" value="@{psionic-macro702}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost702" title="@{repeating_hench5_$X_PSP-cost702}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-clairsentience-science-name729" title="@{repeating_hench5_$X_psionic-clairsentience-science-name729}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj729" title="@{repeating_hench5_$X_mthac0adj729}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac729" title="@{repeating_hench5_$X_mac729}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0729" title="@{repeating_hench5_$X_MThAC0729}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit729" title="%{repeating_hench5_$X_mthac011-hit729}" value="@{henchname55} hits a MAC of [[@{MThAC0729}-(1d20+(@{mthac0adj729})+(@{misc-mod}))]]&le;[[@{mac729}]] using their @{psionic-clairsentience-science-name729}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro729" title="@{repeating_hench5_$X_psionic-macro729}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check729" title="%{repeating_hench5_$X_psionic-macro12-check729}" value="@{psionic-macro729}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost729" title="@{repeating_hench5_$X_PSP-cost729}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </div>
                             <div class="sheet-col">
-                                <h4><b>Telepathy Sciences</b></h4>
-                                <table>
+                                <h4>Clairsentient Devotions</h4>
+                                <table class="sheet-default-header-first-row">
                                     <tr>
-                                        <td class="sheet-default-header">Ability Name</td>
-                                        <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                        <td class="sheet-default-header">MAC</td>
-                                        <td class="sheet-default-header">MThAC0</td>
-                                        <td class="sheet-default-header">Macro</td>
-                                        <td class="sheet-default-header">PSP<br>Cost</td>
+                                        <td>Ability Name</td>
+                                        <td>MThAC0<br>Adj.</td>
+                                        <td>MAC</td>
+                                        <td>MThAC0</td>
+                                        <td>Macro</td>
+                                        <td>PSP<br>Cost</td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-telepathy-science-name703" title="@{repeating_hench5_$X_psionic-telepathy-science-name703}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj703" title="@{repeating_hench5_$X_mthac0adj703}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac703" title="@{repeating_hench5_$X_mac703}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0703" title="@{repeating_hench5_$X_MThAC0703}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit703" title="%{repeating_hench5_$X_mthac03-hit703}" value="@{henchname55} hits a MAC of [[@{MThAC0703}-(1d20+(@{mthac0adj703})+(@{misc-mod}))]]&le;[[@{mac703}]] using their @{psionic-telepathy-science-name703}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro703" title="@{repeating_hench5_$X_psionic-macro703}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check703" title="%{repeating_hench5_$X_psionic-macro4-check703}" value="@{psionic-macro703}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost703" title="@{repeating_hench5_$X_PSP-cost703}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-clairsentience-name724" title="@{repeating_hench5_$X_psionic-clairsentience-name724}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj724" title="@{repeating_hench5_$X_mthac0adj724}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac724" title="@{repeating_hench5_$X_mac724}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0724" title="@{repeating_hench5_$X_MThAC0724}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit724" title="%{repeating_hench5_$X_mthac010-hit724}" value="@{henchname55} hits a MAC of [[@{MThAC0724}-(1d20+(@{mthac0adj724})+(@{misc-mod}))]]&le;[[@{mac724}]] using their @{psionic-clairsentience-name724}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro724" title="@{repeating_hench5_$X_psionic-macro724}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check724" title="%{repeating_hench5_$X_psionic-macro11-check724}" value="@{psionic-macro724}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost724" title="@{repeating_hench5_$X_PSP-cost724}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-telepathy-science-name704" title="@{repeating_hench5_$X_psionic-telepathy-science-name704}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj704" title="@{repeating_hench5_$X_mthac0adj704}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac704" title="@{repeating_hench5_$X_mac704}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0704" title="@{repeating_hench5_$X_MThAC0704}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit704" title="%{repeating_hench5_$X_mthac03-hit704}" value="@{henchname55} hits a MAC of [[@{MThAC0704}-(1d20+(@{mthac0adj704})+(@{misc-mod}))]]&le;[[@{mac704}]] using their @{psionic-telepathy-science-name704}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro704" title="@{repeating_hench5_$X_psionic-macro704}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check704" title="%{repeating_hench5_$X_psionic-macro4-check704}" value="@{psionic-macro704}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost704" title="@{repeating_hench5_$X_PSP-cost704}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-clairsentience-name725" title="@{repeating_hench5_$X_psionic-clairsentience-name725}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj725" title="@{repeating_hench5_$X_mthac0adj725}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac725" title="@{repeating_hench5_$X_mac725}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0725" title="@{repeating_hench5_$X_MThAC0725}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit725" title="%{repeating_hench5_$X_mthac010-hit725}" value="@{henchname55} hits a MAC of [[@{MThAC0725}-(1d20+(@{mthac0adj725})+(@{misc-mod}))]]&le;[[@{mac725}]] using their @{psionic-clairsentience-name725}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro725" title="@{repeating_hench5_$X_psionic-macro725}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check725" title="%{repeating_hench5_$X_psionic-macro11-check725}" value="@{psionic-macro725}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost725" title="@{repeating_hench5_$X_PSP-cost725}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-telepathy-science-name705" title="@{repeating_hench5_$X_psionic-telepathy-science-name705}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj705" title="@{repeating_hench5_$X_mthac0adj705}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac705" title="@{repeating_hench5_$X_mac705}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0705" title="@{repeating_hench5_$X_MThAC0705}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit705" title="%{repeating_hench5_$X_mthac03-hit705}" value="@{henchname55} hits a MAC of [[@{MThAC0705}-(1d20+(@{mthac0adj705})+(@{misc-mod}))]]&le;[[@{mac705}]] using their @{psionic-telepathy-science-name705}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro705" title="@{repeating_hench5_$X_psionic-macro705}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check705" title="%{repeating_hench5_$X_psionic-macro4-check705}" value="@{psionic-macro705}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost705" title="@{repeating_hench5_$X_PSP-cost705}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-clairsentience-name726" title="@{repeating_hench5_$X_psionic-clairsentience-name726}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj726" title="@{repeating_hench5_$X_mthac0adj726}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac726" title="@{repeating_hench5_$X_mac726}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0726" title="@{repeating_hench5_$X_MThAC0726}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit726" title="%{repeating_hench5_$X_mthac010-hit726}" value="@{henchname55} hits a MAC of [[@{MThAC0726}-(1d20+(@{mthac0adj726})+(@{misc-mod}))]]&le;[[@{mac726}]] using their @{psionic-clairsentience-name726}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro726" title="@{repeating_hench5_$X_psionic-macro726}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check726" title="%{repeating_hench5_$X_psionic-macro11-check726}" value="@{psionic-macro726}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost726" title="@{repeating_hench5_$X_PSP-cost726}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </div>
@@ -19409,15 +19372,52 @@ <h4><b>Telepathy Sciences</b></h4>
                         <br>
                         <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Psychokinesis Devotions</b></h4>
-                                <table>
+                                <h4>Psychokinectic Sciences</h4>
+                                <table class="sheet-default-header-first-row">
+                                    <tr>
+                                        <td>Ability Name</td>
+                                        <td>MThAC0<br>Adj.</td>
+                                        <td>MAC</td>
+                                        <td>MThAC0</td>
+                                        <td>Macro</td>
+                                        <td>PSP<br>Cost</td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name="attr_psionic-psychokinesis-science-name709" title="@{repeating_hench5_$X_psionic-psychokinesis-science-name709}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj709" title="@{repeating_hench5_$X_mthac0adj709}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac709" title="@{repeating_hench5_$X_mac709}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0709" title="@{repeating_hench5_$X_MThAC0709}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit709" title="%{repeating_hench5_$X_mthac05-hit709}" value="@{henchname55} hits a MAC of [[@{MThAC0709}-(1d20+(@{mthac0adj709})+(@{misc-mod}))]]&le;[[@{mac709}]] using their @{psionic-psychokinesis-science-name709}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro709" title="@{repeating_hench5_$X_psionic-macro709}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check709" title="%{repeating_hench5_$X_psionic-macro6-check709}" value="@{psionic-macro709}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost709" title="@{repeating_hench5_$X_PSP-cost709}" placeholder="#" class="sheet-small"/></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name="attr_psionic-psychokinesis-science-name710" title="@{repeating_hench5_$X_psionic-psychokinesis-science-name710}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj710" title="@{repeating_hench5_$X_mthac0adj710}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac710" title="@{repeating_hench5_$X_mac710}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0710" title="@{repeating_hench5_$X_MThAC0710}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit710" title="%{repeating_hench5_$X_mthac05-hit710}" value="@{henchname55} hits a MAC of [[@{MThAC0710}-(1d20+(@{mthac0adj710})+(@{misc-mod}))]]&le;[[@{mac710}]] using their @{psionic-psychokinesis-science-name710}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro710" title="@{repeating_hench5_$X_psionic-macro710}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check710" title="%{repeating_hench5_$X_psionic-macro6-check710}" value="@{psionic-macro710}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost710" title="@{repeating_hench5_$X_PSP-cost710}" placeholder="#" class="sheet-small"/></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input type="text" name="attr_psionic-psychokinesis-science-name711" title="@{repeating_hench5_$X_psionic-psychokinesis-science-name711}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj711" title="@{repeating_hench5_$X_mthac0adj711}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac711" title="@{repeating_hench5_$X_mac711}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0711" title="@{repeating_hench5_$X_MThAC0711}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit711" title="%{repeating_hench5_$X_mthac05-hit711}" value="@{henchname55} hits a MAC of [[@{MThAC0711}-(1d20+(@{mthac0adj711})+(@{misc-mod}))]]&le;[[@{mac711}]] using their @{psionic-psychokinesis-science-name711}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro711" title="@{repeating_hench5_$X_psionic-macro711}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check711" title="%{repeating_hench5_$X_psionic-macro6-check711}" value="@{psionic-macro711}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost711" title="@{repeating_hench5_$X_PSP-cost711}" placeholder="#" class="sheet-small"/></td>
+                                    </tr>
+                                </table>
+                            </div>
+                            <div class="sheet-col">
+                                <h4>Psychokinectic Devotions</h4>
+                                <table class="sheet-default-header-first-row">
                                     <tr>
-                                        <td class="sheet-default-header">Ability Name</td>
-                                        <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                        <td class="sheet-default-header">MAC</td>
-                                        <td class="sheet-default-header">MThAC0</td>
-                                        <td class="sheet-default-header">Macro</td>
-                                        <td class="sheet-default-header">PSP<br>Cost</td>
+                                        <td>Ability Name</td>
+                                        <td>MThAC0<br>Adj.</td>
+                                        <td>MAC</td>
+                                        <td>MThAC0</td>
+                                        <td>Macro</td>
+                                        <td>PSP<br>Cost</td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psionic-psychokinesis-name706" title="@{repeating_hench5_$X_psionic-psychokinesis-name706}" class="sheet-midtext" placeholder="Ability Name"/></td>
@@ -19445,93 +19445,96 @@ <h4><b>Psychokinesis Devotions</b></h4>
                                     </tr>
                                 </table>
                             </div>
+                        </div>
+                        <br>
+                        <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Psychokinesis Sciences</b></h4>
-                                <table>
+                                <h4>Psychometabolic Sciences</h4>
+                                <table class="sheet-default-header-first-row">
                                     <tr>
-                                        <td class="sheet-default-header">Ability Name</td>
-                                        <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                        <td class="sheet-default-header">MAC</td>
-                                        <td class="sheet-default-header">MThAC0</td>
-                                        <td class="sheet-default-header">Macro</td>
-                                        <td class="sheet-default-header">PSP<br>Cost</td>
+                                        <td>Ability Name</td>
+                                        <td>MThAC0<br>Adj.</td>
+                                        <td>MAC</td>
+                                        <td>MThAC0</td>
+                                        <td>Macro</td>
+                                        <td>PSP<br>Cost</td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-psychokinesis-science-name709" title="@{repeating_hench5_$X_psionic-psychokinesis-science-name709}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj709" title="@{repeating_hench5_$X_mthac0adj709}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac709" title="@{repeating_hench5_$X_mac709}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0709" title="@{repeating_hench5_$X_MThAC0709}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit709" title="%{repeating_hench5_$X_mthac05-hit709}" value="@{henchname55} hits a MAC of [[@{MThAC0709}-(1d20+(@{mthac0adj709})+(@{misc-mod}))]]&le;[[@{mac709}]] using their @{psionic-psychokinesis-science-name709}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro709" title="@{repeating_hench5_$X_psionic-macro709}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check709" title="%{repeating_hench5_$X_psionic-macro6-check709}" value="@{psionic-macro709}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost709" title="@{repeating_hench5_$X_PSP-cost709}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-psychometabolism-science-name721" title="@{repeating_hench5_$X_psionic-psychometabolism-science-name721}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj721" title="@{repeating_hench5_$X_mthac0adj721}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac721" title="@{repeating_hench5_$X_mac721}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0721" title="@{repeating_hench5_$X_MThAC0721}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit721" title="%{repeating_hench5_$X_mthac09-hit721}" value="@{henchname55} hits a MAC of [[@{MThAC0721}-(1d20+(@{mthac0adj721})+(@{misc-mod}))]]&le;[[@{mac721}]] using their @{psionic-psychometabolism-science-name721}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro721" title="@{repeating_hench5_$X_psionic-macro721}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check721" title="%{repeating_hench5_$X_psionic-macro10-check721}" value="@{psionic-macro721}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost721" title="@{repeating_hench5_$X_PSP-cost721}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-psychokinesis-science-name710" title="@{repeating_hench5_$X_psionic-psychokinesis-science-name710}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj710" title="@{repeating_hench5_$X_mthac0adj710}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac710" title="@{repeating_hench5_$X_mac710}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0710" title="@{repeating_hench5_$X_MThAC0710}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit710" title="%{repeating_hench5_$X_mthac05-hit710}" value="@{henchname55} hits a MAC of [[@{MThAC0710}-(1d20+(@{mthac0adj710})+(@{misc-mod}))]]&le;[[@{mac710}]] using their @{psionic-psychokinesis-science-name710}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro710" title="@{repeating_hench5_$X_psionic-macro710}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check710" title="%{repeating_hench5_$X_psionic-macro6-check710}" value="@{psionic-macro710}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost710" title="@{repeating_hench5_$X_PSP-cost710}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-psychometabolism-science-name722" title="@{repeating_hench5_$X_psionic-psychometabolism-science-name722}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj722" title="@{repeating_hench5_$X_mthac0adj722}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac722" title="@{repeating_hench5_$X_mac722}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0722" title="@{repeating_hench5_$X_MThAC0722}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit722" title="%{repeating_hench5_$X_mthac09-hit722}" value="@{henchname55} hits a MAC of [[@{MThAC0722}-(1d20+(@{mthac0adj722})+(@{misc-mod}))]]&le;[[@{mac722}]] using their @{psionic-psychometabolism-science-name722}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro722" title="@{repeating_hench5_$X_psionic-macro722}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check722" title="%{repeating_hench5_$X_psionic-macro10-check722}" value="@{psionic-macro722}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost722" title="@{repeating_hench5_$X_PSP-cost722}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-psychokinesis-science-name711" title="@{repeating_hench5_$X_psionic-psychokinesis-science-name711}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj711" title="@{repeating_hench5_$X_mthac0adj711}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac711" title="@{repeating_hench5_$X_mac711}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0711" title="@{repeating_hench5_$X_MThAC0711}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit711" title="%{repeating_hench5_$X_mthac05-hit711}" value="@{henchname55} hits a MAC of [[@{MThAC0711}-(1d20+(@{mthac0adj711})+(@{misc-mod}))]]&le;[[@{mac711}]] using their @{psionic-psychokinesis-science-name711}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro711" title="@{repeating_hench5_$X_psionic-macro711}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check711" title="%{repeating_hench5_$X_psionic-macro6-check711}" value="@{psionic-macro711}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost711" title="@{repeating_hench5_$X_PSP-cost711}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-psychometabolism-science-name723" title="@{repeating_hench5_$X_psionic-psychometabolism-science-name723}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj723" title="@{repeating_hench5_$X_mthac0adj723}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac723" title="@{repeating_hench5_$X_mac723}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0723" title="@{repeating_hench5_$X_MThAC0723}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit723" title="%{repeating_hench5_$X_mthac09-hit723}" value="@{henchname55} hits a MAC of [[@{MThAC0723}-(1d20+(@{mthac0adj723})+(@{misc-mod}))]]&le;[[@{mac723}]] using their @{psionic-psychometabolism-science-name723}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro723" title="@{repeating_hench5_$X_psionic-macro723}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check723" title="%{repeating_hench5_$X_psionic-macro10-check723}" value="@{psionic-macro723}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost723" title="@{repeating_hench5_$X_PSP-cost723}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </div>
-                        </div>
-                        <br>
-                        <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Psychoportive Devotions</b></h4>
-                                <table>
+                                <h4>Psychometabolic Devotions</h4>
+                                <table class="sheet-default-header-first-row">
                                     <tr>
-                                        <td class="sheet-default-header">Ability Name</td>
-                                        <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                        <td class="sheet-default-header">MAC</td>
-                                        <td class="sheet-default-header">MThAC0</td>
-                                        <td class="sheet-default-header">Macro</td>
-                                        <td class="sheet-default-header">PSP<br>Cost</td>
+                                        <td>Ability Name</td>
+                                        <td>MThAC0<br>Adj.</td>
+                                        <td>MAC</td>
+                                        <td>MThAC0</td>
+                                        <td>Macro</td>
+                                        <td>PSP<br>Cost</td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-psychoportation-name712" title="@{repeating_hench5_$X_psionic-psychoportation-name712}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj712" title="@{repeating_hench5_$X_mthac0adj712}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac712" title="@{repeating_hench5_$X_mac712}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0712" title="@{repeating_hench5_$X_MThAC0712}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit712" title="%{repeating_hench5_$X_mthac06-hit712}" value="@{henchname55} hits a MAC of [[@{MThAC0712}-(1d20+(@{mthac0adj712})+(@{misc-mod}))]]&le;[[@{mac712}]] using their @{psionic-psychoportation-name712}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro712" title="@{repeating_hench5_$X_psionic-macro712}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check712" title="%{repeating_hench5_$X_psionic-macro7-check712}" value="@{psionic-macro712}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost712" title="@{repeating_hench5_$X_PSP-cost712}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-psychometabolism-name718" title="@{repeating_hench5_$X_psionic-psychometabolism-name718}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj718" title="@{repeating_hench5_$X_mthac0adj718}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac718" title="@{repeating_hench5_$X_mac718}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0718" title="@{repeating_hench5_$X_MThAC0718}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit718" title="%{repeating_hench5_$X_mthac08-hit718}" value="@{henchname55} hits a MAC of [[@{MThAC0718}-(1d20+(@{mthac0adj718})+(@{misc-mod}))]]&le;[[@{mac718}]] using their @{psionic-psychometabolism-name718}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro718" title="@{repeating_hench5_$X_psionic-macro718}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check718" title="%{repeating_hench5_$X_psionic-macro9-check718}" value="@{psionic-macro718}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost718" title="@{repeating_hench5_$X_PSP-cost718}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-psychoportation-name713" title="@{repeating_hench5_$X_psionic-psychoportation-name713}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj713" title="@{repeating_hench5_$X_mthac0adj713}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac713" title="@{repeating_hench5_$X_mac713}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0713" title="@{repeating_hench5_$X_MThAC0713}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit713" title="%{repeating_hench5_$X_mthac06-hit713}" value="@{henchname55} hits a MAC of [[@{MThAC0713}-(1d20+(@{mthac0adj713})+(@{misc-mod}))]]&le;[[@{mac713}]] using their @{psionic-psychoportation-name713}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro713" title="@{repeating_hench5_$X_psionic-macro713}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check713" title="%{repeating_hench5_$X_psionic-macro7-check713}" value="@{psionic-macro713}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost713" title="@{repeating_hench5_$X_PSP-cost713}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-psychometabolism-name719" title="@{repeating_hench5_$X_psionic-psychometabolism-name719}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj719" title="@{repeating_hench5_$X_mthac0adj719}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac719" title="@{repeating_hench5_$X_mac719}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0719" title="@{repeating_hench5_$X_MThAC0719}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit719" title="%{repeating_hench5_$X_mthac08-hit719}" value="@{henchname55} hits a MAC of [[@{MThAC0719}-(1d20+(@{mthac0adj719})+(@{misc-mod}))]]&le;[[@{mac719}]] using their @{psionic-psychometabolism-name719}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro719" title="@{repeating_hench5_$X_psionic-macro719}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check719" title="%{repeating_hench5_$X_psionic-macro9-check719}" value="@{psionic-macro719}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost719" title="@{repeating_hench5_$X_PSP-cost719}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-psychoportation-name714" title="@{repeating_hench5_$X_psionic-psychoportation-name714}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj714" title="@{repeating_hench5_$X_mthac0adj714}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac714" title="@{repeating_hench5_$X_mac714}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0714" title="@{repeating_hench5_$X_MThAC0714}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit714" title="%{repeating_hench5_$X_mthac06-hit714}" value="@{henchname55} hits a MAC of [[@{MThAC0714}-(1d20+(@{mthac0adj714})+(@{misc-mod}))]]&le;[[@{mac714}]] using their @{psionic-psychoportation-name714}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro714" title="@{repeating_hench5_$X_psionic-macro714}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check714" title="%{repeating_hench5_$X_psionic-macro7-check714}" value="@{psionic-macro714}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost714" title="@{repeating_hench5_$X_PSP-cost714}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-psychometabolism-name720" title="@{repeating_hench5_$X_psionic-psychometabolism-name720}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj720" title="@{repeating_hench5_$X_mthac0adj720}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac720" title="@{repeating_hench5_$X_mac720}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0720" title="@{repeating_hench5_$X_MThAC0720}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit720" title="%{repeating_hench5_$X_mthac08-hit720}" value="@{henchname55} hits a MAC of [[@{MThAC0720}-(1d20+(@{mthac0adj720})+(@{misc-mod}))]]&le;[[@{mac720}]] using their @{psionic-psychometabolism-name720}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro720" title="@{repeating_hench5_$X_psionic-macro720}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check720" title="%{repeating_hench5_$X_psionic-macro9-check720}" value="@{psionic-macro720}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost720" title="@{repeating_hench5_$X_PSP-cost720}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </div>
+                        </div>
+                        <br>
+                        <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Psychoportive Sciences</b></h4>
-                                <table>
+                                <h4>Psychoportive Sciences</h4>
+                                <table class="sheet-default-header-first-row">
                                     <tr>
-                                        <td class="sheet-default-header">Ability Name</td>
-                                        <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                        <td class="sheet-default-header">MAC</td>
-                                        <td class="sheet-default-header">MThAC0</td>
-                                        <td class="sheet-default-header">Macro</td>
-                                        <td class="sheet-default-header">PSP<br>Cost</td>
+                                        <td>Ability Name</td>
+                                        <td>MThAC0<br>Adj.</td>
+                                        <td>MAC</td>
+                                        <td>MThAC0</td>
+                                        <td>Macro</td>
+                                        <td>PSP<br>Cost</td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psionic-psychoportation-science-name715" title="@{repeating_hench5_$X_psionic-psychoportation-science-name715}" class="sheet-midtext" placeholder="Ability Name"/></td>
@@ -19559,80 +19562,40 @@ <h4><b>Psychoportive Sciences</b></h4>
                                     </tr>
                                 </table>
                             </div>
-                        </div>
-                        <br>
-                        <div class="sheet-2colrow">
-                            <div class="sheet-col">
-                                <h4><b>Psychometabolism Devotions</b></h4>
-                                <table>
-                                    <tr>
-                                        <td class="sheet-default-header">Ability Name</td>
-                                        <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                        <td class="sheet-default-header">MAC</td>
-                                        <td class="sheet-default-header">MThAC0</td>
-                                        <td class="sheet-default-header">Macro</td>
-                                        <td class="sheet-default-header">PSP<br>Cost</td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionic-psychometabolism-name718" title="@{repeating_hench5_$X_psionic-psychometabolism-name718}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj718" title="@{repeating_hench5_$X_mthac0adj718}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac718" title="@{repeating_hench5_$X_mac718}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0718" title="@{repeating_hench5_$X_MThAC0718}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit718" title="%{repeating_hench5_$X_mthac08-hit718}" value="@{henchname55} hits a MAC of [[@{MThAC0718}-(1d20+(@{mthac0adj718})+(@{misc-mod}))]]&le;[[@{mac718}]] using their @{psionic-psychometabolism-name718}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro718" title="@{repeating_hench5_$X_psionic-macro718}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check718" title="%{repeating_hench5_$X_psionic-macro9-check718}" value="@{psionic-macro718}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost718" title="@{repeating_hench5_$X_PSP-cost718}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionic-psychometabolism-name719" title="@{repeating_hench5_$X_psionic-psychometabolism-name719}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj719" title="@{repeating_hench5_$X_mthac0adj719}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac719" title="@{repeating_hench5_$X_mac719}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0719" title="@{repeating_hench5_$X_MThAC0719}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit719" title="%{repeating_hench5_$X_mthac08-hit719}" value="@{henchname55} hits a MAC of [[@{MThAC0719}-(1d20+(@{mthac0adj719})+(@{misc-mod}))]]&le;[[@{mac719}]] using their @{psionic-psychometabolism-name719}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro719" title="@{repeating_hench5_$X_psionic-macro719}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check719" title="%{repeating_hench5_$X_psionic-macro9-check719}" value="@{psionic-macro719}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost719" title="@{repeating_hench5_$X_PSP-cost719}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionic-psychometabolism-name720" title="@{repeating_hench5_$X_psionic-psychometabolism-name720}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj720" title="@{repeating_hench5_$X_mthac0adj720}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac720" title="@{repeating_hench5_$X_mac720}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0720" title="@{repeating_hench5_$X_MThAC0720}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit720" title="%{repeating_hench5_$X_mthac08-hit720}" value="@{henchname55} hits a MAC of [[@{MThAC0720}-(1d20+(@{mthac0adj720})+(@{misc-mod}))]]&le;[[@{mac720}]] using their @{psionic-psychometabolism-name720}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro720" title="@{repeating_hench5_$X_psionic-macro720}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check720" title="%{repeating_hench5_$X_psionic-macro9-check720}" value="@{psionic-macro720}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost720" title="@{repeating_hench5_$X_PSP-cost720}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                </table>
-                            </div>
                             <div class="sheet-col">
-                                <h4><b>Psychometabolism Sciences</b></h4>
-                                <table>
+                                <h4>Psychoportive Devotions</h4>
+                                <table class="sheet-default-header-first-row">
                                     <tr>
-                                        <td class="sheet-default-header">Ability Name</td>
-                                        <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                        <td class="sheet-default-header">MAC</td>
-                                        <td class="sheet-default-header">MThAC0</td>
-                                        <td class="sheet-default-header">Macro</td>
-                                        <td class="sheet-default-header">PSP<br>Cost</td>
+                                        <td>Ability Name</td>
+                                        <td>MThAC0<br>Adj.</td>
+                                        <td>MAC</td>
+                                        <td>MThAC0</td>
+                                        <td>Macro</td>
+                                        <td>PSP<br>Cost</td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-psychometabolism-science-name721" title="@{repeating_hench5_$X_psionic-psychometabolism-science-name721}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj721" title="@{repeating_hench5_$X_mthac0adj721}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac721" title="@{repeating_hench5_$X_mac721}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0721" title="@{repeating_hench5_$X_MThAC0721}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit721" title="%{repeating_hench5_$X_mthac09-hit721}" value="@{henchname55} hits a MAC of [[@{MThAC0721}-(1d20+(@{mthac0adj721})+(@{misc-mod}))]]&le;[[@{mac721}]] using their @{psionic-psychometabolism-science-name721}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro721" title="@{repeating_hench5_$X_psionic-macro721}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check721" title="%{repeating_hench5_$X_psionic-macro10-check721}" value="@{psionic-macro721}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost721" title="@{repeating_hench5_$X_PSP-cost721}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-psychoportation-name712" title="@{repeating_hench5_$X_psionic-psychoportation-name712}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj712" title="@{repeating_hench5_$X_mthac0adj712}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac712" title="@{repeating_hench5_$X_mac712}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0712" title="@{repeating_hench5_$X_MThAC0712}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit712" title="%{repeating_hench5_$X_mthac06-hit712}" value="@{henchname55} hits a MAC of [[@{MThAC0712}-(1d20+(@{mthac0adj712})+(@{misc-mod}))]]&le;[[@{mac712}]] using their @{psionic-psychoportation-name712}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro712" title="@{repeating_hench5_$X_psionic-macro712}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check712" title="%{repeating_hench5_$X_psionic-macro7-check712}" value="@{psionic-macro712}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost712" title="@{repeating_hench5_$X_PSP-cost712}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-psychometabolism-science-name722" title="@{repeating_hench5_$X_psionic-psychometabolism-science-name722}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj722" title="@{repeating_hench5_$X_mthac0adj722}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac722" title="@{repeating_hench5_$X_mac722}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0722" title="@{repeating_hench5_$X_MThAC0722}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit722" title="%{repeating_hench5_$X_mthac09-hit722}" value="@{henchname55} hits a MAC of [[@{MThAC0722}-(1d20+(@{mthac0adj722})+(@{misc-mod}))]]&le;[[@{mac722}]] using their @{psionic-psychometabolism-science-name722}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro722" title="@{repeating_hench5_$X_psionic-macro722}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check722" title="%{repeating_hench5_$X_psionic-macro10-check722}" value="@{psionic-macro722}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost722" title="@{repeating_hench5_$X_PSP-cost722}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-psychoportation-name713" title="@{repeating_hench5_$X_psionic-psychoportation-name713}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj713" title="@{repeating_hench5_$X_mthac0adj713}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac713" title="@{repeating_hench5_$X_mac713}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0713" title="@{repeating_hench5_$X_MThAC0713}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit713" title="%{repeating_hench5_$X_mthac06-hit713}" value="@{henchname55} hits a MAC of [[@{MThAC0713}-(1d20+(@{mthac0adj713})+(@{misc-mod}))]]&le;[[@{mac713}]] using their @{psionic-psychoportation-name713}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro713" title="@{repeating_hench5_$X_psionic-macro713}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check713" title="%{repeating_hench5_$X_psionic-macro7-check713}" value="@{psionic-macro713}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost713" title="@{repeating_hench5_$X_PSP-cost713}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-psychometabolism-science-name723" title="@{repeating_hench5_$X_psionic-psychometabolism-science-name723}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj723" title="@{repeating_hench5_$X_mthac0adj723}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac723" title="@{repeating_hench5_$X_mac723}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0723" title="@{repeating_hench5_$X_MThAC0723}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit723" title="%{repeating_hench5_$X_mthac09-hit723}" value="@{henchname55} hits a MAC of [[@{MThAC0723}-(1d20+(@{mthac0adj723})+(@{misc-mod}))]]&le;[[@{mac723}]] using their @{psionic-psychometabolism-science-name723}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro723" title="@{repeating_hench5_$X_psionic-macro723}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check723" title="%{repeating_hench5_$X_psionic-macro10-check723}" value="@{psionic-macro723}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost723" title="@{repeating_hench5_$X_PSP-cost723}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-psychoportation-name714" title="@{repeating_hench5_$X_psionic-psychoportation-name714}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj714" title="@{repeating_hench5_$X_mthac0adj714}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac714" title="@{repeating_hench5_$X_mac714}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0714" title="@{repeating_hench5_$X_MThAC0714}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit714" title="%{repeating_hench5_$X_mthac06-hit714}" value="@{henchname55} hits a MAC of [[@{MThAC0714}-(1d20+(@{mthac0adj714})+(@{misc-mod}))]]&le;[[@{mac714}]] using their @{psionic-psychoportation-name714}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro714" title="@{repeating_hench5_$X_psionic-macro714}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check714" title="%{repeating_hench5_$X_psionic-macro7-check714}" value="@{psionic-macro714}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost714" title="@{repeating_hench5_$X_PSP-cost714}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </div>
@@ -19640,91 +19603,91 @@ <h4><b>Psychometabolism Sciences</b></h4>
                         <br>
                         <div class="sheet-2colrow">
                             <div class="sheet-col">
-                                <h4><b>Clairsentient Devotions</b></h4>
-                                <table>
+                                <h4>Telepathic Sciences</h4>
+                                <table class="sheet-default-header-first-row">
                                     <tr>
-                                        <td class="sheet-default-header">Ability Name</td>
-                                        <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                        <td class="sheet-default-header">MAC</td>
-                                        <td class="sheet-default-header">MThAC0</td>
-                                        <td class="sheet-default-header">Macro</td>
-                                        <td class="sheet-default-header">PSP<br>Cost</td>
+                                        <td>Ability Name</td>
+                                        <td>MThAC0<br>Adj.</td>
+                                        <td>MAC</td>
+                                        <td>MThAC0</td>
+                                        <td>Macro</td>
+                                        <td>PSP<br>Cost</td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-clairsentience-name724" title="@{repeating_hench5_$X_psionic-clairsentience-name724}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj724" title="@{repeating_hench5_$X_mthac0adj724}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac724" title="@{repeating_hench5_$X_mac724}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0724" title="@{repeating_hench5_$X_MThAC0724}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit724" title="%{repeating_hench5_$X_mthac010-hit724}" value="@{henchname55} hits a MAC of [[@{MThAC0724}-(1d20+(@{mthac0adj724})+(@{misc-mod}))]]&le;[[@{mac724}]] using their @{psionic-clairsentience-name724}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro724" title="@{repeating_hench5_$X_psionic-macro724}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check724" title="%{repeating_hench5_$X_psionic-macro11-check724}" value="@{psionic-macro724}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost724" title="@{repeating_hench5_$X_PSP-cost724}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-telepathy-science-name703" title="@{repeating_hench5_$X_psionic-telepathy-science-name703}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj703" title="@{repeating_hench5_$X_mthac0adj703}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac703" title="@{repeating_hench5_$X_mac703}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0703" title="@{repeating_hench5_$X_MThAC0703}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit703" title="%{repeating_hench5_$X_mthac03-hit703}" value="@{henchname55} hits a MAC of [[@{MThAC0703}-(1d20+(@{mthac0adj703})+(@{misc-mod}))]]&le;[[@{mac703}]] using their @{psionic-telepathy-science-name703}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro703" title="@{repeating_hench5_$X_psionic-macro703}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check703" title="%{repeating_hench5_$X_psionic-macro4-check703}" value="@{psionic-macro703}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost703" title="@{repeating_hench5_$X_PSP-cost703}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-clairsentience-name725" title="@{repeating_hench5_$X_psionic-clairsentience-name725}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj725" title="@{repeating_hench5_$X_mthac0adj725}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac725" title="@{repeating_hench5_$X_mac725}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0725" title="@{repeating_hench5_$X_MThAC0725}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit725" title="%{repeating_hench5_$X_mthac010-hit725}" value="@{henchname55} hits a MAC of [[@{MThAC0725}-(1d20+(@{mthac0adj725})+(@{misc-mod}))]]&le;[[@{mac725}]] using their @{psionic-clairsentience-name725}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro725" title="@{repeating_hench5_$X_psionic-macro725}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check725" title="%{repeating_hench5_$X_psionic-macro11-check725}" value="@{psionic-macro725}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost725" title="@{repeating_hench5_$X_PSP-cost725}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-telepathy-science-name704" title="@{repeating_hench5_$X_psionic-telepathy-science-name704}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj704" title="@{repeating_hench5_$X_mthac0adj704}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac704" title="@{repeating_hench5_$X_mac704}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0704" title="@{repeating_hench5_$X_MThAC0704}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit704" title="%{repeating_hench5_$X_mthac03-hit704}" value="@{henchname55} hits a MAC of [[@{MThAC0704}-(1d20+(@{mthac0adj704})+(@{misc-mod}))]]&le;[[@{mac704}]] using their @{psionic-telepathy-science-name704}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro704" title="@{repeating_hench5_$X_psionic-macro704}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check704" title="%{repeating_hench5_$X_psionic-macro4-check704}" value="@{psionic-macro704}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost704" title="@{repeating_hench5_$X_PSP-cost704}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-clairsentience-name726" title="@{repeating_hench5_$X_psionic-clairsentience-name726}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj726" title="@{repeating_hench5_$X_mthac0adj726}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac726" title="@{repeating_hench5_$X_mac726}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0726" title="@{repeating_hench5_$X_MThAC0726}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit726" title="%@{repeating_hench5_$X_mthac010-hit726}" value="@{henchname55} hits a MAC of [[@{MThAC0726}-(1d20+(@{mthac0adj726})+(@{misc-mod}))]]&le;[[@{mac726}]] using their @{psionic-clairsentience-name726}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro726" title="@{repeating_hench5_$X_psionic-macro726}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check726" title="%{repeating_hench5_$X_psionic-macro11-check726}" value="@{psionic-macro726}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost726" title="@{repeating_hench5_$X_PSP-cost726}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-telepathy-science-name705" title="@{repeating_hench5_$X_psionic-telepathy-science-name705}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj705" title="@{repeating_hench5_$X_mthac0adj705}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac705" title="@{repeating_hench5_$X_mac705}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0705" title="@{repeating_hench5_$X_MThAC0705}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit705" title="%{repeating_hench5_$X_mthac03-hit705}" value="@{henchname55} hits a MAC of [[@{MThAC0705}-(1d20+(@{mthac0adj705})+(@{misc-mod}))]]&le;[[@{mac705}]] using their @{psionic-telepathy-science-name705}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro705" title="@{repeating_hench5_$X_psionic-macro705}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check705" title="%{repeating_hench5_$X_psionic-macro4-check705}" value="@{psionic-macro705}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost705" title="@{repeating_hench5_$X_PSP-cost705}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </div>
                             <div class="sheet-col">
-                                <h4><b>Clairsentient Sciences</b></h4>
-                                <table>
+                                <h4>Telepathic Devotions</h4>
+                                <table class="sheet-default-header-first-row">
                                     <tr>
-                                        <td class="sheet-default-header">Ability Name</td>
-                                        <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                        <td class="sheet-default-header">MAC</td>
-                                        <td class="sheet-default-header">MThAC0</td>
-                                        <td class="sheet-default-header">Macro</td>
-                                        <td class="sheet-default-header">PSP<br>Cost</td>
+                                        <td>Ability Name</td>
+                                        <td>MThAC0<br>Adj.</td>
+                                        <td>MAC</td>
+                                        <td>MThAC0</td>
+                                        <td>Macro</td>
+                                        <td>PSP<br>Cost</td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-clairsentience-science-name727" title="@{repeating_hench5_$X_psionic-clairsentience-science-name727}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj727" title="@{repeating_hench5_$X_mthac0adj727}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac727" title="@{repeating_hench5_$X_mac727}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0727" title="@{repeating_hench5_$X_MThAC0727}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit727" title="%{repeating_hench5_$X_mthac011-hit727}" value="@{henchname55} hits a MAC of [[@{MThAC0727}-(1d20+(@{mthac0adj727})+(@{misc-mod}))]]&le;[[@{mac727}]] using their @{psionic-clairsentience-science-name727}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro727" title="@{repeating_hench5_$X_psionic-macro727}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check727" title="%{repeating_hench5_$X_psionic-macro12-check727}" value="@{psionic-macro727}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost727" title="@{repeating_hench5_$X_PSP-cost727}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-telepathy-name700" title="@{repeating_hench5_$X_psionic-telepathy-name700}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj700" title="@{repeating_hench5_$X_mthac0adj700}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac700" title="@{repeating_hench5_$X_mac700}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0700" title="@{repeating_hench5_$X_MThAC0700}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit700" title="%{repeating_hench5_$X_mthac02-hit700}" value="@{henchname55} hits a MAC of [[@{MThAC0700}-(1d20+(@{mthac0adj700})+(@{misc-mod}))]]&le;[[@{mac700}]] using their @{psionic-telepathy-name700}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro700" title="@{repeating_hench5_$X_psionic-macro700}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check700" title="%{repeating_hench5_$X_psionic-macro3-check700}" value="@{psionic-macro700}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost700" title="@{repeating_hench5_$X_PSP-cost700}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-clairsentience-science-name728" title="@{repeating_hench5_$X_psionic-clairsentience-science-name728}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj728" title="@{repeating_hench5_$X_mthac0adj728}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac728" title="@{repeating_hench5_$X_mac728}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0728" title="@{repeating_hench5_$X_MThAC0728}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit728" title="%{repeating_hench5_$X_mthac011-hit728}" value="@{henchname55} hits a MAC of [[@{MThAC0728}-(1d20+(@{mthac0adj728})+(@{misc-mod}))]]&le;[[@{mac728}]] using their @{psionic-clairsentience-science-name728}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro728" title="@{repeating_hench5_$X_psionic-macro728}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check728" title="%{repeating_hench5_$X_psionic-macro12-check728}" value="@{psionic-macro728}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost728" title="@{repeating_hench5_$X_PSP-cost728}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-telepathy-name701" title="@{repeating_hench5_$X_psionic-telepathy-name701}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj701" title="@{repeating_hench5_$X_mthac0adj701}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac701" title="@{repeating_hench5_$X_mac701}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0701" title="@{repeating_hench5_$X_MThAC0701}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit701" title="%{repeating_hench5_$X_mthac02-hit701}" value="@{henchname55} hits a MAC of [[@{MThAC0701}-(1d20+(@{mthac0adj701})+(@{misc-mod}))]]&le;[[@{mac701}]] using their @{psionic-telepathy-name701}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro701" title="@{repeating_hench5_$X_psionic-macro701}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check701" title="%{repeating_hench5_$X_psionic-macro3-check701}" value="@{psionic-macro701}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost701" title="@{repeating_hench5_$X_PSP-cost701}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                     <tr>
-                                        <td><input type="text" name="attr_psionic-clairsentience-science-name729" title="@{repeating_hench5_$X_psionic-clairsentience-science-name729}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                        <td><input type="text" name="attr_mthac0adj729" title="@{repeating_hench5_$X_mthac0adj729}" class="sheet-short" value="0"></td>
-                                        <td><input type="text" name="attr_mac729" title="@{repeating_hench5_$X_mac729}" class="sheet-small" value="10"></td>
-                                        <td><input type="text" name="attr_MThAC0729" title="@{repeating_hench5_$X_MThAC0729}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit729" title="%{repeating_hench5_$X_mthac011-hit729}" value="@{henchname55} hits a MAC of [[@{MThAC0729}-(1d20+(@{mthac0adj729})+(@{misc-mod}))]]&le;[[@{mac729}]] using their @{psionic-clairsentience-science-name729}"></button></td>
-                                        <td><input type="text" name="attr_psionic-macro729" title="@{repeating_hench5_$X_psionic-macro729}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check729" title="%{repeating_hench5_$X_psionic-macro12-check729}" value="@{psionic-macro729}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost729" title="@{repeating_hench5_$X_PSP-cost729}" placeholder="#" class="sheet-small"/></td>
+                                        <td><input type="text" name="attr_psionic-telepathy-name702" title="@{repeating_hench5_$X_psionic-telepathy-name702}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                                        <td><input type="text" name="attr_mthac0adj702" title="@{repeating_hench5_$X_mthac0adj702}" class="sheet-short" value="0"></td>
+                                        <td><input type="text" name="attr_mac702" title="@{repeating_hench5_$X_mac702}" class="sheet-small" value="10"></td>
+                                        <td><input type="text" name="attr_MThAC0702" title="@{repeating_hench5_$X_MThAC0702}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit702" title="%{repeating_hench5_$X_mthac02-hit702}" value="@{henchname55} hits a MAC of [[@{MThAC0702}-(1d20+(@{mthac0adj702})+(@{misc-mod}))]]&le;[[@{mac702}]] using their @{psionic-telepathy-name702}"></button></td>
+                                        <td><input type="text" name="attr_psionic-macro702" title="@{repeating_hench5_$X_psionic-macro702}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check702" title="%{repeating_hench5_$X_psionic-macro3-check702}" value="@{psionic-macro702}"></button></td>
+                                        <td><input type="text" name="attr_PSP-cost702" title="@{repeating_hench5_$X_PSP-cost702}" placeholder="#" class="sheet-small"/></td>
                                     </tr>
                                 </table>
                             </div>
                         </div>
                         <br>
-                        <h4><b>Psionic Attack Modes</b></h4>
-                        <table>
+                        <h4>Psionic Attack Modes</h4>
+                        <table class="sheet-default-header-first-row">
                             <tr>
-                                <td class="sheet-default-header">Attack Name</td>
-                                <td class="sheet-default-header">Attack<br>Speed</td>
-                                <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                <td class="sheet-default-header">MThAC0</td>
-                                <td class="sheet-default-header">Damage</td>
-                                <td class="sheet-default-header">Macro</td>
-                                <td class="sheet-default-header">PSP<br>Cost</td>
+                                <td>Attack Name</td>
+                                <td>Attack<br>Speed</td>
+                                <td>MThAC0<br>Adj.</td>
+                                <td>MThAC0</td>
+                                <td>Damage</td>
+                                <td>Macro</td>
+                                <td>PSP<br>Cost</td>
                             </tr>
                             <tr>
                                 <td><input type="text" name="attr_psionic-attack-name730" title="@{repeating_hench5_$X_psionic-attack-name730}" class="sheet-display" placeholder="Ability Name"/></td>
@@ -19757,12 +19720,12 @@ <h4><b>Psionic Attack Modes</b></h4>
                         <br>
                         <div class="sheet-3colrow">
                             <div class="sheet-col">
-                                <h4><b>Psionic Defense Modes</b></h4>
-                                <table>
+                                <h4>Psionic Defense Modes</h4>
+                                <table class="sheet-default-header-first-row">
                                     <tr>
-                                        <td class="sheet-default-header">Defense Name</td>
-                                        <td class="sheet-default-header">Macro</td>
-                                        <td class="sheet-default-header">PSP<br>Cost</td>
+                                        <td>Defense Name</td>
+                                        <td>Macro</td>
+                                        <td>PSP<br>Cost</td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psionic-defense-name733" title="@{repeating_hench5_$X_psionic-defense-name733}" class="sheet-midtext" placeholder="Defense Name"/></td>
@@ -19783,73 +19746,78 @@ <h4><b>Psionic Defense Modes</b></h4>
                             </div>
                             <div class="sheet-col">
                                 <h4>Psionic Strength Points</h4>
-                                <table style='width:250px;'>
+                                <table class="sheet-table-white sheet-default-header-first-row sheet-default-header-first-column" style='width:250px;'>
                                     <tr>
-                                        <td class="sheet-default-header" style="width:100px;">Value</td>
-                                        <td class="sheet-default-header" style="width:50px;">Current</td>
-                                        <td class="sheet-default-header" style="width:15px;">/</td>
-                                        <td class="sheet-default-header" style="width:60px;">Maximum</td>
-                                        <td class="sheet-default-header" style="width:25px;">Speed</td>
+                                        <td style="width:100px;">Value</td>
+                                        <td style="width:50px;">Current</td>
+                                        <td style="width:15px;">/</td>
+                                        <td style="width:60px;">Maximum</td>
+                                        <td style="width:25px;">Speed</td>
                                     </tr>
                                     <tr>
-                                        <td class="sheet-default-header" style="width:100px;">PSP:</td>
+                                        <td>PSP:</td>
                                         <td><input type="number" name="attr_PSP500" title="@{repeating_hench5_$X_PSP500}" class="sheet-short" placeholder="PSP"/></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                        <td>/</td>
                                         <td><input type="number" name="attr_PSP500_max" title="@{repeating_hench5_$X_PSP500|max}" class="sheet-short"/></td>
                                         <td><button type="roll" name="roll_psispeed501" title="%{repeating_hench5_$X_psispeed501}" value="/gmroll [[{([[1d10]]-(@{misc-mod})), 1}kh1]] [Psionic Power]&{tracker}"></button></td>
                                     </tr>
                                     <tr>
-                                        <td class="sheet-default-header" style="width:100px;">Temp PSP:</td>
+                                        <td>Temp PSP:</td>
                                         <td><input type="number" name="attr_tempPSP500" title="@{repeating_hench5_$X_tempPSP500}" class="sheet-short" placeholder="Temp"/></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                        <td>/</td>
                                         <td><input type="number" name="attr_tempPSP500_max" title="@{repeating_hench5_$X_tempPSP500|max}" class="sheet-short"/></td>
                                     </tr>
                                     <tr>
-                                        <td class="sheet-default-header" style="width:100px;">Stored PSP:</td>
+                                        <td>Stored PSP:</td>
                                         <td><input type="number" name="attr_storedPSP500" title="@{repeating_hench5_$X_storedPSP500}" class="sheet-short" placeholder="Stored"/></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                        <td>/</td>
                                         <td><input type="number" name="attr_storedPSP500_max" title="@{repeating_hench5_$X_storedPSP500|max}" class="sheet-short"/></td>
                                     </tr>
                                     <tr>
-                                        <td class="sheet-default-header" style="width:100px;">MAC</td>
+                                        <td>MAC</td>
                                         <td><input type="number" name="attr_selfMAC500" title="@{repeating_hench5_$X_selfMAC500}" class="sheet-short"/></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                        <td>/</td>
                                         <td><input type="number" name="attr_temp-selfMAC500" title="@{repeating_hench5_$X_temp-selfMAC500}" class="sheet-short"/></td>
                                     </tr>
                                 </table>
                             </div>
                             <div class="sheet-col">
                                 <h4>Psionic NWP's</h4>
-                                <table>
+                                <table class="sheet-table-white">
                                     <tr>
                                         <td><input type="text" name="attr_psinwp500" title="@{repeating_hench5_$X_psinwp500}" class="sheet-maxtext" placeholder="Name of NWP"></td>
                                         <td><input type="text" name="attr_psinwpstat500" title="@{repeating_hench5_$X_psinwpstat500}" placeholder="@{}" class="sheet-small"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod500" title="@{repeating_hench5_$X_psinwpmod500}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots500" title="@{repeating_hench5_$X_psinwpslots500}" class="sheet-small" placeholder="#">
-                                            <button type="roll" name="roll_psinwps505" title="%{repeating_hench5_$X_psinwps505}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat500})+(@{psinwpmod500})]] @{psinwp500}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_psinwpmod500" title="@{repeating_hench5_$X_psinwpmod500}" value="0" class="sheet-small"></td>
+                                        <td><input type="text" name="attr_psinwpslots500" title="@{repeating_hench5_$X_psinwpslots500}" class="sheet-small" placeholder="#"></td>
+                                        <td><button type="roll" name="roll_psinwps500" title="%{repeating_hench5_$X_psinwps500}" value="&{template:2Echeck} {{checkvs=@{psinwp500} Check}} {{character=@{henchname55}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psinwpstat500})+(@{psinwpmod500})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psinwp501" title="@{repeating_hench5_$X_psinwp501}" class="sheet-maxtext" placeholder="Name of NWP"></td>
                                         <td><input type="text" name="attr_psinwpstat501" title="@{repeating_hench5_$X_psinwpstat501}" placeholder="@{}" class="sheet-small"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod501" title="@{repeating_hench5_$X_psinwpmod501}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots501" title="@{repeating_hench5_$X_psinwpslots501}" class="sheet-small" placeholder="#">
-                                            <button type="roll" name="roll_psinwps506" title="%{repeating_hench5_$X_psinwps506}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat501})+(@{psinwpmod501})]] @{psinwp501}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_psinwpmod501" title="@{repeating_hench5_$X_psinwpmod501}" value="0" class="sheet-small"></td>
+                                        <td><input type="text" name="attr_psinwpslots501" title="@{repeating_hench5_$X_psinwpslots501}" class="sheet-small" placeholder="#"></td>
+                                        <td><button type="roll" name="roll_psinwps501" title="%{repeating_hench5_$X_psinwps501}" value="&{template:2Echeck} {{checkvs=@{psinwp501} Check}} {{character=@{henchname55}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psinwpstat501})+(@{psinwpmod501})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psinwp502" title="@{repeating_hench5_$X_psinwp502}" class="sheet-maxtext" placeholder="Name of NWP"></td>
                                         <td><input type="text" name="attr_psinwpstat502" title="@{repeating_hench5_$X_psinwpstat502}" placeholder="@{}" class="sheet-small"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod502" title="@{repeating_hench5_$X_psinwpmod502}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots502" title="@{repeating_hench5_$X_psinwpslots502}" class="sheet-small" placeholder="#">
-                                            <button type="roll" name="roll_psinwps507" title="%{repeating_hench5_$X_psinwps507}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat502})+(@{psinwpmod502})]] @{psinwp502}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_psinwpmod502" title="@{repeating_hench5_$X_psinwpmod502}" value="0" class="sheet-small"></td>
+                                        <td><input type="text" name="attr_psinwpslots502" title="@{repeating_hench5_$X_psinwpslots502}" class="sheet-small" placeholder="#"></td>
+                                        <td><button type="roll" name="roll_psinwps502" title="%{repeating_hench5_$X_psinwps502}" value="&{template:2Echeck} {{checkvs=@{psinwp502} Check}} {{character=@{henchname55}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psinwpstat502})+(@{psinwpmod502})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psinwp503" title="@{repeating_hench5_$X_psinwp503}" class="sheet-maxtext" placeholder="Name of NWP"></td>
                                         <td><input type="text" name="attr_psinwpstat503" title="@{repeating_hench5_$X_psinwpstat503}" placeholder="@{}" class="sheet-small"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod503" title="@{repeating_hench5_$X_psinwpmod503}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots503" title="@{repeating_hench5_$X_psinwpslots503}" class="sheet-small" placeholder="#">
-                                            <button type="roll" name="roll_psinwps508" title="%{repeating_hench5_$X_psinwps508}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat503})+(@{psinwpmod503})]] @{psinwp503}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_psinwpmod503" title="@{repeating_hench5_$X_psinwpmod503}" value="0" class="sheet-small"></td>
+                                        <td><input type="text" name="attr_psinwpslots503" title="@{repeating_hench5_$X_psinwpslots503}" class="sheet-small" placeholder="#"></td>
+                                        <td><button type="roll" name="roll_psinwps503" title="%{repeating_hench5_$X_psinwps503}" value="&{template:2Echeck} {{checkvs=@{psinwp503} Check}} {{character=@{henchname55}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psinwpstat503})+(@{psinwpmod503})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                     </tr>
                                     <tr>
                                         <td><input type="text" name="attr_psinwp504" title="@{repeating_hench5_$X_psinwp504}" class="sheet-maxtext" placeholder="Name of NWP"></td>
                                         <td><input type="text" name="attr_psinwpstat504" title="@{repeating_hench5_$X_psinwpstat504}" placeholder="@{}" class="sheet-small"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod504" title="@{repeating_hench5_$X_psinwpmod504}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots504" title="@{repeating_hench5_$X_psinwpslots504}" class="sheet-small" placeholder="#">
-                                            <button type="roll" name="roll_psinwps509" title="%{repeating_hench5_$X_psinwps509}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat504})+(@{psinwpmod504})]] @{psinwp504}"></button></td>
+                                        <td>&plusmn;<input type="text" name="attr_psinwpmod504" title="@{repeating_hench5_$X_psinwpmod504}" value="0" class="sheet-small"></td>
+                                        <td><input type="text" name="attr_psinwpslots504" title="@{repeating_hench5_$X_psinwpslots504}" class="sheet-small" placeholder="#"></td>
+                                        <td><button type="roll" name="roll_psinwps504" title="%{repeating_hench5_$X_psinwps504}" value="&{template:2Echeck} {{checkvs=@{psinwp504} Check}} {{character=@{henchname55}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psinwpstat504})+(@{psinwpmod504})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                                     </tr>
                                 </table>
                             </div>
@@ -19950,13 +19918,13 @@ <h4>Notes</h4>
             <div class="sheet-tab-content sheet-section-follower-animals">
                 <h4>Pets, Mounts, Animal Familiars, Followers and Beasts of Burden</h4>
                 <br>
-                <table>
+                <table class="sheet-default-header-first-row">
                     <tr>
-                        <td class="sheet-default-header">Name</td>
-                        <td class="sheet-default-header">AC</td>
-                        <td class="sheet-default-header">Race</td>
-                        <td class="sheet-default-header">Level</td>
-                        <td class="sheet-default-header">HP/Max</td>
+                        <td>Name</td>
+                        <td>AC</td>
+                        <td>Race</td>
+                        <td>Level</td>
+                        <td>HP/Max</td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_henchname6" title="@{henchname6}"></td>
@@ -20034,16 +20002,16 @@ <h4>Weapons / Attacks</h4>
                 <hr>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
-                        <td><button type="roll" name="roll_hench6parsave" title="%{hench6parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6parsave" title="%{hench6poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6deasave" title="%{hench6deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6rodsave" title="%{hench6rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6stasave" title="%{hench6stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6wansave" title="%{hench6wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6petsave" title="%{hench6petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6polsave" title="%{hench6polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6bresave" title="%{hench6bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6spesave" title="%{hench6spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6parsave" title="%{hench6parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6parsave" title="%{hench6poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6deasave" title="%{hench6deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6rodsave" title="%{hench6rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6stasave" title="%{hench6stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6wansave" title="%{hench6wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6petsave" title="%{hench6petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6polsave" title="%{hench6polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6bresave" title="%{hench6bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6spesave" title="%{hench6spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname6}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench6spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_hench6partar" title="@{hench6partar}" class="sheet-small"></td>
@@ -20524,14 +20492,14 @@ <h4>Notes</h4>
                 <hr>
                 <hr>
                 <fieldset name="repeating_hench6" class="repeating_hench6">
-                    <table>
+                    <table class="sheet-default-header-first-row">
                         <tr>
-                            <td class="sheet-default-header">Name</td>
-                            <td class="sheet-default-header">AC</td>
-                            <td class="sheet-default-header">Race</td>
-                            <td class="sheet-default-header">Level</td>
-                            <td class="sheet-default-header">HP/Max</td>
-                            <td class="sheet-default-header">Units</td>
+                            <td>Name</td>
+                            <td>AC</td>
+                            <td>Race</td>
+                            <td>Level</td>
+                            <td>HP/Max</td>
+                            <td>Units</td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_henchname66" title="@{repeating_hench6_$X_henchname66}"></td>
@@ -20610,16 +20578,16 @@ <h4>Weapons / Attacks</h4>
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
-                            <td><button type="roll" name="roll_hench66parsave" title="%{repeating_hench6_$X_hench66parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66parsave" title="%{repeating_hench6_$X_hench66poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66deasave" title="%{repeating_hench6_$X_hench66deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66rodsave" title="%{repeating_hench6_$X_hench66rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66stasave" title="%{repeating_hench6_$X_hench66stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66wansave" title="%{repeating_hench6_$X_hench66wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66petsave" title="%{repeating_hench6_$X_hench66petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66polsave" title="%{repeating_hench6_$X_hench66polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66bresave" title="%{repeating_hench6_$X_hench66bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66spesave" title="%{repeating_hench6_$X_hench66spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench66parsave" title="%{repeating_hench6_$X_hench66parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench66parsave" title="%{repeating_hench6_$X_hench66poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench66deasave" title="%{repeating_hench6_$X_hench66deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench66rodsave" title="%{repeating_hench6_$X_hench66rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench66stasave" title="%{repeating_hench6_$X_hench66stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench66wansave" title="%{repeating_hench6_$X_hench66wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench66petsave" title="%{repeating_hench6_$X_hench66petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench66polsave" title="%{repeating_hench6_$X_hench66polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench66bresave" title="%{repeating_hench6_$X_hench66bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench66spesave" title="%{repeating_hench6_$X_hench66spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname66}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{hench66spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_hench66partar" title="@{repeating_hench6_$X_hench66partar}" class="sheet-small"></td>
@@ -21678,16 +21646,16 @@ <h4>Additional Monster attacks</h4>
 
         <table class="sheet-centering" style="width: 100%;">
             <tr>
-                <td><button type="roll" name="roll_monparsave" title="%{monparsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monpartar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
-                <td><button type="roll" name="roll_monparsave" title="%{monpoisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monpoitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
-                <td><button type="roll" name="roll_mondeasave" title="%{mondeasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{mondeatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
-                <td><button type="roll" name="roll_monrodsave" title="%{monrodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monrodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
-                <td><button type="roll" name="roll_monstasave" title="%{monstasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monstatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
-                <td><button type="roll" name="roll_monwansave" title="%{monwansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monwantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
-                <td><button type="roll" name="roll_monpetsave" title="%{monpetsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monpettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
-                <td><button type="roll" name="roll_monpolsave" title="%{monpolsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monpoltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
-                <td><button type="roll" name="roll_monbresave" title="%{monbresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monbretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
-                <td><button type="roll" name="roll_monspesave" title="%{monspesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monspetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
+                <td><button type="roll" name="roll_monparsave" title="%{monparsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monpartar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
+                <td><button type="roll" name="roll_monparsave" title="%{monpoisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monpoitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
+                <td><button type="roll" name="roll_mondeasave" title="%{mondeasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{mondeatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
+                <td><button type="roll" name="roll_monrodsave" title="%{monrodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monrodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
+                <td><button type="roll" name="roll_monstasave" title="%{monstasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monstatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
+                <td><button type="roll" name="roll_monwansave" title="%{monwansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monwantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
+                <td><button type="roll" name="roll_monpetsave" title="%{monpetsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monpettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
+                <td><button type="roll" name="roll_monpolsave" title="%{monpolsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monpoltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
+                <td><button type="roll" name="roll_monbresave" title="%{monbresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monbretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
+                <td><button type="roll" name="roll_monspesave" title="%{monspesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{monspetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
             </tr>
             <tr>
                 <td><input type="text" name="attr_monpartar" title="@{monpartar}" class="sheet-small"></td>
@@ -32330,39 +32298,81 @@ <h2>Monster Sheet specific</h2>
                     <td>{{savetarget}}</td>
                 </tr>
                 {{#rollTotal() saveroll savetarget}}
-                <tr>
-                    <td colspan="100" class="sheet-template-result sheet-template-success">
-                        Success!
-                        {{#success}}
-                        <br>
-                        <span class="sheet-template-result-description">{{success}}</span>
-                        {{/success}}
-                    </td>
-                </tr>
+                    {{#rollWasFumble() saveroll}}
+                    <tr>
+                        <td colspan="100" class="sheet-template-result sheet-template-failure">
+                            CRITICAL FAILURE!
+                            {{#fumble}}
+                            <br>
+                            <span class="sheet-template-result-description">{{fumble}}</span>
+                            {{/fumble}}
+                        </td>
+                    </tr>
+                    {{/rollWasFumble() saveroll}}
+
+                    {{#^rollWasFumble() saveroll}}
+                    <tr>
+                        <td colspan="100" class="sheet-template-result sheet-template-success">
+                            Success!
+                            {{#success}}
+                            <br>
+                            <span class="sheet-template-result-description">{{success}}</span>
+                            {{/success}}
+                        </td>
+                    </tr>
+                    {{/^rollWasFumble() saveroll}}
                 {{/rollTotal() saveroll savetarget}}
 
                 {{#rollGreater() saveroll savetarget}}
-                <tr>
-                    <td colspan="100" class="sheet-template-result sheet-template-success">
-                        Success!
-                        {{#success}}
-                        <br>
-                        <span class="sheet-template-result-description">{{success}}</span>
-                        {{/success}}
-                    </td>
-                </tr>
+                    {{#rollWasFumble() saveroll}}
+                    <tr>
+                        <td colspan="100" class="sheet-template-result sheet-template-failure">
+                            CRITICAL FAILURE!
+                            {{#fumble}}
+                            <br>
+                            <span class="sheet-template-result-description">{{fumble}}</span>
+                            {{/fumble}}
+                        </td>
+                    </tr>
+                    {{/rollWasFumble() saveroll}}
+
+                    {{#^rollWasFumble() saveroll}}
+                    <tr>
+                        <td colspan="100" class="sheet-template-result sheet-template-success">
+                            Success!
+                            {{#success}}
+                            <br>
+                            <span class="sheet-template-result-description">{{success}}</span>
+                            {{/success}}
+                        </td>
+                    </tr>
+                    {{/^rollWasFumble() saveroll}}
                 {{/rollGreater() saveroll savetarget}}
 
                 {{#rollLess() saveroll savetarget}}
-                <tr>
-                    <td colspan="100" class="sheet-template-result sheet-template-failure">
-                        Failed!
-                        {{#fail}}
-                        <br>
-                        <span class="sheet-template-result-description">{{fail}}</span>
-                        {{/fail}}
-                    </td>
-                </tr>
+                    {{#rollWasFumble() saveroll}}
+                    <tr>
+                        <td colspan="100" class="sheet-template-result sheet-template-failure">
+                            CRITICAL FAILURE!
+                            {{#fail}}
+                            <br>
+                            <span class="sheet-template-result-description">{{fail}}</span>
+                            {{/fail}}
+                        </td>
+                    </tr>
+                    {{/rollWasFumble() saveroll}}
+
+                    {{#^rollWasFumble() saveroll}}
+                    <tr>
+                        <td colspan="100" class="sheet-template-result sheet-template-failure">
+                            Failed!
+                            {{#fail}}
+                            <br>
+                            <span class="sheet-template-result-description">{{fail}}</span>
+                            {{/fail}}
+                        </td>
+                    </tr>
+                    {{/^rollWasFumble() saveroll}}
                 {{/rollLess() saveroll savetarget}}
             </table>
         </div>
@@ -32418,7 +32428,34 @@ <h2>Monster Sheet specific</h2>
                             </tr>
                         {{/crit}}
                     {{/rollWasCrit() checkroll}}
+
+                    {{#rollWasFumble() checkroll}}
+                        {{#fumble}}
+                            <tr>
+                                <td colspan="100" class="sheet-template-result sheet-template-failure">
+                                    CRITICAL FAILURE!
+                                    {{#fumble}}
+                                    <br>
+                                    <span class="sheet-template-result-description">{{fumble}}</span>
+                                    {{/fumble}}
+                                </td>
+                            </tr>
+                        {{/fumble}}
+                        {{^fumble}}
+                            <tr>
+                                <td colspan="100" class="sheet-template-result sheet-template-success">
+                                    Success!
+                                    {{#success}}
+                                    <br>
+                                    <span class="sheet-template-result-description">{{success}}</span>
+                                    {{/success}}
+                                </td>
+                            </tr>
+                        {{/fumble}}
+                    {{/rollWasFumble() checkroll}}
+
                     {{#^rollWasCrit() checkroll}}
+                    {{#^rollWasFumble() checkroll}}
                         <tr>
                             <td colspan="100" class="sheet-template-result sheet-template-success">
                                 Success!
@@ -32428,6 +32465,7 @@ <h2>Monster Sheet specific</h2>
                                 {{/success}}
                             </td>
                         </tr>
+                    {{/^rollWasFumble() checkroll}}
                     {{/^rollWasCrit() checkroll}}
                 {{/rollTotal() checkroll checktarget}}
 
@@ -32456,7 +32494,34 @@ <h2>Monster Sheet specific</h2>
                             </tr>
                         {{/crit}}
                     {{/rollWasCrit() checkroll}}
+
+                    {{#rollWasFumble() checkroll}}
+                        {{#fumble}}
+                            <tr>
+                                <td colspan="100" class="sheet-template-result sheet-template-failure">
+                                    CRITICAL FAILURE!
+                                    {{#fumble}}
+                                    <br>
+                                    <span class="sheet-template-result-description">{{fumble}}</span>
+                                    {{/fumble}}
+                                </td>
+                            </tr>
+                        {{/fumble}}
+                        {{^fumble}}
+                            <tr>
+                                <td colspan="100" class="sheet-template-result sheet-template-success">
+                                    Success!
+                                    {{#success}}
+                                    <br>
+                                    <span class="sheet-template-result-description">{{success}}</span>
+                                    {{/success}}
+                                </td>
+                            </tr>
+                        {{/fumble}}
+                    {{/rollWasFumble() checkroll}}
+
                     {{#^rollWasCrit() checkroll}}
+                    {{#^rollWasFumble() checkroll}}
                         <tr>
                             <td colspan="100" class="sheet-template-result sheet-template-success">
                                 Success!
@@ -32466,6 +32531,7 @@ <h2>Monster Sheet specific</h2>
                                 {{/success}}
                             </td>
                         </tr>
+                    {{/^rollWasFumble() checkroll}}
                     {{/^rollWasCrit() checkroll}}
                 {{/rollLess() checkroll checktarget}}
 
@@ -32475,10 +32541,10 @@ <h2>Monster Sheet specific</h2>
                             <tr>
                                 <td colspan="100" class="sheet-template-result sheet-template-failure">
                                     CRITICAL FAILURE!
-                                    {{#fumble}}
+                                    {{#fail}}
                                     <br>
-                                    <span class="sheet-template-result-description">{{fumble}}</span>
-                                    {{/fumble}}
+                                    <span class="sheet-template-result-description">{{fail}}</span>
+                                    {{/fail}}
                                 </td>
                             </tr>
                         {{/fumble}}
@@ -32494,6 +32560,7 @@ <h2>Monster Sheet specific</h2>
                             </tr>
                         {{/fumble}}
                     {{/rollWasFumble() checkroll}}
+
                     {{#^rollWasFumble() checkroll}}
                         <tr>
                             <td colspan="100" class="sheet-template-result sheet-template-failure">
@@ -70652,23 +70719,31 @@ <h2>Monster Sheet specific</h2>
 });
 
 //Rogue armor modifier auto fill
-on('change:armorname', function(eventInfo) {
+const ARMOR_NUMBER_REGEX = /armorname(\d{0,2})$/;
+on('change:armorname change:armorname2 change:repeating_hench4:armorname22', function(eventInfo) {
     let armor = ROGUE_ARMOR[eventInfo.newValue];
     if (armor === undefined)
         return;
 
-    let armorModifiers = {
-        'ppa': armor['Pick Pockets'] || '0',
-        'ola': armor['Open Locks'] || '0',
-        'rta': armor['Find/Remove Traps'] || '0',
-        'msa': armor['Move Silently'] || '0',
-        'hsa': armor['Hide in Shadows'] || '0',
-        'dna': armor['Detect Noise'] || '0',
-        'cwa': armor['Climb Walls'] || '0',
-        'bra': armor['Bribe'] || '0',
-        'tua': armor['Tunneling'] || '0',
-        'eba': armor['Escape bonds'] || '0',
-    };
+    let row = '';
+    let parse = parseSourceAttribute(eventInfo);
+    if (parse.rowId) {
+        row = `repeating_${parse.section}_${parse.rowId}_`;
+    }
+    let armorNumber = parse.attribute.match(ARMOR_NUMBER_REGEX)[1];
+
+    let armorModifiers = {};
+    armorModifiers[`${row}ppa${armorNumber}`]= armor['Pick Pockets'] || '0';
+    armorModifiers[`${row}ola${armorNumber}`]= armor['Open Locks'] || '0';
+    armorModifiers[`${row}rta${armorNumber}`]= armor['Find/Remove Traps'] || '0';
+    armorModifiers[`${row}msa${armorNumber}`]= armor['Move Silently'] || '0';
+    armorModifiers[`${row}hsa${armorNumber}`]= armor['Hide in Shadows'] || '0';
+    armorModifiers[`${row}dna${armorNumber}`]= armor['Detect Noise'] || '0';
+    armorModifiers[`${row}cwa${armorNumber}`]= armor['Climb Walls'] || '0';
+    armorModifiers[`${row}bra${armorNumber}`]= armor['Bribe'] || '0';
+    armorModifiers[`${row}tua${armorNumber}`]= armor['Tunneling'] || '0';
+    armorModifiers[`${row}eba${armorNumber}`]= armor['Escape bonds'] || '0';
+    console.log(armorModifiers);
     setAttrs(armorModifiers);
 });
 
@@ -70676,7 +70751,7 @@ <h2>Monster Sheet specific</h2>
     getAttrs([''], async function (values) {
         console.log(eventInfo);
         let rollBuilder = new RollTemplateBuilder('2Echeck');
-        rollBuilder.push('character=@{character_name}', 'checkroll=[[1d100cs<1cf>96]]');
+        rollBuilder.push('character=@{character_name}', 'checkroll=[[1d100cs<1cf>96]]%');
 
         let skill = await extractQueryResult(`?{Find or Removing Trap?|Find Traps|Remove Traps|Remove Invisible/Magical Traps}`);
         if (skill === 'Find Traps') {
@@ -70695,7 +70770,7 @@ <h2>Monster Sheet specific</h2>
     getAttrs(['rogue-ranger'], async function (values) {
         let skill = eventInfo.triggerName.replace('clicked:', '');
         let rollBuilder = new RollTemplateBuilder('2Echeck');
-        rollBuilder.push('character=@{character_name}','checkroll=[[1d100cs<1cf>[[@{rogue-ranger}+1]] ]]');
+        rollBuilder.push('character=@{character_name}','checkroll=[[1d100cs<1cf>[[@{rogue-ranger}+1]] ]]%');
 
         if (skill ==='ms') {
             rollBuilder.push('success=You are silent. Movement rate reduced to 1/3 of normal. Opponents get -2 to surprise roll from silence and another -2 if you are unseen.', 'fail=You are not silent. Movement rate reduced to 1/3 of normal.');
@@ -70710,7 +70785,7 @@ <h2>Monster Sheet specific</h2>
             return printRoll(`/w gm ${rollBuilder.string()}`);
         }
 
-        let surroundings = await extractQueryResult(`?{What are your surroundings?|Natural (woodland / forrest / plains),Natural|Non-natural (crypt / city street / indoor / underground),Non-natural}`);
+        let surroundings = await extractQueryResult(`?{What are your surroundings?|Natural (woodland / forest / plains),Natural|Non-natural (crypt / city street / indoor / underground),Non-natural}`);
         let displaySurrounding = `*${surroundings} surroundings*`;
         let skillName = skill === 'ms' ? `checkvs=Move Silently\n${displaySurrounding}\n(in @{armorname})` : `checkvs=Hide in Shadows\n${displaySurrounding}\n(in @{armorname})`;
         if (surroundings === 'Natural') {
@@ -72087,7 +72162,7 @@ <h2>Monster Sheet specific</h2>
             macroBuilder.push(`prep=${prep}`);
             macroBuilder.push(`prereq=${power['prerequisites']}`);
             macroBuilder.push(`reference=${power['reference']}, ${power['book']}`)
-            macroBuilder.push(`powerroll=[[1d20cf20-(@{psionic-mod${number}})]]`);
+            macroBuilder.push(`powerroll=[[1d20cf20]]`);
             if (power['secret-by-dm']) {
                 macroBuilder.push('secret=true');
             }
@@ -72095,8 +72170,8 @@ <h2>Monster Sheet specific</h2>
             if (power['context-modifier']) {
                 powerScore += `+(${power['context-modifier']})`;
             }
-            macroBuilder.push(`powerscore=[[${powerScore}]]`);
-            macroBuilder.push(`powerscoreenhanced=[[${powerScore}+(@{powerscore-enhanced})]]`)
+            macroBuilder.push(`powerscore=[[${powerScore}+(@{misc-mod})]]`);
+            macroBuilder.push(`powerscoreenhanced=[[${powerScore}+(@{powerscore-enhanced})+(@{misc-mod})]]`)
             macroBuilder.push(`powerscoreeffect=${power['power-score']}`);
             macroBuilder.push(`20effect=${power['20']}`);
             macroBuilder.push(`1effect=${power['1']}`);
@@ -72165,16 +72240,16 @@ <h2>Monster Sheet specific</h2>
 
             match = fullMacro.match(/\{\{(powerroll=\[\[.*?]])}} *\{\{/);
             if (match) macroBuilder.push(match[1]);
-            else macroBuilder.push(`powerroll=[[1d20cf20-(@{psionic-mod${number}})]]`);
+            else macroBuilder.push(`powerroll=[[1d20cf20]]`);
 
             let powerScore = `@{powerscore-nomod${number}}+(@{powerscore-mod${number}})+(@{psion-armor-penalty})`;
             match = fullMacro.match(/\{\{(powerscore=\[\[.*?]])}} *\{\{/);
             if (match) macroBuilder.push(match[1]);
-            else macroBuilder.push(`powerscore=[[${powerScore}]]`);
+            else macroBuilder.push(`powerscore=[[${powerScore}+(@{misc-mod})]]`);
 
             match = fullMacro.match(/\{\{(powerscoreenhanced=\[\[.*?]])}} *\{\{/);
             if (match) macroBuilder.push(match[1]);
-            else macroBuilder.push(`powerscoreenhanced=[[${powerScore}+(@{powerscore-enhanced})]]`);
+            else macroBuilder.push(`powerscoreenhanced=[[${powerScore}+(@{powerscore-enhanced})+(@{misc-mod})]]`);
 
             match = fullMacro.match(/\{\{(powerscoreeffect=.*?)}} *\{\{/);
             if (match) macroBuilder.push(match[1]);
@@ -72219,7 +72294,6 @@ <h2>Monster Sheet specific</h2>
     let rollPsionicTemplate = async function(macroValue, rowId, values) {
         let repeating = `repeating_${section}_${rowId}`;
         macroValue = macroValue.replaceAll(`${name}`,`${repeating}_${name}`)
-            .replaceAll(`psionic-mod${number}`,`${repeating}_psionic-mod${number}`)
             .replaceAll(`powerscore-nomod${number}`,`${repeating}_powerscore-nomod${number}`)
             .replaceAll(`powerscore-mod${number}`,`${repeating}_powerscore-mod${number}`)
             .replaceAll(`powerscore-enhanced`,`${repeating}_powerscore-enhanced`)
@@ -72296,7 +72370,7 @@ <h2>Monster Sheet specific</h2>
 // --- Version change start --- //
 
 const SHEET_NAME = 'AD&D 2E Revised';
-const SHEET_VERSION = '4.17.0';
+const SHEET_VERSION = '4.18.0';
 
 on('sheet:opened', function(){
     getAttrs(['character_sheet'],function(attrs){
@@ -72331,6 +72405,9 @@ <h2>Monster Sheet specific</h2>
 
             if (oldSheetVersion.isBelowMigrate(4, 17, 0))
                 migrate4_17_0();
+
+            if (oldSheetVersion.isBelowMigrate(4, 18, 0))
+                migrate4_18_0();
         }
     });
 });
@@ -72378,6 +72455,28 @@ <h2>Monster Sheet specific</h2>
 }
 //#endregion
 
+//#region verison 4.18.0
+function migrate4_18_0() {
+    console.log('Migrate to v4.18.0');
+    TAS.repeating('hench5')
+        .attrs('psionclai-science-macro527','psionclair-science-macro527')
+        .fields('psiontelepathic-macro505','psiontelepathic-science-macro505')
+        .each(function (row) {
+            let macro = row.S['psiontelepathic-macro505'].trim();
+            if (macro !== '') {
+                console.log('Moved macro from psiontelepathic-macro505 to psiontelepathic-science-macro505');
+                row.S['psiontelepathic-science-macro505'] = macro;
+            }
+        }, function (rowSet, attrSet) {
+            let macro = attrSet.S['psionclai-science-macro527'].trim();
+            if (macro !== '') {
+                console.log('Moved macro from psionclai-science-macro527 to psionclair-science-macro527');
+                attrSet.S['psionclair-science-macro527'] = macro;
+            }
+        }).execute();
+}
+//#endregion
+
 //#region version 4.17.0
 function migrate4_17_0() {
     console.log('Migrate to v4.17.0');
diff --git a/ADnD_2E_Revised/2EStyle.css b/ADnD_2E_Revised/2EStyle.css
index 7fcaa11c65dc..d7d7748300eb 100644
--- a/ADnD_2E_Revised/2EStyle.css
+++ b/ADnD_2E_Revised/2EStyle.css
@@ -33,6 +33,11 @@
 .charsheet input.sheet-track {
     width: 59px;
 }
+.charsheet select.sheet-track-min,
+.charsheet input.sheet-track-min {
+    min-width: 59px;
+    width: 100%;
+}
 .charsheet select.sheet-sym,
 .charsheet input.sheet-sym {
     width: 72px;
diff --git a/ADnD_2E_Revised/css/2EStyle-base.css b/ADnD_2E_Revised/css/2EStyle-base.css
index 05088042c981..ec86c791d67a 100644
--- a/ADnD_2E_Revised/css/2EStyle-base.css
+++ b/ADnD_2E_Revised/css/2EStyle-base.css
@@ -33,6 +33,11 @@
 .charsheet input.sheet-track {
     width: 59px;
 }
+.charsheet select.sheet-track-min,
+.charsheet input.sheet-track-min {
+    min-width: 59px;
+    width: 100%;
+}
 .charsheet select.sheet-sym,
 .charsheet input.sheet-sym {
     width: 72px;
diff --git a/ADnD_2E_Revised/html/changelog.html b/ADnD_2E_Revised/html/changelog.html
index ff016f3c5711..19e0e2758123 100644
--- a/ADnD_2E_Revised/html/changelog.html
+++ b/ADnD_2E_Revised/html/changelog.html
@@ -4,34 +4,24 @@
         <h2 style="color: black;">Changes in <span name="attr_version"></span></h2>
         <div class="sheet-announce-items">
             <ul style="font-style:italic">
-                <li>Psionic Power - Telekinesis no longer adds a modifier for lifting an item weighing exactly 3 pounds</li>
-                <li>Psionic Power - Telekinesis now shows the attack modifier based on the items weight</li>
-                <li>Psionic Power - Life Draining refers to itself as a Power instead of a Devotion. Sage Advice #186</li>
-                <li>Endurance NWP for Dwarves is now free (cost 0 slots) instead of 1 as described in Complete Dwarves Handbook.</li>
-                <li>Added V, S components to all Quest spells from Tome of Magic p. 12</li>
-                <li>Updated casting spells from scroll notes clarifying that scrolls can be cast without restrictions</li>
-                <li>Updated spell learning notes to make it clear that <strong>read magic</strong> is not need to read spell books</li>
-                <li>Added new Tome of Magic sphere suggestion to Paladins, Rangers, and Druids sphere of influence</li>
-                <li>Added Priest casting level scaling for Paladins ensuring they cast as first level priest at level 9, their max casting level is 9</li>
-                <li>Added Priest casting level scaling for Rangers ensuring they cast as first level priest at level 8, their max casting level is 9</li>
-                <li>Added correction to Turn Undead notes that all creatures dwelling on the Outer Planes, not only undead, can be turned as Special creatures</li>
-                <li>Fixed Follower->Rogue Detect Magic roll button attribute name. It now correctly matches the title of shown in the mouse over text</li>
-                <li>Redesigned the rogue/thieving skills tab
-                    <ul>
-                        <li>All skills now have a single button for rolling them instead of 3</li>
-                        <li>All base skills now have descriptive text for success and failure</li>
-                        <li>Added %-sign to the roll template for Thieving skills</li>
-                        <li>All skills have gotten their calculations changed so that the misc modifier is included in the max 95% chance</li>
-                        <li>Find/Remove Traps, when rolled, ask for how it is used: Find, remove normal, remove invisible/magical trap</li>
-                        <li>Toggle to tell if you are a Ranger, allowing Move Silently and Hide in Shadows to max out at 99% instead of 95%</li>
-                        <li>If you are a Ranger, Move Silently and Hide in Shadows ask if you are in a non-natural surrounding and half your chance of success</li>
-                        <li>Added Dexterity, Aim, Balance skills armor adjustments notes</li>
-                        <li>Added Ranger skills armor adjustments notes</li>
-                        <li>Added ranger to the allowed armors for the rogue armor autofill</li>
-                        <li>All skills from PO: Skills & Powers, Dark Sun, and Sages & Specialists now use Roll templates when rolled</li>
-                        <li>Visibility setting have been added allowing for hidden rolls, so only the DM knows if the rogue made the check or not</li>
-                    </ul>
-                </li>
+                <li>Psionic Powers: Reordered to appear in the same order as presented in the books</li>
+                <li>Psionic Powers: Changed headings to match the books, i.e. Psychokinesis Sciences -> Psychokinetic Sciences</li>
+                <li>Psionic Powers: Fixed a lot of incorrect mouse over texts</li>
+                <li>Psionic Powers Core: Removed Roll modifier as the roll should never be modified. Update macros for this to take effect</li>
+                <li>Psionic Powers Core: Added Misc. modifier to power checks. Update macros for this to take effect</li>
+                <li>Character Revised Psionic Psychokinesis Devotion: Fixed first static row PSP cost field no longer share values with Telepathy Science, first static row PSP cost field</li>
+                <li>Static Follower Core Psionic Clairsentient Sciences: Fixed first macro not printing to the chat</li>
+                <li>Repeating Follower Core Psionic Psychoportive Sciences: Fixed third macro throwing error to the chat</li>
+                <li>Follower Core Psionic: Changed check roll to crit on the Power Score value instead of 1</li>
+                <li>Follower Psionic: Psionic Nonweapon proficiencies now outputs with a roll template</li>
+                <li>Follower Rogue: Changed the layout to be similar to the character sheet with all skills being visible at the same time</li>
+                <li>Follower Rogue: Added armor type selection and armor bonus/penalties modifiers autofill</li>
+                <li>Follower Rogue: Adding %-sign for roll template</li>
+                <li>Characters: Added missing %-sign for Find/Remove Traps, Move Silently, and Hide in Shadows</li>
+                <li>Saving throws now always fail on a natural one, no matter the modifiers. Sage Advice #216 p. 103</li>
+                <li>Nonweapon proficiencies now always fail on a natural 20. PHB p. 75</li>
+                <li>Nonweapon proficiencies now show how well you made your check</li>
+                <li>Nonweapon proficiencies now highlight a critical success</li>
             </ul>
             <hr>
             <p>
diff --git a/ADnD_2E_Revised/html/components/rolltemplates.html b/ADnD_2E_Revised/html/components/rolltemplates.html
index 176fdfc3ca7c..0d8641a5ac67 100644
--- a/ADnD_2E_Revised/html/components/rolltemplates.html
+++ b/ADnD_2E_Revised/html/components/rolltemplates.html
@@ -301,15 +301,33 @@
                     <td>{{savetarget}}</td>
                 </tr>
                 {{#rollTotal() saveroll savetarget}}
-                insert_check-result.html_(success,Success!,success)
+                    {{#rollWasFumble() saveroll}}
+                    insert_check-result.html_(failure,CRITICAL FAILURE!,fumble)
+                    {{/rollWasFumble() saveroll}}
+
+                    {{#^rollWasFumble() saveroll}}
+                    insert_check-result.html_(success,Success!,success)
+                    {{/^rollWasFumble() saveroll}}
                 {{/rollTotal() saveroll savetarget}}
 
                 {{#rollGreater() saveroll savetarget}}
-                insert_check-result.html_(success,Success!,success)
+                    {{#rollWasFumble() saveroll}}
+                    insert_check-result.html_(failure,CRITICAL FAILURE!,fumble)
+                    {{/rollWasFumble() saveroll}}
+
+                    {{#^rollWasFumble() saveroll}}
+                    insert_check-result.html_(success,Success!,success)
+                    {{/^rollWasFumble() saveroll}}
                 {{/rollGreater() saveroll savetarget}}
 
                 {{#rollLess() saveroll savetarget}}
-                insert_check-result.html_(failure,Failed!,fail)
+                    {{#rollWasFumble() saveroll}}
+                    insert_check-result.html_(failure,CRITICAL FAILURE!,fail)
+                    {{/rollWasFumble() saveroll}}
+
+                    {{#^rollWasFumble() saveroll}}
+                    insert_check-result.html_(failure,Failed!,fail)
+                    {{/^rollWasFumble() saveroll}}
                 {{/rollLess() saveroll savetarget}}
             </table>
         </div>
@@ -349,8 +367,20 @@
                             insert_check-result.html_(success,Success!,success)
                         {{/crit}}
                     {{/rollWasCrit() checkroll}}
+
+                    {{#rollWasFumble() checkroll}}
+                        {{#fumble}}
+                            insert_check-result.html_(failure,CRITICAL FAILURE!,fumble)
+                        {{/fumble}}
+                        {{^fumble}}
+                            insert_check-result.html_(success,Success!,success)
+                        {{/fumble}}
+                    {{/rollWasFumble() checkroll}}
+
                     {{#^rollWasCrit() checkroll}}
+                    {{#^rollWasFumble() checkroll}}
                         insert_check-result.html_(success,Success!,success)
+                    {{/^rollWasFumble() checkroll}}
                     {{/^rollWasCrit() checkroll}}
                 {{/rollTotal() checkroll checktarget}}
 
@@ -363,20 +393,33 @@
                             insert_check-result.html_(success,Success!,success)
                         {{/crit}}
                     {{/rollWasCrit() checkroll}}
+
+                    {{#rollWasFumble() checkroll}}
+                        {{#fumble}}
+                            insert_check-result.html_(failure,CRITICAL FAILURE!,fumble)
+                        {{/fumble}}
+                        {{^fumble}}
+                            insert_check-result.html_(success,Success!,success)
+                        {{/fumble}}
+                    {{/rollWasFumble() checkroll}}
+
                     {{#^rollWasCrit() checkroll}}
+                    {{#^rollWasFumble() checkroll}}
                         insert_check-result.html_(success,Success!,success)
+                    {{/^rollWasFumble() checkroll}}
                     {{/^rollWasCrit() checkroll}}
                 {{/rollLess() checkroll checktarget}}
 
                 {{#rollGreater() checkroll checktarget}}
                     {{#rollWasFumble() checkroll}}
                         {{#fumble}}
-                            insert_check-result.html_(failure,CRITICAL FAILURE!,fumble)
+                            insert_check-result.html_(failure,CRITICAL FAILURE!,fail)
                         {{/fumble}}
                         {{^fumble}}
                             insert_check-result.html_(failure,Failed!,fail)
                         {{/fumble}}
                     {{/rollWasFumble() checkroll}}
+
                     {{#^rollWasFumble() checkroll}}
                         insert_check-result.html_(failure,Failed!,fail)
                     {{/^rollWasFumble() checkroll}}
diff --git a/ADnD_2E_Revised/html/shared/saving-throws.html b/ADnD_2E_Revised/html/shared/saving-throws.html
index ea2fd8a5a136..673ae5fe26d8 100644
--- a/ADnD_2E_Revised/html/shared/saving-throws.html
+++ b/ADnD_2E_Revised/html/shared/saving-throws.html
@@ -1,15 +1,15 @@
 <table class="sheet-centering" style="width: 100%;">
     <tr>
-        <td><button type="roll" name="roll_#REPLACE0#parsave" title="%{#REPLACE2##REPLACE0#parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#parsave" title="%{#REPLACE2##REPLACE0#poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#deasave" title="%{#REPLACE2##REPLACE0#deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#rodsave" title="%{#REPLACE2##REPLACE0#rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#stasave" title="%{#REPLACE2##REPLACE0#stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#wansave" title="%{#REPLACE2##REPLACE0#wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#petsave" title="%{#REPLACE2##REPLACE0#petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#polsave" title="%{#REPLACE2##REPLACE0#polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#bresave" title="%{#REPLACE2##REPLACE0#bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#spesave" title="%{#REPLACE2##REPLACE0#spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#parsave" title="%{#REPLACE2##REPLACE0#parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#partar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Para<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#parsave" title="%{#REPLACE2##REPLACE0#poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#poitar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poison<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#deasave" title="%{#REPLACE2##REPLACE0#deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#deatar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Death<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#rodsave" title="%{#REPLACE2##REPLACE0#rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#rodtar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Rod<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#stasave" title="%{#REPLACE2##REPLACE0#stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#statar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Staff<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#wansave" title="%{#REPLACE2##REPLACE0#wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#wantar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Wand<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#petsave" title="%{#REPLACE2##REPLACE0#petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#pettar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Petri<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#polsave" title="%{#REPLACE2##REPLACE0#polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#poltar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Poly<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#bresave" title="%{#REPLACE2##REPLACE0#bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#bretar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Breath<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#spesave" title="%{#REPLACE2##REPLACE0#spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=#REPLACE1#}} {{success= You made your check by [[ abs([[1d20+(@{misc-mod})]] - [[@{#REPLACE0#spetar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"><br>Spell<br>Save</button></td>
     </tr>
     <tr>
         <td><input type="text" name="attr_#REPLACE0#partar" title="@{#REPLACE2##REPLACE0#partar}" class="sheet-small"></td>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker-tab/saving-throw-button.html b/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker-tab/saving-throw-button.html
index d4e3b43d8b37..8cc3a10ee97a 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker-tab/saving-throw-button.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker-tab/saving-throw-button.html
@@ -1 +1 @@
-<button type="roll" name="roll_#REPLACE0#save" title="%{#REPLACE0#save}" value="/w gm &{template:2Esave} {{savevs=#REPLACE1#}} {{character=@{character_name}}} {{success= You made your check by [[ abs([[1d20+(@{#REPLACE0#mod})+(@{misc-mod})]] - [[@{#REPLACE0#tar}]]) ]]}} {{fail=You missed your check by $[[2]]}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
\ No newline at end of file
+<button type="roll" name="roll_#REPLACE0#save" title="%{#REPLACE0#save}" value="/w gm &{template:2Esave} {{savevs=#REPLACE1#}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{#REPLACE0#mod})+(@{misc-mod})]])-([[@{#REPLACE0#tar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
\ No newline at end of file
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html
index a722f1210f50..6a92abdd1d89 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html
@@ -14,18 +14,18 @@ <h4>Followers, Familiars and Animals</h4>
         <div class="sheet-tab-content sheet-section-follower-warrior">
             <h4>Warrior Followers</h4>
             <br>
-            <table>
+            <table class="sheet-default-header-first-row">
                 <tr>
-                    <td class="sheet-default-header">Name</td>
-                    <td class="sheet-default-header">AC</td>
-                    <td class="sheet-default-header">Race</td>
-                    <td class="sheet-default-header">Level</td>
-                    <td class="sheet-default-header">Class</td>
-                    <td class="sheet-default-header">Hit Dice</td>
-                    <td class="sheet-default-header">HP/Max</td>
-                    <td class="sheet-default-header">Units</td>
-                    <td class="sheet-default-header">Enemy AC / Base Dmg</td>
-                    <td class="sheet-default-header">Skirmish</td>
+                    <td>Name</td>
+                    <td>AC</td>
+                    <td>Race</td>
+                    <td>Level</td>
+                    <td>Class</td>
+                    <td>Hit Dice</td>
+                    <td>HP/Max</td>
+                    <td>Units</td>
+                    <td>Enemy AC / Base Dmg</td>
+                    <td>Skirmish</td>
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_henchname" title="@{henchname}" class="sheet-maxtext"></td>
@@ -43,19 +43,19 @@ <h4>Warrior Followers</h4>
             </table>
             <hr>
             <h4>Weapons</h4>
-            <table>
+            <table class="sheet-default-header-first-row">
                 <tr>
-                    <td class="sheet-default-header">Weapon Name</td>
-                    <td class="sheet-default-header"># of<br>Strikes</td>
-                    <td class="sheet-default-header">Attack<br>Adj.</td>
-                    <td class="sheet-default-header">Dam<br>Adj.</td>
-                    <td class="sheet-default-header">THAC0</td>
-                    <td class="sheet-default-header">Crit</td>
-                    <td class="sheet-default-header">Dam SM</td>
-                    <td class="sheet-default-header">Dam L</td>
-                    <td class="sheet-default-header">Range</td>
-                    <td class="sheet-default-header">Type</td>
-                    <td class="sheet-default-header">Speed</td>
+                    <td>Weapon Name</td>
+                    <td># of<br>Strikes</td>
+                    <td>Attack<br>Adj.</td>
+                    <td>Dam<br>Adj.</td>
+                    <td>THAC0</td>
+                    <td>Crit</td>
+                    <td>Dam SM</td>
+                    <td>Dam L</td>
+                    <td>Range</td>
+                    <td>Type</td>
+                    <td>Speed</td>
                 </tr>
                 <tr>
                     <td>
@@ -113,18 +113,18 @@ <h4>Weapons</h4>
             <hr>
             <hr>
             <fieldset name="repeating_hench" class="repeating_hench">
-                <table>
+                <table class="sheet-default-header-first-row">
                     <tr>
-                        <td class="sheet-default-header">Name</td>
-                        <td class="sheet-default-header">AC</td>
-                        <td class="sheet-default-header">Race</td>
-                        <td class="sheet-default-header">Level</td>
-                        <td class="sheet-default-header">Class</td>
-                        <td class="sheet-default-header">Hit Dice</td>
-                        <td class="sheet-default-header">HP/Max</td>
-                        <td class="sheet-default-header">Units</td>
-                        <td class="sheet-default-header">Enemy AC / Base Dmg</td>
-                        <td class="sheet-default-header">Skirmish</td>
+                        <td>Name</td>
+                        <td>AC</td>
+                        <td>Race</td>
+                        <td>Level</td>
+                        <td>Class</td>
+                        <td>Hit Dice</td>
+                        <td>HP/Max</td>
+                        <td>Units</td>
+                        <td>Enemy AC / Base Dmg</td>
+                        <td>Skirmish</td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_henchname1" title="@{repeating_hench_$X_henchname1}" class="sheet-maxtext"></td>
@@ -141,19 +141,19 @@ <h4>Weapons</h4>
                 </table>
                 <hr>
                 <h4>Weapons</h4>
-                <table>
+                <table class="sheet-default-header-first-row">
                     <tr>
-                        <td class="sheet-default-header">Weapon Name</td>
-                        <td class="sheet-default-header"># of<br>Strikes</td>
-                        <td class="sheet-default-header">Attack<br>Adj.</td>
-                        <td class="sheet-default-header">Dam<br>Adj.</td>
-                        <td class="sheet-default-header">THAC0</td>
-                        <td class="sheet-default-header">Crit</td>
-                        <td class="sheet-default-header">Dam SM</td>
-                        <td class="sheet-default-header">Dam L</td>
-                        <td class="sheet-default-header">Range</td>
-                        <td class="sheet-default-header">Type</td>
-                        <td class="sheet-default-header">Speed</td>
+                        <td>Weapon Name</td>
+                        <td># of<br>Strikes</td>
+                        <td>Attack<br>Adj.</td>
+                        <td>Dam<br>Adj.</td>
+                        <td>THAC0</td>
+                        <td>Crit</td>
+                        <td>Dam SM</td>
+                        <td>Dam L</td>
+                        <td>Range</td>
+                        <td>Type</td>
+                        <td>Speed</td>
                     </tr>
                     <tr>
                         <td>
@@ -216,15 +216,15 @@ <h4>Weapons</h4>
         <div class="sheet-tab-content sheet-section-follower-wizard">
             <h4>Wizard Followers</h4>
             <br>
-            <table>
+            <table class="sheet-default-header-first-row">
                 <tr>
-                    <td class="sheet-default-header">Name</td>
-                    <td class="sheet-default-header">AC</td>
-                    <td class="sheet-default-header">Race</td>
-                    <td class="sheet-default-header">Level</td>
-                    <td class="sheet-default-header">Class</td>
-                    <td class="sheet-default-header">HP/Max</td>
-                    <td class="sheet-default-header">Units</td>
+                    <td>Name</td>
+                    <td>AC</td>
+                    <td>Race</td>
+                    <td>Level</td>
+                    <td>Class</td>
+                    <td>HP/Max</td>
+                    <td>Units</td>
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_henchname2" title="@{henchname2}"></td>
@@ -244,31 +244,31 @@ <h4>Wizard Followers</h4>
             <h4>Wizard Spells</h4>
             <br>
             <div class="sheet-3colrow">
-                insert_henchmen-spells.html_(401)
-                insert_henchmen-spells.html_(402)
-                insert_henchmen-spells.html_(403)
+                insert_follower-spells.html_(401)
+                insert_follower-spells.html_(402)
+                insert_follower-spells.html_(403)
             </div>
             <br>
             <br>
             <div class="sheet-3colrow">
-                insert_henchmen-spells.html_(404)
-                insert_henchmen-spells.html_(405)
-                insert_henchmen-spells.html_(406)
+                insert_follower-spells.html_(404)
+                insert_follower-spells.html_(405)
+                insert_follower-spells.html_(406)
             </div>
             <hr>
             insert_follower-gear-notes.html_(020,021,022,023,024,025,026,027,028,029,2)
             <hr>
             <hr>
             <fieldset name="repeating_hench2" class="repeating_hench2">
-                <table>
+                <table class="sheet-default-header-first-row">
                     <tr>
-                        <td class="sheet-default-header">Name</td>
-                        <td class="sheet-default-header">AC</td>
-                        <td class="sheet-default-header">Race</td>
-                        <td class="sheet-default-header">Level</td>
-                        <td class="sheet-default-header">Class</td>
-                        <td class="sheet-default-header">HP/Max</td>
-                        <td class="sheet-default-header">Units</td>
+                        <td>Name</td>
+                        <td>AC</td>
+                        <td>Race</td>
+                        <td>Level</td>
+                        <td>Class</td>
+                        <td>HP/Max</td>
+                        <td>Units</td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_henchname22" title="@{repeating_hench2_$X_henchname22}"></td>
@@ -288,16 +288,16 @@ <h4>Wizard Spells</h4>
                 <h4>Wizard Spells</h4>
                 <br>
                 <div class="sheet-3colrow">
-                    insert_henchmen-spells.html_(407,repeating_hench2_$X_)
-                    insert_henchmen-spells.html_(408,repeating_hench2_$X_)
-                    insert_henchmen-spells.html_(409,repeating_hench2_$X_)
+                    insert_follower-spells.html_(407,repeating_hench2_$X_)
+                    insert_follower-spells.html_(408,repeating_hench2_$X_)
+                    insert_follower-spells.html_(409,repeating_hench2_$X_)
                 </div>
                 <br>
                 <br>
                 <div class="sheet-3colrow">
-                    insert_henchmen-spells.html_(410,repeating_hench2_$X_)
-                    insert_henchmen-spells.html_(411,repeating_hench2_$X_)
-                    insert_henchmen-spells.html_(412,repeating_hench2_$X_)
+                    insert_follower-spells.html_(410,repeating_hench2_$X_)
+                    insert_follower-spells.html_(411,repeating_hench2_$X_)
+                    insert_follower-spells.html_(412,repeating_hench2_$X_)
                 </div>
                 <hr>
                 insert_follower-gear-notes.html_(030,031,032,033,034,035,036,037,038,039,22,repeating_hench2_$X_)
@@ -309,15 +309,15 @@ <h4>Wizard Spells</h4>
         <div class="sheet-tab-content sheet-section-follower-priest">
             <h4>Priest Followers</h4>
             <br>
-            <table>
+            <table class="sheet-default-header-first-row">
                 <tr>
-                    <td class="sheet-default-header">Name</td>
-                    <td class="sheet-default-header">AC</td>
-                    <td class="sheet-default-header">Race</td>
-                    <td class="sheet-default-header">Level</td>
-                    <td class="sheet-default-header">Class</td>
-                    <td class="sheet-default-header">HP/Max</td>
-                    <td class="sheet-default-header">Units</td>
+                    <td>Name</td>
+                    <td>AC</td>
+                    <td>Race</td>
+                    <td>Level</td>
+                    <td>Class</td>
+                    <td>HP/Max</td>
+                    <td>Units</td>
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_henchname3" title="@{henchname3}"></td>
@@ -337,31 +337,31 @@ <h4>Priest Followers</h4>
             <h4>Priest Spells</h4>
             <br>
             <div class="sheet-3colrow">
-                insert_henchmen-spells.html_(413)
-                insert_henchmen-spells.html_(414)
-                insert_henchmen-spells.html_(415)
+                insert_follower-spells.html_(413)
+                insert_follower-spells.html_(414)
+                insert_follower-spells.html_(415)
             </div>
             <br>
             <br>
             <div class="sheet-3colrow">
-                insert_henchmen-spells.html_(416)
-                insert_henchmen-spells.html_(417)
-                insert_henchmen-spells.html_(418)
+                insert_follower-spells.html_(416)
+                insert_follower-spells.html_(417)
+                insert_follower-spells.html_(418)
             </div>
             <hr>
             insert_follower-gear-notes.html_(040,041,042,043,044,045,046,047,048,049,3)
             <hr>
             <hr>
             <fieldset name="repeating_hench3" class="repeating_hench3">
-                <table>
+                <table class="sheet-default-header-first-row">
                     <tr>
-                        <td class="sheet-default-header">Name</td>
-                        <td class="sheet-default-header">AC</td>
-                        <td class="sheet-default-header">Race</td>
-                        <td class="sheet-default-header">Level</td>
-                        <td class="sheet-default-header">Class</td>
-                        <td class="sheet-default-header">HP/Max</td>
-                        <td class="sheet-default-header">Units</td>
+                        <td>Name</td>
+                        <td>AC</td>
+                        <td>Race</td>
+                        <td>Level</td>
+                        <td>Class</td>
+                        <td>HP/Max</td>
+                        <td>Units</td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_henchname33" title="@{repeating_hench3_$X_henchname33}"></td>
@@ -381,16 +381,16 @@ <h4>Priest Spells</h4>
                 <h4>Priest Spells</h4>
                 <br>
                 <div class="sheet-3colrow">
-                    insert_henchmen-spells.html_(419,repeating_hench3_$X_)
-                    insert_henchmen-spells.html_(420,repeating_hench3_$X_)
-                    insert_henchmen-spells.html_(421,repeating_hench3_$X_)
+                    insert_follower-spells.html_(419,repeating_hench3_$X_)
+                    insert_follower-spells.html_(420,repeating_hench3_$X_)
+                    insert_follower-spells.html_(421,repeating_hench3_$X_)
                 </div>
                 <br>
                 <br>
                 <div class="sheet-3colrow">
-                    insert_henchmen-spells.html_(422,repeating_hench3_$X_)
-                    insert_henchmen-spells.html_(423,repeating_hench3_$X_)
-                    insert_henchmen-spells.html_(424,repeating_hench3_$X_)
+                    insert_follower-spells.html_(422,repeating_hench3_$X_)
+                    insert_follower-spells.html_(423,repeating_hench3_$X_)
+                    insert_follower-spells.html_(424,repeating_hench3_$X_)
                 </div>
                 <hr>
                 insert_follower-gear-notes.html_(050,051,052,053,054,055,056,057,058,059,3,repeating_hench3_$X_)
@@ -402,15 +402,15 @@ <h4>Priest Spells</h4>
         <div class="sheet-tab-content sheet-section-follower-rogue">
             <h4>Rogue Followers</h4>
             <br>
-            <table>
+            <table class="sheet-default-header-first-row">
                 <tr>
-                    <td class="sheet-default-header">Name</td>
-                    <td class="sheet-default-header">AC</td>
-                    <td class="sheet-default-header">Race</td>
-                    <td class="sheet-default-header">Level</td>
-                    <td class="sheet-default-header">Class</td>
-                    <td class="sheet-default-header">HP/Max</td>
-                    <td class="sheet-default-header">Units</td>
+                    <td>Name</td>
+                    <td>AC</td>
+                    <td>Race</td>
+                    <td>Level</td>
+                    <td>Class</td>
+                    <td>HP/Max</td>
+                    <td>Units</td>
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_henchname4" title="@{henchname4}"></td>
@@ -438,260 +438,70 @@ <h4>Rogue Skills</h4>
                 <input type="text" name="attr_backstabmultiplier2" title="@{backstabmultiplier2}" class="sheet-tiny">
                 <br>
                 <br>
-                <div class="sheet-tab-content sheet-section-rogue-standard-hench">
-                    <table class="sheet-default-header-first-row sheet-default-header-first-column sheet-table-white">
-                        <tr>
-                            <td>Skill</td>
-                            <td>Base</td>
-                            <td>Race</td>
-                            <td>Dex</td>
-                            <td>Kit</td>
-                            <td>Magic</td>
-                            <td>Armor**</td>
-                            <td>Level</td>
-                            <td colspan="3">Total</td>
-                        </tr>
-                        <tr>
-                            <td>Pick Pockets</td>
-                            <td><input type="text" name="attr_ppb2" title="@{ppb2}" class="sheet-short" value="0"/>%</td>
-                            <td><input type="text" name="attr_ppr2" title="@{ppr2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ppd2" title="@{ppd2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ppk2" title="@{ppk2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ppm2" title="@{ppm2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ppa2" title="@{ppa2}" value="-0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ppl2" title="@{ppl2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ppt2" title="@{ppt2}" value="(@{ppb2})+(@{ppr2})+(@{ppd2})+(@{ppk2})+(@{ppm2})+(@{ppa2})+(@{ppl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_pp2" title="%{pp2}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ppt2}]]}}">Armor</button></td>
-                            <td><button type="roll" name="roll_ppnoarmor2" title="%{ppnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ppb2})+(@{ppr2})+(@{ppd2})+(@{ppk2})+(@{ppm2})+(@{ppl2})+5]]}}">No Armor</button></td>
-                        </tr>
-                        <tr>
-                            <td>Open Locks</td>
-                            <td><input type="text" name="attr_olb2" title="@{olb2}" class="sheet-short" value="0"/>%</td>
-                            <td><input type="text" name="attr_olr2" title="@{olr2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_old2" title="@{old2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_olk2" title="@{olk2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_olm2" title="@{olm2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ola2" title="@{ola2}" value="-0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_oll2" title="@{oll2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_olt2" title="@{olt2}" value="(@{olb2})+(@{olr2})+(@{old2})+(@{olk2})+(@{olm2})+(@{ola2})+(@{oll2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_ol2" title="%{ol2}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{olt2}]]}}">Armor</button></td>
-                            <td><button type="roll" name="roll_olnoarmor2" title="%{olnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{olb2})+(@{olr2})+(@{old2})+(@{olk2})+(@{olm2})+(@{oll2})]]}}">No Armor</button></td>
-                        </tr>
-                        <tr>
-                            <td>Find/Remove Traps</td>
-                            <td><input type="text" name="attr_rtb2" title="@{rtb2}" class="sheet-short" value="0"/>%</td>
-                            <td><input type="text" name="attr_rtr2" title="@{rtr2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_rtd2" title="@{rtd2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_rtk2" title="@{rtk2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_rtm2" title="@{rtm2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_rta2" title="@{rta2}" value="-0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_rtl2" title="@{rtl2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_rtt2" title="@{rtt2}" value="(@{rtb2})+(@{rtr2})+(@{rtd2})+(@{rtk2})+(@{rtm2})+(@{rta2})+(@{rtl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_rt2" title="%{rt2}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{rtt2}]]}}">Armor</button></td>
-                            <td><button type="roll" name="roll_rtnoarmor2" title="%{rtnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{rtb2})+(@{rtr2})+(@{rtd2})+(@{rtk2})+(@{rtm2})+(@{rtl2})]]}}">No Armor</button></td>
-                        </tr>
-                        <tr>
-                            <td>Move Silently</td>
-                            <td><input type="text" name="attr_msb2" title="@{msb2}" class="sheet-short" value="0"/>%</td>
-                            <td><input type="text" name="attr_msr2" title="@{msr2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_msd2" title="@{msd2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_msk2" title="@{msk2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_msm2" title="@{msm2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_msa2" title="@{msa2}" value="-0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_msl2" title="@{msl2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_mst2" title="@{mst2}" value="(@{msb2})+(@{msr2})+(@{msd2})+(@{msk2})+(@{msm2})+(@{msa2})+(@{msl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_ms2" title="%{ms2}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{mst2}]]}}">Armor</button></td>
-                            <td><button type="roll" name="roll_msnoarmor2" title="%{msnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{msb2})+(@{msr2})+(@{msd2})+(@{msk2})+(@{msm2})+(@{msl2})+10]]}}">No Armor</button></td>
-                        </tr>
-                        <tr>
-                            <td>Hide in Shadows</td>
-                            <td><input type="text" name="attr_hsb2" title="@{hsb2}" class="sheet-short" value="0"/>%</td>
-                            <td><input type="text" name="attr_hsr2" title="@{hsr2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_hsd2" title="@{hsd2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_hsk2" title="@{hsk2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_hsm2" title="@{hsm2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_hsa2" title="@{hsa2}" value="-0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_hsl2" title="@{hsl2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_hst2" title="@{hst2}" value="(@{hsb2})+(@{hsr2})+(@{hsd2})+(@{hsk2})+(@{hsm2})+(@{hsa2})+(@{hsl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_hs2" title="%{hs2}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{hst2}]]}}">Armor</button></td>
-                            <td><button type="roll" name="roll_hsnoarmor2" title="%{hsnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{hsb2})+(@{hsr2})+(@{hsd2})+(@{hsk2})+(@{hsm2})+(@{hsl2})+5]]}}">No Armor</button></td>
-                        </tr>
-                        <tr>
-                            <td>Detect Noise</td>
-                            <td><input type="text" name="attr_dnb2" title="@{dnb2}" class="sheet-short" value="0"/>%</td>
-                            <td><input type="text" name="attr_dnr2" title="@{dnr2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dnd2" title="@{dnd2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dnk2" title="@{dnk2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dnm2" title="@{dnm2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dna2" title="@{dna2}" value="-0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dnl2" title="@{dnl2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dnt2" title="@{dnt2}" value="(@{dnb2})+(@{dnr2})+(@{dnd2})+(@{dnk2})+(@{dnm2})+(@{dna2})+(@{dnl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_dn2" title="%{dn2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dnt2}]]}}">Armor</button></td>
-                            <td><button type="roll" name="roll_dnnoarmor2" title="%{dnnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dnb2})+(@{dnr2})+(@{dnd2})+(@{dnk2})+(@{dnm2})+(@{dnl2})]]}}">No Armor</button></td>
-                        </tr>
-                        <tr>
-                            <td>Climb Walls</td>
-                            <td><input type="text" name="attr_cwb2" title="@{cwb2}" class="sheet-short" value="0"/>%</td>
-                            <td><input type="text" name="attr_cwr2" title="@{cwr2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_cwd2" title="@{cwd2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_cwk2" title="@{cwk2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_cwm2" title="@{cwm2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_cwa2" title="@{cwa2}" value="-0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_cwl2" title="@{cwl2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_cwt2" title="@{cwt2}" value="(@{cwb2})+(@{cwr2})+(@{cwd2})+(@{cwk2})+(@{cwm2})+(@{cwa2})+(@{cwl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_cw2" title="%{cw2}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{cwt2}]]}}">Armor</button></td>
-                            <td><button type="roll" name="roll_cwnoarmor2" title="%{cwnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{cwb2})+(@{cwr2})+(@{cwd2})+(@{cwk2})+(@{cwm2})+(@{cwl2})+10]]}}">No Armor</button></td>
-                        </tr>
-                        <tr>
-                            <td>Read Languages</td>
-                            <td><input type="text" name="attr_rlb2" title="@{rlb2}" class="sheet-short" value="0"/>%</td>
-                            <td><input type="text" name="attr_rlr2" title="@{rlr2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_rld2" title="@{rld2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_rlk2" title="@{rlk2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_rlm2" title="@{rlm2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_rla2" title="@{rla2}" value="-0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_rll2" title="@{rll2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_rlt2" title="@{rlt2}" value="(@{rlb2})+(@{rlr2})+(@{rld2})+(@{rlk2})+(@{rlm2})+(@{rla2})+(@{rll2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_rl2" title="%{rl2}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{rlt2}]]}}">Armor</button></td>
-                            <td><button type="roll" name="roll_rlnoarmor2" title="%{rlnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{rlb2})+(@{rlr2})+(@{rld2})+(@{rlk2})+(@{rlm2})+(@{rll2})]]}}">No Armor</button></td>
-                        </tr>
-                        <tr>
-                            <td>Legend Lore</td>
-                            <td><input type="text" name="attr_ibb2" title="@{ibb2}" class="sheet-short" value="0"/>%</td>
-                            <td><input type="text" name="attr_ibr2" title="@{ibr2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ibd2" title="@{ibd2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ibk2" title="@{ibk2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ibm2" title="@{ibm2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_iba2" title="@{iba2}" value="-0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ibl2" title="@{ibl2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ibt2" title="@{ibt2}" value="(@{ibb2})+(@{ibr2})+(@{ibd2})+(@{ibk2})+(@{ibm2})+(@{iba2})+(@{ibl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_ib2" title="%{ib2}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ibt2}]]}}">Armor</button></td>
-                            <td><button type="roll" name="roll_ibnoarmor2" title="%{ibnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ibb2})+(@{ibr2})+(@{ibd2})+(@{ibk2})+(@{ibm2})+(@{ibl2})]]}}">No Armor</button></td>
-                        </tr>
-                    </table>
-                </div>
+                <table class="sheet-default-header-first-row sheet-default-header-first-column sheet-table-white">
+                    <tr>
+                        <td>Skill</td>
+                        <td>Base</td>
+                        <td>Race</td>
+                        <td>Dex</td>
+                        <td>Kit</td>
+                        <td>Magic</td>
+                        <td>Armor</td>
+                        <td>Level</td>
+                        <td>Total</td>
+                        <td>
+                            <input type="text" name="attr_armorname2" title="@{armorname2}" class="sheet-table-dynamic sheet-chrome" placeholder="Select Armor Type" list="rogue-armor"/>
+                            <input type="text" name="attr_armorname2" title="@{armorname2}" class="sheet-table-dynamic sheet-firefox" placeholder="Select Armor Type" list="rogue-armor-ff"/>
+                        </td>
+                    </tr>
+                    insert_follower-rogue-skill.html_(Pick Pockets,pp)
+                    insert_follower-rogue-skill.html_(Open Locks,ol)
+                    insert_follower-rogue-skill.html_(Find/Remove Traps,rt)
+                    insert_follower-rogue-skill.html_(Move Silently,ms)
+                    insert_follower-rogue-skill.html_(Hide in Shadows,hs)
+                    insert_follower-rogue-skill.html_(Detect Noise,dn)
+                    insert_follower-rogue-skill.html_(Climb Walls,cw)
+                    insert_follower-rogue-skill.html_(Read Languages,rl)
+                    insert_follower-rogue-skill.html_(Legend Lore,ib)
+                </table>
                 <div class="sheet-tab-content sheet-section-rogue-spds-hench">
                     <table class="sheet-default-header-first-row sheet-default-header-first-column sheet-table-white">
-                        <tr>
-                            <td>Skill</td>
+                        <tr class="sheet-collapse">
+                            <td>Find/Remove Traps</td>
                             <td>Base</td>
                             <td>Race</td>
                             <td>Dex</td>
                             <td>Kit</td>
                             <td>Magic</td>
-                            <td>Armor**</td>
+                            <td>Armor</td>
                             <td>Level</td>
-                            <td colspan="3">Total</td>
-                        </tr>
-                        <tr>
-                            <td>Detect Magic*</td>
-                            <td><input type="text" name="attr_dmb2" title="@{dmb2}" class="sheet-short" value="0"/>%</td>
-                            <td><input type="text" name="attr_dmr2" title="@{dmr2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dmd2" title="@{dmd2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dmk2" title="@{dmk2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dmm2" title="@{dmm2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dma2" title="@{dma2}" value="-0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dml2" title="@{dml2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dmt2" title="@{dmt2}" value="(@{dmb2})+(@{dmr2})+(@{dmd2})+(@{dmk2})+(@{dmm2})+(@{dma2})+(@{dml2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_dm2" title="%{dm2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dmt2}]]}}">Armor</button></td>
-                            <td><button type="roll" name="roll_dmnoarmor2" title="%{dmnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dmb2})+(@{dmr2})+(@{dmd2})+(@{dmk2})+(@{dmm2})+(@{dml2})]]}}">No Armor</button></td>
-                        </tr>
-                        <tr>
-                            <td>Detect Illusion*</td>
-                            <td><input type="text" name="attr_dib2" title="@{dib2}" class="sheet-short" value="0"/>%</td>
-                            <td><input type="text" name="attr_dir2" title="@{dir2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_did2" title="@{did2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dik2" title="@{dik2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dim2" title="@{dim2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dia2" title="@{dia2}" value="-0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dil2" title="@{dil2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_dit2" title="@{dit2}" value="(@{dib2})+(@{dir2})+(@{did2})+(@{dik2})+(@{dim2})+(@{dia2})+(@{dil2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_di2" title="%{di2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dit2}]]}}">Armor</button></td>
-                            <td><button type="roll" name="roll_dinoarmor2" title="%{dinoarmor}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dib2})+(@{dir2})+(@{did2})+(@{dik2})+(@{dim2})+(@{dil2})]]}}">No Armor</button></td>
-                        </tr>
-                        <tr>
-                            <td>Bribery*</td>
-                            <td><input type="text" name="attr_brb2" title="@{brb2}" class="sheet-short" value="0"/>%</td>
-                            <td><input type="text" name="attr_brr2" title="@{brr2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_brd2" title="@{brd2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_brk2" title="@{brk2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_brm2" title="@{brm2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_bra2" title="@{bra2}" value="-0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_brl2" title="@{brl2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_brt2" title="@{brt2}" value="(@{brb2})+(@{brr2})+(@{brd2})+(@{brk2})+(@{brm2})+(@{bra2})+(@{brl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_br2" title="%{br2}" value="/w gm &{template:2Echeck} {{checkvs=Bribe*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{brt2}]]}}">Armor</button></td>
-                            <td><button type="roll" name="roll_brnoarmor2" title="%{brnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Bribe*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{brb2})+(@{brr2})+(@{brd2})+(@{brk2})+(@{brm2})+(@{brl2})]]}}">No Armor</button></td>
-                        </tr>
-                        <tr>
-                            <td>Tunneling*</td>
-                            <td><input type="text" name="attr_tub2" title="@{tub2}" class="sheet-short" value="0"/>%</td>
-                            <td><input type="text" name="attr_tur2" title="@{tur2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_tud2" title="@{tud2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_tuk2" title="@{tuk2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_tum2" title="@{tum2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_tua2" title="@{tua2}" value="-0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_tul2" title="@{tul2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_tut2" title="@{tut2}" value="(@{tub2})+(@{tur2})+(@{tud2})+(@{tuk2})+(@{tum2})+(@{tua2})+(@{tul2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_tu2" title="%{tu2}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{tut2}]]}}">Armor</button></td>
-                            <td><button type="roll" name="roll_tunoarmor2" title="%{tunoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{tub2})+(@{tur2})+(@{tud2})+(@{tuk2})+(@{tum2})+(@{tul2})+10]]}}">No Armor</button></td>
-                        </tr>
-                        <tr>
-                            <td>Escape Bonds*</td>
-                            <td><input type="text" name="attr_ebb2" title="@{ebb2}" class="sheet-short" value="0"/>%</td>
-                            <td><input type="text" name="attr_ebr2" title="@{ebr2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ebd2" title="@{ebd2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ebk2" title="@{ebk2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ebm2" title="@{ebm2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_eba2" title="@{eba2}" value="-0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ebl2" title="@{ebl2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_ebt2" title="@{ebt2}" value="(@{ebb2})+(@{ebr2})+(@{ebd2})+(@{ebk2})+(@{ebm2})+(@{eba2})+(@{ebl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_eb2" title="%{eb2}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ebt2}]]}}">Armor</button></td>
-                            <td><button type="roll" name="roll_ebnoarmor2" title="%{ebnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ebb2})+(@{ebr2})+(@{ebd2})+(@{ebk2})+(@{ebm2})+(@{ebl2})+5]]}}">No Armor</button></td>
-                        </tr>
-                        <tr>
-                            <td>Forge Documents*</td>
-                            <td><input type="text" name="attr_fdb2" title="@{fdb2}" class="sheet-short" value="0"/>%</td>
-                            <td><input type="text" name="attr_fdr2" title="@{fdr2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_fdd2" title="@{fdd2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_fdk2" title="@{fdk2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_fdm2" title="@{fdm2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_fda2" title="@{fda2}" value="-0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_fdl2" title="@{fdl2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_fdt2" title="@{fdt2}" value="(@{fdb2})+(@{fdr2})+(@{fdd2})+(@{fdk2})+(@{fdm2})+(@{fda2})+(@{fdl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_fd2" title="%{fd2}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{fdt2}]]}}">Armor</button></td>
-                            <td><button type="roll" name="roll_fdnoarmor2" title="%{fdnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{fdb2})+(@{fdr2})+(@{fdd2})+(@{fdk2})+(@{fdm2})+(@{fdl2})]]}}">No Armor</button></td>
-                        </tr>
-                        <tr>
-                            <td>Appraise*</td>
-                            <td><input type="text" name="attr_apb2" title="@{apb2}" class="sheet-short" value="0"/>%</td>
-                            <td><input type="text" name="attr_apr2" title="@{apr2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_apd2" title="@{apd2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_apk2" title="@{apk2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_apm2" title="@{apm2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_apa2" title="@{apa2}" value="-0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_apl2" title="@{apl2}" value="0" class="sheet-short"/>%</td>
-                            <td><input type="text" name="attr_apt2" title="@{apt2}" value="(@{apb2})+(@{apr2})+(@{apd2})+(@{apk2})+(@{apm2})+(@{apa2})+(@{apl2})" disabled class="sheet-short"/>%</td>
-                            <td><button type="roll" name="roll_ap2" title="%{ap2}" value="/w gm &{template:2Echeck} {{checkvs=Appraise*}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{apt2}]]}}">Armor</button></td>
-                            <td><button type="roll" name="roll_apnoarmor2" title="%{apnoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Appraise*\n(in No Armor)}} {{character=@{henchname4}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{apb2})+(@{apr2})+(@{apd2})+(@{apk2})+(@{apm2})+(@{apl2})]]}}">No Armor</button></td>
+                            <td>Total</td>
+                            <td><button class="btn sheet-action-button-roll">Find/Remove Traps</button></td>
                         </tr>
+                        insert_follower-rogue-skill.html_(Detect Magic,dm)
+                        insert_follower-rogue-skill.html_(Detect Illusion,di)
+                        insert_follower-rogue-skill.html_(Bribe,br)
+                        insert_follower-rogue-skill.html_(Tunneling,tu)
+                        insert_follower-rogue-skill.html_(Escape Bonds,eb)
+                        insert_follower-rogue-skill.html_(Forge Documents,fd)
+                        insert_follower-rogue-skill.html_(Appraisal,ap)
                     </table>
                 </div>
-                <label>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</label>
             </div>
             <hr>
             insert_follower-gear-notes.html_(060,061,062,063,064,065,066,067,068,069,4)
             <hr>
             <hr>
             <fieldset name="repeating_hench4" class="repeating_hench4">
-                <table>
+                <table class="sheet-default-header-first-row">
                     <tr>
-                        <td class="sheet-default-header">Name</td>
-                        <td class="sheet-default-header">AC</td>
-                        <td class="sheet-default-header">Race</td>
-                        <td class="sheet-default-header">Level</td>
-                        <td class="sheet-default-header">Class</td>
-                        <td class="sheet-default-header">HP/Max</td>
-                        <td class="sheet-default-header">Units</td>
+                        <td>Name</td>
+                        <td>AC</td>
+                        <td>Race</td>
+                        <td>Level</td>
+                        <td>Class</td>
+                        <td>HP/Max</td>
+                        <td>Units</td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_henchname44" title="@{repeating_hench4_$X_henchname44}"></td>
@@ -716,248 +526,58 @@ <h4>Rogue Skills</h4>
                     <br>
                     <br>
                     <label>Backstab Multiplier:</label>
-                    <input type="text" name="attr_backstabmultiplier22" title="@{backstabmultiplier22}" class="sheet-tiny">
+                    <input type="text" name="attr_backstabmultiplier22" title="@{repeating_hench4_$X_backstabmultiplier22}" class="sheet-tiny">
                     <br>
                     <br>
-                    <div class="sheet-tab-content sheet-section-rogue-standard-repeat">
-                        <table class="sheet-default-header-first-row sheet-default-header-first-column sheet-table-white">
-                            <tr>
-                                <td>Skill</td>
-                                <td>Base</td>
-                                <td>Race</td>
-                                <td>Dex</td>
-                                <td>Kit</td>
-                                <td>Magic</td>
-                                <td>Armor**</td>
-                                <td>Level</td>
-                                <td colspan="3">Total</td>
-                            </tr>
-                            <tr>
-                                <td>Pick Pockets</td>
-                                <td><input type="text" name="attr_ppb22" title="@{repeating_hench4_$X_ppb22}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_ppr22" title="@{repeating_hench4_$X_ppr22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ppd22" title="@{repeating_hench4_$X_ppd22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ppk22" title="@{repeating_hench4_$X_ppk22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ppm22" title="@{repeating_hench4_$X_ppm22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ppa22" title="@{repeating_hench4_$X_ppa22}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ppl22" title="@{repeating_hench4_$X_ppl22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ppt22" title="@{repeating_hench4_$X_ppt22}" value="(@{ppb22})+(@{ppr22})+(@{ppd22})+(@{ppk22})+(@{ppm22})+(@{ppa22})+(@{ppl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_pp22" title="%{repeating_hench4_$X_pp22}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ppt22}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_ppnoarmor22" title="%{repeating_hench4_$X_ppnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Pick Pockets\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ppb22})+(@{ppr22})+(@{ppd22})+(@{ppk22})+(@{ppm22})+(@{ppl22})+5]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Open Locks</td>
-                                <td><input type="text" name="attr_olb22" title="@{repeating_hench4_$X_olb22}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_olr22" title="@{repeating_hench4_$X_olr22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_old22" title="@{repeating_hench4_$X_old22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_olk22" title="@{repeating_hench4_$X_olk22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_olm22" title="@{repeating_hench4_$X_olm22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ola22" title="@{repeating_hench4_$X_ola22}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_oll22" title="@{repeating_hench4_$X_oll22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_olt22" title="@{repeating_hench4_$X_olt22}" value="(@{olb22})+(@{olr22})+(@{old22})+(@{olk22})+(@{olm22})+(@{ola22})+(@{oll22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_ol22" title="%{repeating_hench4_$X_ol22}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{olt22}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_olnoarmor22" title="%{repeating_hench4_$X_olnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Open Locks\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{olb22})+(@{olr22})+(@{old22})+(@{olk22})+(@{olm22})+(@{oll22})]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Find/Remove Traps</td>
-                                <td><input type="text" name="attr_rtb22" title="@{repeating_hench4_$X_rtb22}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_rtr22" title="@{repeating_hench4_$X_rtr22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rtd22" title="@{repeating_hench4_$X_rtd22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rtk22" title="@{repeating_hench4_$X_rtk22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rtm22" title="@{repeating_hench4_$X_rtm22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rta22" title="@{repeating_hench4_$X_rta22}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rtl22" title="@{repeating_hench4_$X_rtl22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rtt22" title="@{repeating_hench4_$X_rtt22}" value="(@{rtb22})+(@{rtr22})+(@{rtd22})+(@{rtk22})+(@{rtm22})+(@{rta22})+(@{rtl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_rt22" title="%{repeating_hench4_$X_rt22}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{rtt22}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_rtnoarmor22" title="%{repeating_hench4_$X_rtnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Find/Remove Traps\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{rtb22})+(@{rtr22})+(@{rtd22})+(@{rtk22})+(@{rtm22})+(@{rtl22})]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Move Silently</td>
-                                <td><input type="text" name="attr_msb22" title="@{repeating_hench4_$X_msb22}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_msr22" title="@{repeating_hench4_$X_msr22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_msd22" title="@{repeating_hench4_$X_msd22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_msk22" title="@{repeating_hench4_$X_msk22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_msm22" title="@{repeating_hench4_$X_msm22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_msa22" title="@{repeating_hench4_$X_msa22}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_msl22" title="@{repeating_hench4_$X_msl22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_mst22" title="@{repeating_hench4_$X_mst22}" value="(@{msb22})+(@{msr22})+(@{msd22})+(@{msk22})+(@{msm22})+(@{msa22})+(@{msl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_ms22" title="%{repeating_hench4_$X_ms22}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{mst22}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_msnoarmor22" title="%{repeating_hench4_$X_msnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Move Silently\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{msb22})+(@{msr22})+(@{msd22})+(@{msk22})+(@{msm22})+(@{msl22})+10]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Hide in Shadows</td>
-                                <td><input type="text" name="attr_hsb22" title="@{repeating_hench4_$X_hsb22}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_hsr22" title="@{repeating_hench4_$X_hsr22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_hsd22" title="@{repeating_hench4_$X_hsd22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_hsk22" title="@{repeating_hench4_$X_hsk22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_hsm22" title="@{repeating_hench4_$X_hsm22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_hsa22" title="@{repeating_hench4_$X_hsa22}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_hsl22" title="@{repeating_hench4_$X_hsl22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_hst22" title="@{repeating_hench4_$X_hst22}" value="(@{hsb22})+(@{hsr22})+(@{hsd22})+(@{hsk22})+(@{hsm22})+(@{hsa22})+(@{hsl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_hs22" title="%{repeating_hench4_$X_hs22}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{hst22}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_hsnoarmor22" title="%{repeating_hench4_$X_hsnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Hide in Shadows\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{hsb22})+(@{hsr22})+(@{hsd22})+(@{hsk22})+(@{hsm22})+(@{hsl22})+5]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Detect Noise</td>
-                                <td><input type="text" name="attr_dnb22" title="@{repeating_hench4_$X_dnb22}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_dnr22" title="@{repeating_hench4_$X_dnr22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dnd22" title="@{repeating_hench4_$X_dnd22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dnk22" title="@{repeating_hench4_$X_dnk22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dnm22" title="@{repeating_hench4_$X_dnm22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dna22" title="@{repeating_hench4_$X_dna22}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dnl22" title="@{repeating_hench4_$X_dnl22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dnt22" title="@{repeating_hench4_$X_dnt22}" value="(@{dnb22})+(@{dnr22})+(@{dnd22})+(@{dnk22})+(@{dnm22})+(@{dna22})+(@{dnl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_dn22" title="%{repeating_hench4_$X_dn22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dnt22}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_dnnoarmor22" title="%{repeating_hench4_$X_dnnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Noise\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dnb22})+(@{dnr22})+(@{dnd22})+(@{dnk22})+(@{dnm22})+(@{dnl22})]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Climb Walls</td>
-                                <td><input type="text" name="attr_cwb22" title="@{repeating_hench4_$X_cwb22}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_cwr22" title="@{repeating_hench4_$X_cwr22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_cwd22" title="@{repeating_hench4_$X_cwd22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_cwk22" title="@{repeating_hench4_$X_cwk22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_cwm22" title="@{repeating_hench4_$X_cmw22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_cwa22" title="@{repeating_hench4_$X_cwa22}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_cwl22" title="@{repeating_hench4_$X_cwl22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_cwt22" title="@{repeating_hench4_$X_cwt22}" value="(@{cwb22})+(@{cwr22})+(@{cwd22})+(@{cwk22})+(@{cwm22})+(@{cwa22})+(@{cwl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_cw22" title="%{repeating_hench4_$X_cw22}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{cwt22}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_cwnoarmor22" title="%{repeating_hench4_$X_cwnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Climb Walls\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{cwb22})+(@{cwr22})+(@{cwd22})+(@{cwk22})+(@{cwm22})+(@{cwl22})+10]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Read Languages</td>
-                                <td><input type="text" name="attr_rlb22" title="@{repeating_hench4_$X_rlb22}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_rlr22" title="@{repeating_hench4_$X_rlr22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rld22" title="@{repeating_hench4_$X_rld22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rlk22" title="@{repeating_hench4_$X_rlk22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rlm22" title="@{repeating_hench4_$X_rlm22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rla22" title="@{repeating_hench4_$X_rla22}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rll22" title="@{repeating_hench4_$X_rll22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_rlt22" title="@{repeating_hench4_$X_rlt22}" value="(@{rlb22})+(@{rlr22})+(@{rld22})+(@{rlk22})+(@{rlm22})+(@{rla22})+(@{rll22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_rl22" title="%{repeating_hench4_$X_rl22}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{rlt22}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_rlnoarmor22" title="%{repeating_hench4_$X_rlnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Read Languages\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{rlb22})+(@{rlr22})+(@{rld22})+(@{rlk22})+(@{rlm22})+(@{rll22})]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Legend Lore</td>
-                                <td><input type="text" name="attr_ibb22" title="@{repeating_hench4_$X_ibb22}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_ibr22" title="@{repeating_hench4_$X_ibr22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ibd22" title="@{repeating_hench4_$X_ibd22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ibk22" title="@{repeating_hench4_$X_ibk22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ibm22" title="@{repeating_hench4_$X_ibm22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_iba22" title="@{repeating_hench4_$X_iba22}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ibl22" title="@{repeating_hench4_$X_ibl22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ibt22" title="@{repeating_hench4_$X_ibt22}" value="(@{ibb22})+(@{ibr22})+(@{ibd22})+(@{ibk22})+(@{ibm22})+(@{iba22})+(@{ibl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_ib22" title="%{repeating_hench4_$X_ib22}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ibt22}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_ibnoarmor22" title="%{repeating_hench4_$X_ibnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Legend Lore\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ibb22})+(@{ibr22})+(@{ibd22})+(@{ibk22})+(@{ibm22})+(@{ibl22})]]}}">No Armor</button></td>
-                            </tr>
-                        </table>
-                    </div>
+                    <table class="sheet-default-header-first-row sheet-default-header-first-column sheet-table-white">
+                        <tr>
+                            <td>Skill</td>
+                            <td>Base</td>
+                            <td>Race</td>
+                            <td>Dex</td>
+                            <td>Kit</td>
+                            <td>Magic</td>
+                            <td>Armor</td>
+                            <td>Level</td>
+                            <td>Total</td>
+                            <td>
+                                <input type="text" name="attr_armorname22" title="@{repeating_hench4_$X_armorname22}" class="sheet-table-dynamic sheet-chrome" placeholder="Select Armor Type" list="rogue-armor"/>
+                                <input type="text" name="attr_armorname22" title="@{repeating_hench4_$X_armorname22}" class="sheet-table-dynamic sheet-firefox" placeholder="Select Armor Type" list="rogue-armor-ff"/>
+                            </td>
+                        </tr>
+                        insert_follower-rogue-skill.html_(Pick Pockets,pp,repeating_hench4_$X_,2,4)
+                        insert_follower-rogue-skill.html_(Open Locks,ol,repeating_hench4_$X_,2,4)
+                        insert_follower-rogue-skill.html_(Find/Remove Traps,rt,repeating_hench4_$X_,2,4)
+                        insert_follower-rogue-skill.html_(Move Silently,ms,repeating_hench4_$X_,2,4)
+                        insert_follower-rogue-skill.html_(Hide in Shadows,hs,repeating_hench4_$X_,2,4)
+                        insert_follower-rogue-skill.html_(Detect Noise,dn,repeating_hench4_$X_,2,4)
+                        insert_follower-rogue-skill.html_(Climb Walls,cw,repeating_hench4_$X_,2,4)
+                        insert_follower-rogue-skill.html_(Read Languages,rl,repeating_hench4_$X_,2,4)
+                        insert_follower-rogue-skill.html_(Legend Lore,ib,repeating_hench4_$X_,2,4)
+                    </table>
                     <div class="sheet-tab-content sheet-section-rogue-spds-repeat">
                         <table class="sheet-default-header-first-row sheet-default-header-first-column sheet-table-white">
-                            <tr>
-                                <td>Skill</td>
+                            <tr class="sheet-collapse">
+                                <td>Find/Remove Traps</td>
                                 <td>Base</td>
                                 <td>Race</td>
                                 <td>Dex</td>
                                 <td>Kit</td>
                                 <td>Magic</td>
-                                <td>Armor**</td>
+                                <td>Armor</td>
                                 <td>Level</td>
-                                <td colspan="3">Total</td>
-                            </tr>
-                            <tr>
-                                <td>Detect Magic*</td>
-                                <td><input type="text" name="attr_dmb22" title="@{repeating_hench4_$X_dmb22}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_dmr22" title="@{repeating_hench4_$X_dmr22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dmd22" title="@{repeating_hench4_$X_dmd22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dmk22" title="@{repeating_hench4_$X_dmk22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dmm22" title="@{repeating_hench4_$X_dmm22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dma22" title="@{repeating_hench4_$X_dma22}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dml22" title="@{repeating_hench4_$X_dml22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dmt22" title="@{repeating_hench4_$X_dmt22}" value="(@{dmb22})+(@{dmr22})+(@{dmd22})+(@{dmk22})+(@{dmm22})+(@{dma22})+(@{dml22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_dm22" title="=%{repeating_hench4_$X_dm22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dmt2}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_dmnoarmor22" title="%{repeating_hench4_$X_dmnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Magic\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dmb22})+(@{dmr22})+(@{dmd22})+(@{dmk22})+(@{dmm22})+(@{dml22})]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Detect Illusion*</td>
-                                <td><input type="text" name="attr_dib22" title="@{repeating_hench4_$X_dib22}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_dir22" title="@{repeating_hench4_$X_dir22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_did22" title="@{repeating_hench4_$X_did22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dik22" title="@{repeating_hench4_$X_dik22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dim22" title="@{repeating_hench4_$X_dim22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dia22" title="@{repeating_hench4_$X_dia22}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dil22" title="@{repeating_hench4_$X_dil22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_dit22" title="@{repeating_hench4_$X_dit22}" value="(@{dib22})+(@{dir22})+(@{did22})+(@{dik22})+(@{dim22})+(@{dia22})+(@{dil22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_di22" title="%{repeating_hench4_$X_di22}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{dit22}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_dinoarmor22" title="%{repeating_hench4_$X_dinoarmor2}" value="/w gm &{template:2Echeck} {{checkvs=Detect Illusion*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{dib22})+(@{dir22})+(@{did22})+(@{dik22})+(@{dim22})+(@{dil22})]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Bribery*</td>
-                                <td><input type="text" name="attr_brb22" title="@{repeating_hench4_$X_brb22}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_brr22" title="@{repeating_hench4_$X_brr22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_brd22" title="@{repeating_hench4_$X_brd22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_brk22" title="@{repeating_hench4_$X_brk22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_brm22" title="@{repeating_hench4_$X_brm22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_bra22" title="@{repeating_hench4_$X_bra22}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_brl22" title="@{repeating_hench4_$X_brl22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_brt22" title="@{repeating_hench4_$X_brt22}" value="(@{brb22})+(@{brr22})+(@{brd22})+(@{brk22})+(@{brm22})+(@{bra22})+(@{brl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_br22" title="%{repeating_hench4_$X_br22}" value="/w gm &{template:2Echeck} {{checkvs=Bribe*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{brt22}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_brnoarmor22" title="%{repeating_hench4_$X_brnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Bribe*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{brb22})+(@{brr2})+(@{brd22})+(@{brk22})+(@{brm22})+(@{brl22})]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Tunneling*</td>
-                                <td><input type="text" name="attr_tub22" title="@{repeating_hench4_$X_tub22}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_tur22" title="@{repeating_hench4_$X_tur22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_tud22" title="@{repeating_hench4_$X_tud22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_tuk22" title="@{repeating_hench4_$X_tuk22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_tum22" title="@{repeating_hench4_$X_tum22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_tua22" title="@{repeating_hench4_$X_tua22}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_tul22" title="@{repeating_hench4_$X_tul22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_tut22" title="@{repeating_hench4_$X_tut22}" value="(@{tub22})+(@{tur22})+(@{tud22})+(@{tuk22})+(@{tum22})+(@{tua22})+(@{tul22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_tu22" title="%{repeating_hench4_$X_tu22}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{tut22}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_tunoarmor22" title="%{repeating_hench4_$X_tunoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Tunneling*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{tub22})+(@{tur22})+(@{tud22})+(@{tuk22})+(@{tum22})+(@{tul22})+10]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Escape Bonds*</td>
-                                <td><input type="text" name="attr_ebb22" title="@{repeating_hench4_$X_ebb22}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_ebr22" title="@{repeating_hench4_$X_ebr22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ebd22" title="@{repeating_hench4_$X_ebd22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ebk22" title="@{repeating_hench4_$X_ebk22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ebm22" title="@{repeating_hench4_$X_ebm22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_eba22" title="@{repeating_hench4_$X_eba22}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ebl22" title="@{repeating_hench4_$X_ebl22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_ebt22" title="@{repeating_hench4_$X_ebt22}" value="(@{ebb22})+(@{ebr22})+(@{ebd22})+(@{ebk22})+(@{ebm22})+(@{eba22})+(@{ebl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_eb22" title="%{repeating_hench4_$X_eb22}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{ebt22}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_ebnoarmor22" title="%{repeating_hench4_$X_ebnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Escape Bonds*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{ebb22})+(@{ebr22})+(@{ebd22})+(@{ebk22})+(@{ebm22})+(@{ebl22})+5]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Forge Documents*</td>
-                                <td><input type="text" name="attr_fdb22" title="@{repeating_hench4_$X_fdb22}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_fdr22" title="@{repeating_hench4_$X_fdr22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_fdd22" title="@{repeating_hench4_$X_fdd22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_fdk22" title="@{repeating_hench4_$X_fdk22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_fdm22" title="@{repeating_hench4_$X_fdm22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_fda22" title="@{repeating_hench4_$X_fda22}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_fdl22" title="@{repeating_hench4_$X_fdl22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_fdt22" title="@{repeating_hench4_$X_fdt22}" value="(@{fdb22})+(@{fdr22})+(@{fdd22})+(@{fdk22})+(@{fdm22})+(@{fda22})+(@{fdl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_fd22" title="%{repeating_hench4_$X_fd22}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{fdt22}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_fdnoarmor22" title="%{repeating_hench4_$X_fdnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Forge Documents*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{fdb22})+(@{fdr22})+(@{fdd22})+(@{fdk22})+(@{fdm22})+(@{fdl22})]]}}">No Armor</button></td>
-                            </tr>
-                            <tr>
-                                <td>Appraise*</td>
-                                <td><input type="text" name="attr_apb22" title="@{repeating_hench4_$X_apb22}" class="sheet-short" value="0"/>%</td>
-                                <td><input type="text" name="attr_apr22" title="@{repeating_hench4_$X_apr22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_apd22" title="@{repeating_hench4_$X_apd22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_apk22" title="@{repeating_hench4_$X_apk22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_apm22" title="@{repeating_hench4_$X_apm22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_apa22" title="@{repeating_hench4_$X_apa22}" value="-0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_apl22" title="@{repeating_hench4_$X_apl22}" value="0" class="sheet-short"/>%</td>
-                                <td><input type="text" name="attr_apt22" title="@{repeating_hench4_$X_apt22}" value="(@{apb22})+(@{apr22})+(@{apd22})+(@{apk22})+(@{apm22})+(@{apa22})+(@{apl22})" disabled class="sheet-short"/>%</td>
-                                <td><button type="roll" name="roll_ap22" title="%{repeating_hench4_$X_ap22}" value="/w gm &{template:2Echeck} {{checkvs=Appraise*}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[@{apt22}]]}}">Armor</button></td>
-                                <td><button type="roll" name="roll_apnoarmor22" title="%{repeating_hench4_$X_apnoarmor22}" value="/w gm &{template:2Echeck} {{checkvs=Appraise*\n(in No Armor)}} {{character=@{henchname44}}} {{checkroll=[[1d100cs<1cf>96-(@{misc-mod})]]}} {{checktarget=[[(@{apb22})+(@{apr22})+(@{apd22})+(@{apk22})+(@{apm22})+(@{apl22})]]}}">No Armor</button></td>
-                            </tr>
+                                <td>Total</td>
+                                <td><button class="btn sheet-action-button-roll">Find/Remove Traps</button></td>
+                            </tr>
+                            insert_follower-rogue-skill.html_(Detect Magic,dm,repeating_hench4_$X_,2,4)
+                            insert_follower-rogue-skill.html_(Detect Illusion,di,repeating_hench4_$X_,2,4)
+                            insert_follower-rogue-skill.html_(Bribe,br,repeating_hench4_$X_,2,4)
+                            insert_follower-rogue-skill.html_(Tunneling,tu,repeating_hench4_$X_,2,4)
+                            insert_follower-rogue-skill.html_(Escape Bonds,eb,repeating_hench4_$X_,2,4)
+                            insert_follower-rogue-skill.html_(Forge Documents,fd,repeating_hench4_$X_,2,4)
+                            insert_follower-rogue-skill.html_(Appraisal,ap,repeating_hench4_$X_,2,4)
                         </table>
                     </div>
-                    <label>**Do not apply "No Armor" bonuses! Only apply Armor Penalties!</label>
                 </div>
                 <hr>
                 insert_follower-gear-notes.html_(070,071,072,073,074,075,076,077,078,079,44,repeating_hench4_$X_)
@@ -969,15 +589,15 @@ <h4>Rogue Skills</h4>
         <div class="sheet-tab-content sheet-section-follower-psion">
             <h4>Psionic Followers</h4>
             <br>
-            <table>
+            <table class="sheet-default-header-first-row">
                 <tr>
-                    <td class="sheet-default-header">Name</td>
-                    <td class="sheet-default-header">AC</td>
-                    <td class="sheet-default-header">Race</td>
-                    <td class="sheet-default-header">Level</td>
-                    <td class="sheet-default-header">Class</td>
-                    <td class="sheet-default-header">HP/Max</td>
-                    <td class="sheet-default-header">Units</td>
+                    <td>Name</td>
+                    <td>AC</td>
+                    <td>Race</td>
+                    <td>Level</td>
+                    <td>Class</td>
+                    <td>HP/Max</td>
+                    <td>Units</td>
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_henchname5" title="@{henchname5}"></td>
@@ -995,7 +615,7 @@ <h4>Psionic Followers</h4>
             insert_saving-throws.html_(hench5,@{henchname5})
             <hr>
             <input type="radio" name="attr_tab30" class="sheet-tab sheet-tab65" value="1" checked/><span class="sheet-tab sheet-tab65">Psionic Core</span>&nbsp;
-            <input type="radio" name="attr_tab30" class="sheet-tab sheet-tab66" value="2"/><span class="sheet-tab sheet-tab66">Psionic S/P</span>
+            <input type="radio" name="attr_tab30" class="sheet-tab sheet-tab66" value="2"/><span class="sheet-tab sheet-tab66">Psionic S&P</span>
             <br>
             <br>
 
@@ -1005,945 +625,144 @@ <h4>Psionics Core</h4>
                 <label>You can use + to denote different sources of bonuses.</label>
                 <br>
                 <br>
-
-                <div class="sheet-2colrow">
-                    <div class="sheet-col">
-                        <h4><b>Telepathy Devotions</b></h4>
-                        <ul>
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_psiontelepathic500" title="@{psiontelepathic500}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod500" title="@{powerscore-nomod500}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod500" title="@{powerscore-mod500}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod500" title="@{psionic-mod500}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Telepathy-Devotion500" title="%{Telepathy-Devotion500}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod500})]]&le;[[@{powerscore-nomod500}+(@{powerscore-mod500})]] @{psiontelepathic500}"></button></td>
-                                    <td><input type="text" name="attr_psiontelepathic-macro500" title="@{psiontelepathic-macro500}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-macro500" title="%{telepathic-macro500}" value="@{psiontelepathic-macro500}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost600" title="@{PSP-cost600}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psiontelepathic501" title="@{psiontelepathic501}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod501" title="@{powerscore-nomod501}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod501" title="@{powerscore-mod501}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod501" title="@{psionic-mod501}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Telepathy-Devotion501" title="%{Telepathy-Devotion501}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod501})]]&le;[[@{powerscore-nomod501}+(@{powerscore-mod501})]] @{psiontelepathic501}"></button></td>
-                                    <td><input type="text" name="attr_psiontelepathic-macro501" title="@{psiontelepathic-macro501}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-macro501" title="%{telepathic-macro501}" value="@{psiontelepathic-macro501}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost601" title="@{PSP-cost601}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psiontelepathic502" title="@{psiontelepathic502}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod502" title="@{powerscore-nomod502}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod502" title="@{powerscore-mod502}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod502" title="@{psionic-mod502}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Telepathy-Devotion502" title="%{Telepathy-Devotion502}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod502})]]&le;[[@{powerscore-nomod502}+(@{powerscore-mod502})]] @{psiontelepathic502}"></button></td>
-                                    <td><input type="text" name="attr_psiontelepathic-macro502" title="@{psiontelepathic-macro502}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-macro502" title="%{telepathic-macro502}" value="@{psiontelepathic-macro502}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost602" title="@{PSP-cost602}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </ul>
-                    </div>
-                    <div class="sheet-col">
-                        <h4><b>Telepathy Sciences</b></h4>
-                        <ul>
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_telepathic-science503" title="@{telepathic-science503}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod503" title="@{powerscore-nomod503}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod503" title="@{powerscore-mod503}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod503" title="@{psionic-mod503}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Telepathy-Science503" title="%{Telepathy-Science503}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod503})]]&le;[[@{powerscore-nomod503}+(@{powerscore-mod503})]] @{telepathic-science503}"></button></td>
-                                    <td><input type="text" name="attr_psiontelepathic-science-macro503" title="@{psiontelepathic-science-macro503}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-science-macro503" title="%{telepathic-science-macro503}" value="@{psiontelepathic-science-macro503}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost603" title="@{PSP-cost603}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_telepathic-science504" title="@{telepathic-science504}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod504" title="@{powerscore-nomod504}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod504" title="@{powerscore-mod504}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod504" title="@{psionic-mod504}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Telepathy-Science504" title="%{Telepathy-Science504}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod504})]]&le;[[@{powerscore-nomod504}+(@{powerscore-mod504})]] @{telepathic-science504}"></button></td>
-                                    <td><input type="text" name="attr_psiontelepathic-science-macro504" title="@{psiontelepathic-science-macro504}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-science-macro504" title="%{telepathic-science-macro504}" value="@{psiontelepathic-science-macro504}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost604" title="@{PSP-cost604}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_telepathic-science505" title="@{telepathic-science505}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod505" title="@{powerscore-nomod505}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod505" title="@{powerscore-mod505}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod505" title="@{psionic-mod505}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Telepathy-Science505" title="%{Telepathy-Science505}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod505})]]&le;[[@{powerscore-nomod505}+(@{powerscore-mod505})]] @{telepathic-science505}"></button></td>
-                                    <td><input type="text" name="attr_psiontelepathic-science-macro505" title="@{psiontelepathic-science-macro505}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-science-macro505" title="%{telepathic-science-macro505}" value="@{psiontelepathic-science-macro505}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost605" title="@{PSP-cost605}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </ul>
-                    </div>
-                </div>
-                <br>
-                <div class="sheet-2colrow">
-                    <div class="sheet-col">
-                        <h4><b>Psychokinesis Devotions</b></h4>
-                        <ul>
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_psionkinetic506" title="@{psionkinetic506}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod506" title="@{powerscore-nomod506}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod506" title="@{powerscore-mod506}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod506" title="@{psionic-mod506}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Kinetic-Devotion506" title="%{Kinetic-Devotion506}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod506})]]&le;[[@{powerscore-nomod506}+(@{powerscore-mod506})]] @{psionkinetic506}"></button></td>
-                                    <td><input type="text" name="attr_psionkinetic-macro506" title="@{psionkinetic-macro506}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-macro506" title="%{kinetic-macro506}" value="@{psionkinetic-macro506}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost606" title="@{PSP-cost606}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionkinetic507" title="@{psionkinetic507}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod507" title="@{powerscore-nomod507}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod507" title="@{powerscore-mod507}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod507" title="@{psionic-mod507}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Kinetic-Devotion507" title="%{Kinetic-Devotion507}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod507})]]&le;[[@{powerscore-nomod507}+(@{powerscore-mod507})]] @{psionkinetic507}"></button></td>
-                                    <td><input type="text" name="attr_psionkinetic-macro507" title="@{psionkinetic-macro507}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-macro507" title="%{kinetic-macro507}" value="@{psionkinetic-macro507}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost607" title="@{PSP-cost607}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionkinetic508" title="@{psionkinetic508}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod508" title="@{powerscore-nomod508}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod508" title="@{powerscore-mod508}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod508" title="@{psionic-mod508}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Kinetic-Devotion508" title="%{Kinetic-Devotion508}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod508})]]&le;[[@{powerscore-nomod508}+(@{powerscore-mod508})]] @{psionkinetic508}"></button></td>
-                                    <td><input type="text" name="attr_psionkinetic-macro508" title="@{psionkinetic-macro508}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-macro508" title="%{kinetic-macro508}" value="@{psionkinetic-macro508}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost608" title="@{PSP-cost608}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </ul>
-                    </div>
-                    <div class="sheet-col">
-                        <h4><b>Psychokinesis Sciences</b></h4>
-                        <ul>
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_kinetic-science509" title="@{kinetic-science509}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod509" title="@{powerscore-nomod509}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod509" title="@{powerscore-mod509}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod509" title="@{psionic-mod509}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Kinetic-Science509" title="%{Kinetic-Science509}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod509})]]&le;[[@{powerscore-nomod509}+(@{powerscore-mod509})]] @{kinetic-science509}"></button></td>
-                                    <td><input type="text" name="attr_psionkinetic-science-macro509" title="@{psionkinetic-science-macro509}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-science-macro509" title="%{kinetic-science-macro509}" value="@{psionkinetic-science-macro509}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost609" title="@{PSP-cost609}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_kinetic-science510" title="@{kinetic-science510}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod510" title="@{powerscore-nomod510}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod510" title="@{powerscore-mod510}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod510" title="@{psionic-mod510}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Kinetic-Science510" title="%{Kinetic-Science510}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod510})]]&le;[[@{powerscore-nomod510}+(@{powerscore-mod510})]] @{kinetic-science510}"></button></td>
-                                    <td><input type="text" name="attr_psionkinetic-science-macro510" title="@{psionkinetic-science-macro510}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-science-macro510" title="%{kinetic-science-macro510}" value="@{psionkinetic-science-macro510}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost610" title="@{PSP-cost610}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_kinetic-science511" title="@{kinetic-science511}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod511" title="@{powerscore-nomod511}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod511" title="@{powerscore-mod511}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod511" title="@{psionic-mod511}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Kinetic-Science511" title="%{Kinetic-Science511}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod511})]]&le;[[@{powerscore-nomod511}+(@{powerscore-mod511})]] @{kinetic-science511}"></button></td>
-                                    <td><input type="text" name="attr_psionkinetic-science-macro511" title="@{psionkinetic-science-macro511}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-science-macro511" title="%{kinetic-science-macro511}" value="@{psionkinetic-science-macro511}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost611" title="@{PSP-cost611}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </ul>
-                    </div>
-                </div>
-                <br>
-                <div class="sheet-2colrow">
-                    <div class="sheet-col">
-                        <h4><b>Psychoportive Devotions</b></h4>
-                        <ul>
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_psionportation512" title="@{psionportation512}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod512" title="@{powerscore-nomod512}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod512" title="@{powerscore-mod512}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod512" title="@{psionic-mod512}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Portation-Devotion512" title="%{Portation-Devotion512}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod512})]]&le;[[@{powerscore-nomod512}+(@{powerscore-mod512})]] @{psionportation512}"></button></td>
-                                    <td><input type="text" name="attr_psionportation-macro512" title="@{psionportation-macro512}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-macro512" title="%{portation-macro512}" value="@{psionportation-macro512}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost612" title="@{PSP-cost612}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionportation513" title="@{psionportation513}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod513" title="@{powerscore-nomod513}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod513" title="@{powerscore-mod513}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod513" title="@{psionic-mod513}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Portation-Devotion513" title="%{Portation-Devotion513}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod513})]]&le;[[@{powerscore-nomod513}+(@{powerscore-mod513})]] @{psionportation513}"></button></td>
-                                    <td><input type="text" name="attr_psionportation-macro513" title="@{psionportation-macro513}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-macro513" title="%{portation-macro513}" value="@{psionportation-macro513}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost613" title="@{PSP-cost613}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionportation514" title="@{psionportation514}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod514" title="@{powerscore-nomod514}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod514" title="@{powerscore-mod514}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod514" title="@{psionic-mod514}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Portation-Devotion514" title="%{Portation-Devotion514}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod514})]]&le;[[@{powerscore-nomod514}+(@{powerscore-mod514})]] @{psionportation514}"></button></td>
-                                    <td><input type="text" name="attr_psionportation-macro514" title="@{psionportation-macro514}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-macro514" title="%{portation-macro514}" value="@{psionportation-macro514}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost614" title="@{PSP-cost614}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </ul>
-                    </div>
-                    <div class="sheet-col">
-                        <h4><b>Psychoportive Sciences</b></h4>
-                        <ul>
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_portation-science515" title="@{portation-science515}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod515" title="@{powerscore-nomod515}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod515" title="@{powerscore-mod515}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod515" title="@{psionic-mod515}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Portation-Science515" title="%{Portation-Science515}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod515})]]&le;[[@{powerscore-nomod515}+(@{powerscore-mod515})]] @{portation-science515}"></button></td>
-                                    <td><input type="text" name="attr_psionportation-science-macro515" title="@{psionportation-science-macro515}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-science-macro515" title="%{portation-science-macro515}" value="@{psionportation-science-macro515}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost615" title="@{PSP-cost615}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_portation-science516" title="@{portation-science516}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod516" title="@{powerscore-nomod516}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod516" title="@{powerscore-mod516}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod516" title="@{psionic-mod516}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Portation-Science516" title="%{Portation-Science516}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod516})]]&le;[[@{powerscore-nomod516}+(@{powerscore-mod516})]] @{portation-science516}"></button></td>
-                                    <td><input type="text" name="attr_psionportation-science-macro516" title="@{psionportation-science-macro516}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-science-macro516" title="%{portation-science-macro516}" value="@{psionportation-science-macro516}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost616" title="@{PSP-cost616}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_portation-science517" title="@{portation-science517}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod517" title="@{powerscore-nomod517}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod517" title="@{powerscore-mod517}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod517" title="@{psionic-mod517}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Portation-Science517" title="%{Portation-Science517}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod517})]]&le;[[@{powerscore-nomod517}+(@{powerscore-mod517})]] @{portation-science517}"></button></td>
-                                    <td><input type="text" name="attr_psionportation-science-macro517" title="@{psionportation-science-macro517}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-science-macro517" title="%{portation-science-macro517}" value="@{psionportation-science-macro517}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost617" title="@{PSP-cost617}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </ul>
-                    </div>
-                </div>
-                <br>
-                <div class="sheet-2colrow">
-                    <div class="sheet-col">
-                        <h4><b>Psychometabolism Devotions</b></h4>
-                        <ul>
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_psionmetabolic518" title="@{psionmetabolic518}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod518" title="@{powerscore-nomod518}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod518" title="@{powerscore-mod518}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod518" title="@{psionic-mod518}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Metabolic-Devotion518" title="%{Metabolic-Devotion518}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod518})]]&le;[[@{powerscore-nomod518}+(@{powerscore-mod518})]] @{psionmetabolic518}"></button></td>
-                                    <td><input type="text" name="attr_psionmetabolic-macro518" title="@{psionmetabolic-macro518}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-macro518" title="%{metabolic-macro518}" value="@{psionmetabolic-macro518}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost618" title="@{PSP-cost618}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionmetabolic519" title="@{psionmetabolic519}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod519" title="@{powerscore-nomod519}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod519" title="@{powerscore-mod519}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod519" title="@{psionic-mod519}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Metabolic-Devotion519" title="%{Metabolic-Devotion519}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod519})]]&le;[[@{powerscore-nomod519}+(@{powerscore-mod519})]] @{psionmetabolic519}"></button></td>
-                                    <td><input type="text" name="attr_psionmetabolic-macro519" title="@{psionmetabolic-macro519}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-macro519" title="%{metabolic-macro519}" value="@{psionmetabolic-macro519}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost619" title="@{PSP-cost619}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionmetabolic520" title="@{psionmetabolic520}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod520" title="@{powerscore-nomod520}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod520" title="@{powerscore-mod520}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod520" title="@{psionic-mod520}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Metabolic-Devotion520" title="%{Metabolic-Devotion520}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod520})]]&le;[[@{powerscore-nomod520}+(@{powerscore-mod520})]] @{psionmetabolic520}"></button></td>
-                                    <td><input type="text" name="attr_psionmetabolic-macro520" title="@{psionmetabolic-macro520}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-macro520" title="%{metabolic-macro520}" value="@{psionmetabolic-macro520}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost620" title="@{PSP-cost620}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </ul>
-                    </div>
-                    <div class="sheet-col">
-                        <h4><b>Psychometabolism Sciences</b></h4>
-                        <ul>
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_metabolic-science521" title="@{metabolic-science521}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod521" title="@{powerscore-nomod521}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod521" title="@{powerscore-mod521}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod521" title="@{psionic-mod521}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Metabolic-Science521" title="%{Metabolic-Science521}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod521})]]&le;[[@{powerscore-nomod521}+(@{powerscore-mod521})]] @{metabolic-science521}"></button></td>
-                                    <td><input type="text" name="attr_psionmetabolic-science-macro521" title="@{psionmetabolic-science-macro521}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-science-macro521" title="%{metabolic-science-macro521}" value="@{psionmetabolic-science-macro521}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost621" title="@{PSP-cost621}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_metabolic-science522" title="@{metabolic-science522}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod522" title="@{powerscore-nomod522}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod522" title="@{powerscore-mod522}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod522" title="@{psionic-mod522}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Metabolic-Science522" title="%{Metabolic-Science522}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod522})]]&le;[[@{powerscore-nomod522}+(@{powerscore-mod522})]] @{metabolic-science522}"></button></td>
-                                    <td><input type="text" name="attr_psionmetabolic-science-macro522" title="@{psionmetabolic-science-macro522}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-science-macro522" title="%{metabolic-science-macro522}" value="@{psionmetabolic-science-macro522}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost622" title="@{PSP-cost622}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_metabolic-science523" title="@{metabolic-science523}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod523" title="@{powerscore-nomod523}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod523" title="@{powerscore-mod523}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod523" title="@{psionic-mod523}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Metabolic-Science523" title="%{Metabolic-Science523}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod523})]]&le;[[@{powerscore-nomod523}+(@{powerscore-mod523})]] @{metabolic-science523}"></button></td>
-                                    <td><input type="text" name="attr_psionmetabolic-science-macro523" title="@{psionmetabolic-science-macro523}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-science-macro523" title="%{metabolic-science-macro523}" value="@{psionmetabolic-science-macro523}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost623" title="@{PSP-cost623}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </ul>
-                    </div>
-                </div>
-                <br>
-                <div class="sheet-2colrow">
-                    <div class="sheet-col">
-                        <h4><b>Clairsentient Devotions</b></h4>
-                        <ul>
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_psionclair524" title="@{psionclair524}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod524" title="@{powerscore-nomod524}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod524" title="@{powerscore-mod524}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod524" title="@{psionic-mod524}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Clair-Devotion524" title="%{Clair-Devotion524}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod524})]]&le;[[@{powerscore-nomod524}+(@{powerscore-mod524})]] @{psionclair524}"></button></td>
-                                    <td><input type="text" name="attr_psionclair-macro524" title="@{psionclair-macro524}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-macro524" title="%{clair-macro524}" value="@{psionclair-macro524}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost624" title="@{PSP-cost624}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionclair525" title="@{psionclair525}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod525" title="@{powerscore-nomod525}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod525" title="@{powerscore-mod525}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod525" title="@{psionic-mod525}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Clair-Devotion525" title="%{Clair-Devotion525}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod525})]]&le;[[@{powerscore-nomod525}+(@{powerscore-mod525})]] @{psionclair525}"></button></td>
-                                    <td><input type="text" name="attr_psionclair-macro525" title="@{psionclair-macro525}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-macro525" title="%{clair-macro525}" value="@{psionclair-macro525}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost625" title="@{PSP-cost625}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionclair526" title="@{psionclair526}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod526" title="@{powerscore-nomod526}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod526" title="@{powerscore-mod526}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod526" title="@{psionic-mod526}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Clair-Devotion526" title="%{Clair-Devotion526}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod526})]]&le;[[@{powerscore-nomod526}+(@{powerscore-mod526})]] @{psionclair526}"></button></td>
-                                    <td><input type="text" name="attr_psionclair-macro526" title="@{psionclair-macro526}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-macro526" title="%{clair-macro526}" value="@{psionclair-macro526}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost626" title="@{PSP-cost626}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </ul>
-                    </div>
-                    <div class="sheet-col">
-                        <h4><b>Clairsentient Sciences</b></h4>
-                        <ul>
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_clair-science527" title="@{clair-science527}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod527" title="@{powerscore-nomod527}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod527" title="@{powerscore-mod527}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod527" title="@{psionic-mod527}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Clair-Science527" title="%{Clair-Science527}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod527})]]&le;[[@{powerscore-nomod527}+(@{powerscore-mod527})]] @{clair-science527}"></button></td>
-                                    <td><input type="text" name="attr_psionclai-science-macro527" title="@{psionclair-science-macro527}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-science-macro527" title="%{clair-science-macro527}" value="@{psionclair-science-macro527}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost627" title="@{PSP-cost627}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_clair-science528" title="@{clair-science528}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod528" title="@{powerscore-nomod528}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod528" title="@{powerscore-mod528}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod528" title="@{psionic-mod528}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Clair-Science528" title="%{Clair-Science528}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod528})]]&le;[[@{powerscore-nomod528}+(@{powerscore-mod528})]] @{clair-science528}"></button></td>
-                                    <td><input type="text" name="attr_psionclair-science-macro528" title="@{psionclair-science-macro528}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-science-macro528" title="%{clair-science-macro528}" value="@{psionclair-science-macro528}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost628" title="@{PSP-cost628}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_clair-science529" title="@{clair-science529}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod529" title="@{powerscore-nomod529}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod529" title="@{powerscore-mod529}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod529" title="@{psionic-mod529}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Clair-Science529" title="%{Clair-Science529}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod529})]]&le;[[@{powerscore-nomod529}+(@{powerscore-mod529})]] @{clair-science529}"></button></td>
-                                    <td><input type="text" name="attr_psionclair-science-macro529" title="@{psionclair-science-macro529}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-science-macro529" title="%{clair-science-macro529}" value="@{psionclair-science-macro529}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost629" title="@{PSP-cost629}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </ul>
-                    </div>
-                </div>
-                <br>
                 <div class="sheet-2colrow">
-                    <div class="sheet-col">
-                        <h4><b>Metapsionic Devotions</b></h4>
-                        <ul>
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_psionmeta536" title="@{psionmeta536}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod536" title="@{powerscore-nomod536}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod536" title="@{powerscore-mod536}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod536" title="@{psionic-mod536}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Meta-Devotion536" title="%{Meta-Devotion536}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod536})]]&le;[[@{powerscore-nomod536}+(@{powerscore-mod536})]] @{psionmeta536}"></button></td>
-                                    <td><input type="text" name="attr_psionmeta-macro536" title="@{psionmeta-macro536}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-macro536" title="%{meta-macro536}" value="@{psionmeta-macro536}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost636" title="@{PSP-cost636}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionmeta537" title="@{psionmeta537}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod537" title="@{powerscore-nomod537}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod537" title="@{powerscore-mod537}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod537" title="@{psionic-mod537}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Meta-Devotion537" title="%{Meta-Devotion537}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod537})]]&le;[[@{powerscore-nomod537}+(@{powerscore-mod537})]] @{psionmeta537}"></button></td>
-                                    <td><input type="text" name="attr_psionmeta-macro537" title="@{psionmeta-macro537}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-macro537" title="%{meta-macro537}" value="@{psionmeta-macro537}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost637" title="@{PSP-cost637}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionmeta538" title="@{psionmeta538}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod538" title="@{powerscore-nomod538}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod538" title="@{powerscore-mod538}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod538" title="@{psionic-mod538}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Meta-Devotion538" title="%{Meta-Devotion538}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod538})]]&le;[[@{powerscore-nomod538}+(@{powerscore-mod538})]] @{psionmeta538}"></button></td>
-                                    <td><input type="text" name="attr_psionmeta-macro538" title="@{psionmeta-macro538}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-macro538" title="%{meta-macro538}" value="@{psionmeta-macro538}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost638" title="@{PSP-cost638}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </ul>
-                    </div>
-                    <div class="sheet-col">
-                        <h4><b>Metapsionic Sciences</b></h4>
-                        <ul>
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_meta-science539" title="@{meta-science539}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod539" title="@{powerscore-nomod539}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod539" title="@{powerscore-mod539}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod539" title="@{psionic-mod539}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Meta-Science539" title="%{Meta-Science539}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod539})]]&le;[[@{powerscore-nomod539}+(@{powerscore-mod539})]] @{meta-science539}"></button></td>
-                                    <td><input type="text" name="attr_psionmeta-science-macro539" title="@{psionmeta-science-macro539}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-science-macro539" title="%{meta-science-macro539}" value="@{psionmeta-science-macro539}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost639" title="@{PSP-cost639}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_meta-science540" title="@{meta-science540}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod540" title="@{powerscore-nomod540}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod540" title="@{powerscore-mod540}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod540" title="@{psionic-mod540}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Meta-Science540" title="%{Meta-Science540}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod540})]]&le;[[@{powerscore-nomod540}+(@{powerscore-mod540})]] @{meta-science540}"></button></td>
-                                    <td><input type="text" name="attr_psionmeta-science-macro540" title="@{psionmeta-science-macro540}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-science-macro540" title="%{meta-science-macro540}" value="@{psionmeta-science-macro540}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost640" title="@{PSP-cost640}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_meta-science541" title="@{meta-science541}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod541" title="@{powerscore-nomod541}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod541" title="@{powerscore-mod541}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod541" title="@{psionic-mod541}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Meta-Science541" title="%{Meta-Science541}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod541})]]&le;[[@{powerscore-nomod541}+(@{powerscore-mod541})]] @{meta-science541}"></button></td>
-                                    <td><input type="text" name="attr_psionmeta-science-macro541" title="@{psionmeta-science-macro541}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-science-macro541" title="%{meta-science-macro541}" value="@{psionmeta-science-macro541}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost641" title="@{PSP-cost641}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </ul>
-                    </div>
+                    insert_follower-psionic-core.html_(Clairsentient Sciences,Clair-Science,,clair-science,27,28,29)
+                    insert_follower-psionic-core.html_(Clairsentient Devotions,Clair-Devotion,psion,clair,24,25,26)
                 </div>
                 <br>
                 <div class="sheet-2colrow">
-                    <div class="sheet-col">
-                        <h4><b>Attack Modes</b></h4>
-                        <ul>
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_psionattacking530" title="@{psionattacking530}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod530" title="@{powerscore-nomod530}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod530" title="@{powerscore-mod530}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod530" title="@{psionic-mod530}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Attacking530" title="%{Attacking530}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod530})]]&le;[[@{powerscore-nomod530}+(@{powerscore-mod530})]] @{psionattacking530}"></button></td>
-                                    <td><input type="text" name="attr_psionattacking-macro530" title="@{psionattacking-macro530}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_attacking-macro530" title="%{attacking-macro530}" value="@{psionattacking-macro530}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost630" title="@{PSP-cost630}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionattacking531" title="@{psionattacking531}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod531" title="@{powerscore-nomod531}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod531" title="@{powerscore-mod531}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod531" title="@{psionic-mod531}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Attacking531" title="%{Attacking531}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod531})]]&le;[[@{powerscore-nomod531}+(@{powerscore-mod531})]] @{psionattacking531}"></button></td>
-                                    <td><input type="text" name="attr_psionattacking-macro531" title="@{psionattacking-macro531}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_attacking-macro531" title="%{attacking-macro531}" value="@{psionattacking-macro531}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost631" title="@{PSP-cost631}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionattacking532" title="@{psionattacking532}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod532" title="@{powerscore-nomod532}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod532" title="@{powerscore-mod532}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod532" title="@{psionic-mod532}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Attacking532" title="%{Attacking532}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod532})]]&le;[[@{powerscore-nomod532}+(@{powerscore-mod532})]] @{psionattacking532}"></button></td>
-                                    <td><input type="text" name="attr_psionattacking-macro532" title="@{psionattacking-macro532}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_attacking-macro532" title="%{attacking-macro532}" value="@{psionattacking-macro532}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost632" title="@{PSP-cost632}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </ul>
-                    </div>
-                    <div class="sheet-col">
-                        <h4><b>Defense Modes</b></h4>
-                        <ul>
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_psiondefending533" title="@{psiondefending533}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod533" title="@{powerscore-nomod533}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod533" title="@{powerscore-mod533}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod533" title="@{psionic-mod533}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Defending533" title="%{Defending533}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod533})]]&le;[[@{powerscore-nomod533}+(@{powerscore-mod533})]] @{psiondefending533}"></button></td>
-                                    <td><input type="text" name="attr_psiondefending-macro533" title="@{psiondefending-macro533}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_defending-macro533" title="%{defending-macro533}" value="@{psiondefending-macro533}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost633" title="@{PSP-cost633}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psiondefending534" title="@{psiondefending534}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod534" title="@{powerscore-nomod534}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod534" title="@{powerscore-mod534}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod534" title="@{psionic-mod534}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Defending534" title="%{Defending534}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod534})]]&le;[[@{powerscore-nomod534}+(@{powerscore-mod534})]] @{psiondefending534}"></button></td>
-                                    <td><input type="text" name="attr_psiondefending-macro534" title="@{psiondefending-macro534}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_defending-macro534" title="%{defending-macro534}" value="@{psiondefending-macro534}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost634" title="@{PSP-cost634}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psiondefending535" title="@{psiondefending535}" class="sheet-medium"></td>
-                                    <td><input type="text" name="attr_powerscore-nomod535" title="@{powerscore-nomod535}" placeholder="@{}" class="sheet-small"></td>
-                                    <td><input type="text" name="attr_powerscore-mod535" title="@{powerscore-mod535}" placeholder="#" class="sheet-tiny"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod535" title="@{psionic-mod535}" placeholder="#" class="sheet-tiny"><button type="roll" name="roll_Defending535" title="%{Defending535}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod535})]]&le;[[@{powerscore-nomod535}+(@{powerscore-mod535})]] @{psiondefending535}"></button></td>
-                                    <td><input type="text" name="attr_psiondefending-macro535" title="@{psiondefending-macro535}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_defending-macro535" title="%{defending-macro535}" value="@{psiondefending-macro535}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost635" title="@{PSP-cost635}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </ul>
-                    </div>
+                    insert_follower-psionic-core.html_(Psychokinectic Sciences,Kinetic-Science,,kinetic-science,09,10,11)
+                    insert_follower-psionic-core.html_(Psychokinectic Devotions,Kinetic-Devotion,psion,kinetic,06,07,08)
                 </div>
                 <br>
                 <div class="sheet-2colrow">
-                    <div class="sheet-col">
-                        <h4>Psionic Strength Points</h4>
-                        <table style='width:250px;'>
-                            <tr>
-                                <td class="sheet-default-header" style="width:100px;">Value</td>
-                                <td class="sheet-default-header" style="width:50px;">Current</td>
-                                <td class="sheet-default-header" style="width:15px;">/</td>
-                                <td class="sheet-default-header" style="width:60px;">Maximum</td>
-                                <td class="sheet-default-header" style="width:25px;">Speed</td>
-                            </tr>
-                            <tr>
-                                <td class="sheet-default-header" style=" width:100px;">PSP:</td>
-                                <td><input type="number" name="attr_PSP500" title="@{PSP500}" class="sheet-short" placeholder="PSP"/></td>
-                                <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold; width:15px">/</td>
-                                <td><input type="number" name="attr_PSP500_max" title="@{PSP500|max}" class="sheet-short"/></td>
-                            </tr>
-                            <tr>
-                                <td class="sheet-default-header" style="width:100px;">Temp PSP:</td>
-                                <td><input type="number" name="attr_tempPSP500" title="@{tempPSP500}" class="sheet-short" placeholder="Temp"/></td>
-                                <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold; width:15px;">/</td>
-                                <td><input type="number" name="attr_tempPSP500_max" title="@{tempPSP500|max}" class="sheet-short"/></td>
-                            </tr>
-                            <tr>
-                                <td class="sheet-default-header" style="width:100px;">Stored PSP:</td>
-                                <td><input type="number" name="attr_storedPSP500" title="@{storedPSP500}" class="sheet-short" placeholder="Stored"/></td>
-                                <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold; width:15px;">/</td>
-                                <td><input type="number" name="attr_storedPSP500_max" title="@{storedPSP500|max}" class="sheet-short"/></td>
-                            </tr>
-                            <tr>
-                                <td class="sheet-default-header" style="width: 25px;">Speed</td>
-                                <td></td>
-                                <td></td>
-                                <td><input type="text" name="attr_psispeed501" title="@{psispeed501}" class="sheet-small"></td>
-                                <td><button type="roll" name="roll_psispeed500" title="%{psispeed500}" value="/gmroll [[{([[1d10]]+@{psispeed501}-(@{misc-mod})), 1}kh1)]] [Initiative (Psionic Power)]&{tracker}"></button></td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="sheet-col">
-                        <h4><b>Psionic Proficiencies</b></h4>
-                        <ul>
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_psiprofname500" title="@{psiprofname500}" placeholder="Name of NWP"></td>
-                                    <td><input type="text" name="attr_psiprofstatnum500" title="@{psiprofstatnum500}" placeholder="@{}" class="sheet-short"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod500" title="@{psiprofmod500}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots500" title="@{psiprofslots500}" class="sheet-short" placeholder="#"><button type="roll" name="roll_Psiprof500" title="%{Psiprof500}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum500})+(@{psiprofmod500})]] @{psiprofname500}"></button></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psiprofname501" title="@{psiprofname501}" placeholder="Name of NWP"></td>
-                                    <td><input type="text" name="attr_psiprofstatnum501" title="@{psiprofstatnum501}" placeholder="@{}" class="sheet-short"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod501" title="@{psiprofmod501}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots501" title="@{psiprofslots501}" class="sheet-short" placeholder="#"><button type="roll" name="roll_Psiprof501" title="%{Psiprof501}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum501})+(@{psiprofmod501})]] @{psiprofname501}"></button></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psiprofname502" title="@{psiprofname502}" placeholder="Name of NWP"></td>
-                                    <td><input type="text" name="attr_psiprofstatnum502" title="@{psiprofstatnum502}" placeholder="@{}" class="sheet-short"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod502" title="@{psiprofmod502}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots502" title="@{psiprofslots502}" class="sheet-short" placeholder="#"><button type="roll" name="roll_Psiprof502" title="%{Psiprof502}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum502})+(@{psiprofmod502})]] @{psiprofname502}"></button></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psiprofname503" title="@{psiprofname503}" placeholder="Name of NWP"></td>
-                                    <td><input type="text" name="attr_psiprofstatnum503" title="@{psiprofstatnum503}" placeholder="@{}" class="sheet-short"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod503" title="@{psiprofmod503}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots503" title="@{psiprofslots503}" class="sheet-short" placeholder="#"><button type="roll" name="roll_Psiprof503" title="%{Psiprof503}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum503})+(@{psiprofmod503})]] @{psiprofname503}"></button></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psiprofname504" title="@{psiprofname504}" placeholder="Name of NWP"></td>
-                                    <td><input type="text" name="attr_psiprofstatnum504" title="@{psiprofstatnum504}" placeholder="@{}" class="sheet-short"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod504" title="@{psiprofmod504}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots504" title="@{psiprofslots504}" class="sheet-short" placeholder="#"><button type="roll" name="roll_Psiprof504" title="%{Psiprof504}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum504})+(@{psiprofmod504})]] @{psiprofname504}"></button></td>
-                                </tr>
-                            </table>
-                        </ul>
-                    </div>
+                    insert_follower-psionic-core.html_(Psychometabolic Sciences,Metabolic-Science,,metabolic-science,21,22,23)
+                    insert_follower-psionic-core.html_(Psychometabolic Devotions,Metabolic-Devotion,psion,metabolic,18,19,20)
                 </div>
                 <br>
-                <h4>Psionics Storage</h4>
-                <textarea name="attr_psionmem500" title="@{psionmem500}" placeholder="Place Psionic ability information here."></textarea>
-                <br>
-                <h4>Special Abilities and Attacks</h4>
-                <textarea name="attr_abilitiesnotes502" title="@{abilitiesnotes502}"></textarea>
-                <br>
-                <h4>Psionic Weapons</h4>
-                <textarea name="attr_psiweps500" title="@{psiweps500}"></textarea>
-            </div>
-            <div class="sheet-tab-content sheet-section-psionics-advanced-hench">
-                <h4>Psionics Revised</h4>
-                <label>This section applies to the Player's Option: Skills & Powers and the Dark Sun Campaign Setting Revised Psionics.</label>
-                <br>
-                <label>You can use + to denote different sources of bonuses.</label>
-                <br>
-                <br>
                 <div class="sheet-2colrow">
-                    <div class="sheet-col">
-                        <h4><b>Telepathy Devotions</b></h4>
-                        <table>
-                            <tr>
-                                <td class="sheet-default-header">Ability Name</td>
-                                <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                <td class="sheet-default-header">MAC</td>
-                                <td class="sheet-default-header">MThAC0</td>
-                                <td class="sheet-default-header">Macro</td>
-                                <td class="sheet-default-header">PSP<br>Cost</td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-telepathy-name700" title="@{psionic-telepathy-name700}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj700" title="@{mthac0adj700}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac700" title="@{mac700}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0700" title="@{MThAC0700}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit700" title="%{mthac02-hit700}" value="@{henchname5} hits a MAC of [[@{MThAC0700}-(1d20+(@{mthac0adj700})+(@{misc-mod}))]]&le;[[@{mac700}]] using their @{psionic-telepathy-name700}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro700" title="@{psionic-macro700}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check700" title="%{psionic-macro3-check700}" value="@{psionic-macro700}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost700" title="@{PSP-cost700}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-telepathy-name701" title="@{psionic-telepathy-name701}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj701" title="@{mthac0adj701}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac701" title="@{mac701}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0701" title="@{MThAC0701}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit701" title="%{mthac02-hit701}" value="@{henchname5} hits a MAC of [[@{MThAC0701}-(1d20+(@{mthac0adj701})+(@{misc-mod}))]]&le;[[@{mac701}]] using their @{psionic-telepathy-name701}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro701" title="@{psionic-macro701}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check701" title="%{psionic-macro3-check701}" value="@{psionic-macro701}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost701" title="@{PSP-cost701}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-telepathy-name702" title="@{psionic-telepathy-name702}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj702" title="@{mthac0adj702}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac702" title="@{mac702}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0702" title="@{MThAC0702}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit702" title="%{mthac02-hit702}" value="@{henchname5} hits a MAC of [[@{MThAC0702}-(1d20+(@{mthac0adj702})+(@{misc-mod}))]]&le;[[@{mac702}]] using their @{psionic-telepathy-name702}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro702" title="@{psionic-macro702}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check702" title="%{psionic-macro3-check702}" value="@{psionic-macro702}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost702" title="@{PSP-cost702}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="sheet-col">
-                        <h4><b>Telepathy Sciences</b></h4>
-                        <table>
-                            <tr>
-                                <td class="sheet-default-header">Ability Name</td>
-                                <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                <td class="sheet-default-header">MAC</td>
-                                <td class="sheet-default-header">MThAC0</td>
-                                <td class="sheet-default-header">Macro</td>
-                                <td class="sheet-default-header">PSP<br>Cost</td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-telepathy-science-name703" title="@{psionic-telepathy-science-name703}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj703" title="@{mthac0adj703}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac703" title="@{mac703}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0703" title="@{MThAC0703}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit703" title="%{mthac03-hit703}" value="@{henchname5} hits a MAC of [[@{MThAC0703}-(1d20+(@{mthac0adj703})+(@{misc-mod}))]]&le;[[@{mac703}]] using their @{psionic-telepathy-science-name703}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro703" title="@{psionic-macro703}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check703" title="%{psionic-macro4-check703}" value="@{psionic-macro703}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost703" title="@{PSP-cost703}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-telepathy-science-name704" title="@{psionic-telepathy-science-name704}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj704" title="@{mthac0adj704}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac704" title="@{mac704}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0704" title="@{MThAC0704}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit704" title="%{mthac03-hit704}" value="@{henchname5} hits a MAC of [[@{MThAC0704}-(1d20+(@{mthac0adj704})+(@{misc-mod}))]]&le;[[@{mac704}]] using their @{psionic-telepathy-science-name704}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro704" title="@{psionic-macro704}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check704" title="%{psionic-macro4-check704}" value="@{psionic-macro704}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost704" title="@{PSP-cost704}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-telepathy-science-name705" title="@{psionic-telepathy-science-name705}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj705" title="@{mthac0adj705}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac705" title="@{mac705}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0705" title="@{MThAC0705}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit705" title="%{mthac03-hit705}" value="@{henchname5} hits a MAC of [[@{MThAC0705}-(1d20+(@{mthac0adj705})+(@{misc-mod}))]]&le;[[@{mac705}]] using their @{psionic-telepathy-science-name705}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro705" title="@{psionic-macro705}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check705" title="%{psionic-macro4-check705}" value="@{psionic-macro705}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost705" title="@{PSP-cost705}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                        </table>
-                    </div>
+                    insert_follower-psionic-core.html_(Psychoportive Sciences,Portation-Science,,portation-science,15,16,17)
+                    insert_follower-psionic-core.html_(Psychoportive Devotions,Portation-Devotion,psion,portation,12,13,14)
                 </div>
                 <br>
                 <div class="sheet-2colrow">
-                    <div class="sheet-col">
-                        <h4><b>Psychokinesis Devotions</b></h4>
-                        <table>
-                            <tr>
-                                <td class="sheet-default-header">Ability Name</td>
-                                <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                <td class="sheet-default-header">MAC</td>
-                                <td class="sheet-default-header">MThAC0</td>
-                                <td class="sheet-default-header">Macro</td>
-                                <td class="sheet-default-header">PSP<br>Cost</td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychokinesis-name706" title="@{psionic-psychokinesis-name706}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj706" title="@{mthac0adj706}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac706" title="@{mac706}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0706" title="@{MThAC0706}" class="sheet-small" value="20"><button type="roll" name="roll_mthac04-hit706" title="%{mthac04-hit706}" value="@{henchname5} hits a MAC of [[@{MThAC0706}-(1d20+(@{mthac0adj706})+(@{misc-mod}))]]&le;[[@{mac706}]] using their @{psionic-psychokinesis-name706}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro706" title="@{psionic-macro706}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro5-check706" title="%{psionic-macro5-check706}" value="@{psionic-macro706}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost706" title="@{PSP-cost706}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychokinesis-name707" title="@{psionic-psychokinesis-name707}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj707" title="@{mthac0adj707}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac707" title="@{mac707}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0707" title="@{MThAC0707}" class="sheet-small" value="20"><button type="roll" name="roll_mthac04-hit707" title="%{mthac04-hit707}" value="@{henchname5} hits a MAC of [[@{MThAC0707}-(1d20+(@{mthac0adj707})+(@{misc-mod}))]]&le;[[@{mac707}]] using their @{psionic-psychokinesis-name707}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro707" title="@{psionic-macro707}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro5-check707" title="%{psionic-macro5-check707}" value="@{psionic-macro707}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost707" title="@{PSP-cost707}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychokinesis-name708" title="@{psionic-psychokinesis-name708}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj708" title="@{mthac0adj708}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac708" title="@{mac708}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0708" title="@{MThAC0708}" class="sheet-small" value="20"><button type="roll" name="roll_mthac04-hit708" title="%{mthac04-hit708}" value="@{henchname5} hits a MAC of [[@{MThAC0708}-(1d20+(@{mthac0adj708})+(@{misc-mod}))]]&le;[[@{mac708}]] using their @{psionic-psychokinesis-name708}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro708" title="@{psionic-macro708}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro5-check708" title="%{psionic-macro5-check708}" value="@{psionic-macro708}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost708" title="@{PSP-cost708}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="sheet-col">
-                        <h4><b>Psychokinesis Sciences</b></h4>
-                        <table>
-                            <tr>
-                                <td class="sheet-default-header">Ability Name</td>
-                                <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                <td class="sheet-default-header">MAC</td>
-                                <td class="sheet-default-header">MThAC0</td>
-                                <td class="sheet-default-header">Macro</td>
-                                <td class="sheet-default-header">PSP<br>Cost</td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychokinesis-science-name709" title="@{psionic-psychokinesis-science-name709}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj709" title="@{mthac0adj709}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac709" title="@{mac709}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0709" title="@{MThAC0709}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit709" title="%{mthac05-hit709}" value="@{henchname5} hits a MAC of [[@{MThAC0709}-(1d20+(@{mthac0adj709})+(@{misc-mod}))]]&le;[[@{mac709}]] using their @{psionic-psychokinesis-science-name709}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro709" title="@{psionic-macro709}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check709" title="%{psionic-macro6-check709}" value="@{psionic-macro709}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost709" title="@{PSP-cost709}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychokinesis-science-name710" title="@{psionic-psychokinesis-science-name710}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj710" title="@{mthac0adj710}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac710" title="@{mac710}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0710" title="@{MThAC0710}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit710" title="%{mthac05-hit710}" value="@{henchname5} hits a MAC of [[@{MThAC0710}-(1d20+(@{mthac0adj710})+(@{misc-mod}))]]&le;[[@{mac710}]] using their @{psionic-psychokinesis-science-name710}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro710" title="@{psionic-macro710}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check710" title="%{psionic-macro6-check710}" value="@{psionic-macro710}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost710" title="@{PSP-cost710}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychokinesis-science-name711" title="@{psionic-psychokinesis-science-name711}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj711" title="@{mthac0adj711}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac711" title="@{mac711}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0711" title="@{MThAC0711}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit711" title="%{mthac05-hit711}" value="@{henchname5} hits a MAC of [[@{MThAC0711}-(1d20+(@{mthac0adj711})+(@{misc-mod}))]]&le;[[@{mac711}]] using their @{psionic-psychokinesis-science-name711}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro711" title="@{psionic-macro711}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check711" title="%{psionic-macro6-check711}" value="@{psionic-macro711}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost711" title="@{PSP-cost711}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                        </table>
-                    </div>
+                    insert_follower-psionic-core.html_(Telepathic Sciences,Telepathy-Science,,telepathic-science,03,04,05)
+                    insert_follower-psionic-core.html_(Telepathic Devotions,Telepathy-Devotion,psion,telepathic,00,01,02)
                 </div>
                 <br>
                 <div class="sheet-2colrow">
-                    <div class="sheet-col">
-                        <h4><b>Psychoportive Devotions</b></h4>
-                        <table>
-                            <tr>
-                                <td class="sheet-default-header">Ability Name</td>
-                                <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                <td class="sheet-default-header">MAC</td>
-                                <td class="sheet-default-header">MThAC0</td>
-                                <td class="sheet-default-header">Macro</td>
-                                <td class="sheet-default-header">PSP<br>Cost</td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychoportation-name712" title="@{psionic-psychoportation-name712}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj712" title="@{mthac0adj712}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac712" title="@{mac712}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0712" title="@{MThAC0712}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit712" title="%{mthac06-hit712}" value="@{henchname5} hits a MAC of [[@{MThAC0712}-(1d20+(@{mthac0adj712})+(@{misc-mod}))]]&le;[[@{mac712}]] using their @{psionic-psychoportation-name712}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro712" title="@{psionic-macro712}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check712" title="%{psionic-macro7-check712}" value="@{psionic-macro712}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost712" title="@{PSP-cost712}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychoportation-name713" title="@{psionic-psychoportation-name713}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj713" title="@{mthac0adj713}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac713" title="@{mac713}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0713" title="@{MThAC0713}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit713" title="%{mthac06-hit713}" value="@{henchname5} hits a MAC of [[@{MThAC0713}-(1d20+(@{mthac0adj713})+(@{misc-mod}))]]&le;[[@{mac713}]] using their @{psionic-psychoportation-name713}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro713" title="@{psionic-macro713}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check713" title="%{psionic-macro7-check713}" value="@{psionic-macro713}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost713" title="@{PSP-cost713}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychoportation-name714" title="@{psionic-psychoportation-name714}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj714" title="@{mthac0adj714}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac714" title="@{mac714}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0714" title="@{MThAC0714}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit714" title="%{mthac06-hit714}" value="@{henchname5} hits a MAC of [[@{MThAC0714}-(1d20+(@{mthac0adj714})+(@{misc-mod}))]]&le;[[@{mac714}]] using their @{psionic-psychoportation-name714}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro714" title="@{psionic-macro714}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check714" title="%{psionic-macro7-check714}" value="@{psionic-macro714}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost714" title="@{PSP-cost714}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="sheet-col">
-                        <h4><b>Psychoportive Sciences</b></h4>
-                        <table>
-                            <tr>
-                                <td class="sheet-default-header">Ability Name</td>
-                                <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                <td class="sheet-default-header">MAC</td>
-                                <td class="sheet-default-header">MThAC0</td>
-                                <td class="sheet-default-header">Macro</td>
-                                <td class="sheet-default-header">PSP<br>Cost</td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychoportation-science-name715" title="@{psionic-psychoportation-science-name715}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj715" title="@{mthac0adj715}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac715" title="@{mac715}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0715" title="@{MThAC0715}" class="sheet-small" value="20"><button type="roll" name="roll_mthac07-hit715" title="%{mthac07-hit715}" value="@{henchname5} hits a MAC of [[@{MThAC0715}-(1d20+(@{mthac0adj715})+(@{misc-mod}))]]&le;[[@{mac715}]] using their @{psionic-psychoportation-science-name715}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro715" title="@{psionic-macro715}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro8-check715" title="%{psionic-macro8-check715}" value="@{psionic-macro715}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost715" title="@{PSP-cost715}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychoportation-science-name716" title="@{psionic-psychoportation-science-name716}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj716" title="@{mthac0adj716}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac716" title="@{mac716}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0716" title="@{MThAC0716}" class="sheet-small" value="20"><button type="roll" name="roll_mthac07-hit716" title="%{mthac07-hit716}" value="@{henchname5} hits a MAC of [[@{MThAC0716}-(1d20+(@{mthac0adj716})+(@{misc-mod}))]]&le;[[@{mac716}]] using their @{psionic-psychoportation-science-name716}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro716" title="@{psionic-macro716}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro8-check716" title="%{psionic-macro8-check716}" value="@{psionic-macro716}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost716" title="@{PSP-cost716}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychoportation-science-name717" title="@{psionic-psychoportation-science-name717}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj717" title="@{mthac0adj717}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac717" title="@{mac717}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0717" title="@{MThAC0717}" class="sheet-small" value="20"><button type="roll" name="roll_mthac07-hit717" title="%{mthac07-hit717}" value="@{henchname5} hits a MAC of [[@{MThAC0717}-(1d20+(@{mthac0adj717})+(@{misc-mod}))]]&le;[[@{mac717}]] using their @{psionic-psychoportation-science-name717}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro717" title="@{psionic-macro717}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro8-check717" title="%{psionic-macro8-check717}" value="@{psionic-macro717}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost717" title="@{PSP-cost717}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                        </table>
-                    </div>
+                    insert_follower-psionic-core.html_(Metapsionic Sciences,Meta-Science,,meta-science,39,40,41)
+                    insert_follower-psionic-core.html_(Metapsionic Devotions,Meta-Devotion,psion,meta,36,37,38)
                 </div>
                 <br>
                 <div class="sheet-2colrow">
-                    <div class="sheet-col">
-                        <h4><b>Psychometabolism Devotions</b></h4>
-                        <table>
-                            <tr>
-                                <td class="sheet-default-header">Ability Name</td>
-                                <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                <td class="sheet-default-header">MAC</td>
-                                <td class="sheet-default-header">MThAC0</td>
-                                <td class="sheet-default-header">Macro</td>
-                                <td class="sheet-default-header">PSP<br>Cost</td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychometabolism-name718" title="@{psionic-psychometabolism-name718}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj718" title="@{mthac0adj718}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac718" title="@{mac718}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0718" title="@{MThAC0718}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit718" title="%{mthac08-hit718}" value="@{henchname5} hits a MAC of [[@{MThAC0718}-(1d20+(@{mthac0adj718})+(@{misc-mod}))]]&le;[[@{mac718}]] using their @{psionic-psychometabolism-name718}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro718" title="@{psionic-macro718}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check718" title="%{psionic-macro9-check718}" value="@{psionic-macro718}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost718" title="@{PSP-cost718}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychometabolism-name719" title="@{psionic-psychometabolism-name719}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj719" title="@{mthac0adj719}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac719" title="@{mac719}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0719" title="@{MThAC0719}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit719" title="%{mthac08-hit719}" value="@{henchname5} hits a MAC of [[@{MThAC0719}-(1d20+(@{mthac0adj719})+(@{misc-mod}))]]&le;[[@{mac719}]] using their @{psionic-psychometabolism-name719}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro719" title="@{psionic-macro719}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check719" title="%{psionic-macro9-check719}" value="@{psionic-macro719}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost719" title="@{PSP-cost719}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychometabolism-name720" title="@{psionic-psychometabolism-name720}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj720" title="@{mthac0adj720}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac720" title="@{mac720}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0720" title="@{MThAC0720}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit720" title="%{mthac08-hit720}" value="@{henchname5} hits a MAC of [[@{MThAC0720}-(1d20+(@{mthac0adj720})+(@{misc-mod}))]]&le;[[@{mac720}]] using their @{psionic-psychometabolism-name720}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro720" title="@{psionic-macro720}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check720" title="%{psionic-macro9-check720}" value="@{psionic-macro720}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost720" title="@{PSP-cost720}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="sheet-col">
-                        <h4><b>Psychometabolism Sciences</b></h4>
-                        <table>
-                            <tr>
-                                <td class="sheet-default-header">Ability Name</td>
-                                <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                <td class="sheet-default-header">MAC</td>
-                                <td class="sheet-default-header">MThAC0</td>
-                                <td class="sheet-default-header">Macro</td>
-                                <td class="sheet-default-header">PSP<br>Cost</td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychometabolism-science-name721" title="@{psionic-psychometabolism-science-name721}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj721" title="@{mthac0adj721}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac721" title="@{mac721}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0721" title="@{MThAC0721}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit721" title="%{mthac09-hit721}" value="@{henchname5} hits a MAC of [[@{MThAC0721}-(1d20+(@{mthac0adj721})+(@{misc-mod}))]]&le;[[@{mac721}]] using their @{psionic-psychometabolism-science-name721}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro721" title="@{psionic-macro721}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check721" title="%{psionic-macro10-check721}" value="@{psionic-macro721}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost721" title="@{PSP-cost721}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychometabolism-science-name722" title="@{psionic-psychometabolism-science-name722}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj722" title="@{mthac0adj722}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac722" title="@{mac722}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0722" title="@{MThAC0722}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit722" title="%{mthac09-hit722}" value="@{henchname5} hits a MAC of [[@{MThAC0722}-(1d20+(@{mthac0adj722})+(@{misc-mod}))]]&le;[[@{mac722}]] using their @{psionic-psychometabolism-science-name722}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro722" title="@{psionic-macro722}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check722" title="%{psionic-macro10-check722}" value="@{psionic-macro722}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost722" title="@{PSP-cost722}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-psychometabolism-science-name723" title="@{psionic-psychometabolism-science-name723}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj723" title="@{mthac0adj723}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac723" title="@{mac723}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0723" title="@{MThAC0723}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit723" title="%{mthac09-hit723}" value="@{henchname5} hits a MAC of [[@{MThAC0723}-(1d20+(@{mthac0adj723})+(@{misc-mod}))]]&le;[[@{mac723}]] using their @{psionic-psychometabolism-science-name723}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro723" title="@{psionic-macro723}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check723" title="%{psionic-macro10-check723}" value="@{psionic-macro723}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost723" title="@{PSP-cost723}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                        </table>
-                    </div>
+                    insert_follower-psionic-core.html_(Attack Modes,Attacking,psion,attacking,30,31,32)
+                    insert_follower-psionic-core.html_(Defense Modes,Defending,psion,defending,33,34,35)
                 </div>
                 <br>
                 <div class="sheet-2colrow">
-                    <div class="sheet-col">
-                        <h4><b>Clairsentient Devotions</b></h4>
-                        <table>
-                            <tr>
-                                <td class="sheet-default-header">Ability Name</td>
-                                <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                <td class="sheet-default-header">MAC</td>
-                                <td class="sheet-default-header">MThAC0</td>
-                                <td class="sheet-default-header">Macro</td>
-                                <td class="sheet-default-header">PSP<br>Cost</td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-clairsentience-name724" title="@{psionic-clairsentience-name724}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj724" title="@{mthac0adj724}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac724" title="@{mac724}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0724" title="@{MThAC0724}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit724" title="%{mthac010-hit724}" value="@{henchname5} hits a MAC of [[@{MThAC0724}-(1d20+(@{mthac0adj724})+(@{misc-mod}))]]&le;[[@{mac724}]] using their @{psionic-clairsentience-name724}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro724" title="@{psionic-macro724}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check724" title="%{psionic-macro11-check724}" value="@{psionic-macro724}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost724" title="@{PSP-cost724}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psionic-clairsentience-name725" title="@{psionic-clairsentience-name725}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj725" title="@{mthac0adj725}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac725" title="@{mac725}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0725" title="@{MThAC0725}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit725" title="%{mthac010-hit725}" value="@{henchname5} hits a MAC of [[@{MThAC0725}-(1d20+(@{mthac0adj725})+(@{misc-mod}))]]&le;[[@{mac725}]] using their @{psionic-clairsentience-name725}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro725" title="@{psionic-macro725}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check725" title="%{psionic-macro11-check725}" value="@{psionic-macro725}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost725" title="@{PSP-cost725}" placeholder="#" class="sheet-small"/></td>
-                            </tr>
+                    <div class="sheet-col">
+                        <h4>Psionic Strength Points</h4>
+                        <table class="sheet-table-white sheet-default-header-first-row sheet-default-header-first-column" style='width:250px;'>
                             <tr>
-                                <td><input type="text" name="attr_psionic-clairsentience-name726" title="@{psionic-clairsentience-name726}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj726" title="@{mthac0adj726}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac726" title="@{mac726}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0726" title="@{MThAC0726}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit1726" title="%{mthac010-hit726}" value="@{henchname5} hits a MAC of [[@{MThAC0726}-(1d20+(@{mthac0adj726})+(@{misc-mod}))]]&le;[[@{mac726}]] using their @{psionic-clairsentience-name726}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro726" title="@{psionic-macro726}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check726" title="%{psionic-macro11-check726}" value="@{psionic-macro726}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost726" title="@{PSP-cost726}" placeholder="#" class="sheet-small"/></td>
+                                <td style="width:100px;">Value</td>
+                                <td style="width:50px;">Current</td>
+                                <td style="width:15px;">/</td>
+                                <td style="width:60px;">Maximum</td>
+                                <td style="width:25px;">Speed</td>
                             </tr>
-                        </table>
-                    </div>
-                    <div class="sheet-col">
-                        <h4><b>Clairsentient Sciences</b></h4>
-                        <table>
                             <tr>
-                                <td class="sheet-default-header">Ability Name</td>
-                                <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                <td class="sheet-default-header">MAC</td>
-                                <td class="sheet-default-header">MThAC0</td>
-                                <td class="sheet-default-header">Macro</td>
-                                <td class="sheet-default-header">PSP<br>Cost</td>
+                                <td>PSP:</td>
+                                <td><input type="number" name="attr_PSP500" title="@{PSP500}" class="sheet-short" placeholder="PSP"/></td>
+                                <td>/</td>
+                                <td><input type="number" name="attr_PSP500_max" title="@{PSP500|max}" class="sheet-short"/></td>
                             </tr>
                             <tr>
-                                <td><input type="text" name="attr_psionic-clairsentience-science-name727" title="@{psionic-clairsentience-science-name727}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj727" title="@{mthac0adj727}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac727" title="@{mac727}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0727" title="@{MThAC0727}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit727" title="%{mthac011-hit727}" value="@{henchname5} hits a MAC of [[@{MThAC0727}-(1d20+(@{mthac0adj727})+(@{misc-mod}))]]&le;[[@{mac727}]] using their @{psionic-clairsentience-science-name727}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro727" title="@{psionic-macro727}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check727" title="%{psionic-macro12-check727}" value="@{psionic-macro727}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost727" title="@{PSP-cost727}" placeholder="#" class="sheet-small"/></td>
+                                <td>Temp PSP:</td>
+                                <td><input type="number" name="attr_tempPSP500" title="@{tempPSP500}" class="sheet-short" placeholder="Temp"/></td>
+                                <td>/</td>
+                                <td><input type="number" name="attr_tempPSP500_max" title="@{tempPSP500|max}" class="sheet-short"/></td>
                             </tr>
                             <tr>
-                                <td><input type="text" name="attr_psionic-clairsentience-science-name728" title="@{psionic-clairsentience-science-name728}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj728" title="@{mthac0adj728}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac728" title="@{mac728}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0728" title="@{MThAC0728}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit728" title="%{mthac011-hit728}" value="@{henchname5} hits a MAC of [[@{MThAC0728}-(1d20+(@{mthac0adj728})+(@{misc-mod}))]]&le;[[@{mac728}]] using their @{psionic-clairsentience-science-name728}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro728" title="@{psionic-macro728}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check728" title="%{psionic-macro12-check728}" value="@{psionic-macro728}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost728" title="@{PSP-cost728}" placeholder="#" class="sheet-small"/></td>
+                                <td>Stored PSP:</td>
+                                <td><input type="number" name="attr_storedPSP500" title="@{storedPSP500}" class="sheet-short" placeholder="Stored"/></td>
+                                <td>/</td>
+                                <td><input type="number" name="attr_storedPSP500_max" title="@{storedPSP500|max}" class="sheet-short"/></td>
                             </tr>
                             <tr>
-                                <td><input type="text" name="attr_psionic-clairsentience-science-name729" title="@{psionic-clairsentience-science-name729}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                <td><input type="text" name="attr_mthac0adj729" title="@{mthac0adj729}" class="sheet-short" value="0"></td>
-                                <td><input type="text" name="attr_mac729" title="@{mac729}" class="sheet-small" value="10"></td>
-                                <td><input type="text" name="attr_MThAC0729" title="@{MThAC0729}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit1729" title="%{mthac011-hit729}" value="@{henchname5} hits a MAC of [[@{MThAC0729}-(1d20+(@{mthac0adj729})+(@{misc-mod}))]]&le;[[@{mac729}]] using their @{psionic-clairsentience-science-name729}"></button></td>
-                                <td><input type="text" name="attr_psionic-macro729" title="@{psionic-macro729}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check729" title="%{psionic-macro12-check729}" value="@{psionic-macro729}"></button></td>
-                                <td><input type="text" name="attr_PSP-cost729" title="@{PSP-cost729}" placeholder="#" class="sheet-small"/></td>
+                                <td>Speed</td>
+                                <td></td>
+                                <td></td>
+                                <td><input type="text" name="attr_psispeed501" title="@{psispeed501}" class="sheet-small"></td>
+                                <td><button type="roll" name="roll_psispeed500" title="%{psispeed500}" value="/gmroll [[{([[1d10]]+@{psispeed501}-(@{misc-mod})), 1}kh1)]] [Initiative (Psionic Power)]&{tracker}"></button></td>
                             </tr>
                         </table>
                     </div>
+                    <div class="sheet-col">
+                        <h4>Psionic Proficiencies</h4>
+                        <ul>
+                            <table class="sheet-table-white">
+                                insert_follower-psionic-core-proficiency.html_(500)
+                                insert_follower-psionic-core-proficiency.html_(501)
+                                insert_follower-psionic-core-proficiency.html_(502)
+                                insert_follower-psionic-core-proficiency.html_(503)
+                                insert_follower-psionic-core-proficiency.html_(504)
+                            </table>
+                        </ul>
+                    </div>
+                </div>
+                <br>
+                <h4>Psionics Storage</h4>
+                <textarea name="attr_psionmem500" title="@{psionmem500}" placeholder="Place Psionic ability information here."></textarea>
+                <br>
+                <h4>Special Abilities and Attacks</h4>
+                <textarea name="attr_abilitiesnotes502" title="@{abilitiesnotes502}"></textarea>
+                <br>
+                <h4>Psionic Weapons</h4>
+                <textarea name="attr_psiweps500" title="@{psiweps500}"></textarea>
+            </div>
+            <div class="sheet-tab-content sheet-section-psionics-advanced-hench">
+                <h4>Psionics Revised</h4>
+                <label>This section applies to the Player's Option: Skills & Powers and the Dark Sun Campaign Setting Revised Psionics.</label>
+                <br>
+                <label>You can use + to denote different sources of bonuses.</label>
+                <br>
+                <br>
+                <div class="sheet-2colrow">
+                    insert_follower-psionic-skills-and-powers.html_(Clairsentient Sciences,clairsentience-science,27,28,29,011,12)
+                    insert_follower-psionic-skills-and-powers.html_(Clairsentient Devotions,clairsentience,24,25,26,010,11)
+                </div>
+                <br>
+                <div class="sheet-2colrow">
+                    insert_follower-psionic-skills-and-powers.html_(Psychokinectic Sciences,psychokinesis-science,09,10,11,05,6)
+                    insert_follower-psionic-skills-and-powers.html_(Psychokinectic Devotions,psychokinesis,06,07,08,04,5)
+                </div>
+                <br>
+                <div class="sheet-2colrow">
+                    insert_follower-psionic-skills-and-powers.html_(Psychometabolic Sciences,psychometabolism-science,21,22,23,09,10)
+                    insert_follower-psionic-skills-and-powers.html_(Psychometabolic Devotions,psychometabolism,18,19,20,08,9)
+                </div>
+                <br>
+                <div class="sheet-2colrow">
+                    insert_follower-psionic-skills-and-powers.html_(Psychoportive Sciences,psychoportation-science,15,16,17,07,8)
+                    insert_follower-psionic-skills-and-powers.html_(Psychoportive Devotions,psychoportation,12,13,14,06,7)
+                </div>
+                <br>
+                <div class="sheet-2colrow">
+                    insert_follower-psionic-skills-and-powers.html_(Telepathic Sciences,telepathy-science,03,04,05,03,4)
+                    insert_follower-psionic-skills-and-powers.html_(Telepathic Devotions,telepathy,00,01,02,02,3)
                 </div>
                 <br>
-                <h4><b>Psionic Attack Modes</b></h4>
-                <table>
+                <h4>Psionic Attack Modes</h4>
+                <table class="sheet-default-header-first-row">
                     <tr>
-                        <td class="sheet-default-header">Attack Name</td>
-                        <td class="sheet-default-header">Attack<br>Speed</td>
-                        <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                        <td class="sheet-default-header">MThAC0</td>
-                        <td class="sheet-default-header">Damage</td>
-                        <td class="sheet-default-header">Macro</td>
-                        <td class="sheet-default-header">PSP<br>Cost</td>
+                        <td>Attack Name</td>
+                        <td>Attack<br>Speed</td>
+                        <td>MThAC0<br>Adj.</td>
+                        <td>MThAC0</td>
+                        <td>Damage</td>
+                        <td>Macro</td>
+                        <td>PSP<br>Cost</td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_psionic-attack-name730" title="@{psionic-attack-name730}" class="sheet-display" placeholder="Ability Name"/></td>
@@ -1994,12 +813,12 @@ <h4><b>Psionic Attack Modes</b></h4>
                 <br>
                 <div class="sheet-3colrow">
                     <div class="sheet-col">
-                        <h4><b>Psionic Defense Modes</b></h4>
-                        <table>
+                        <h4>Psionic Defense Modes</h4>
+                        <table class="sheet-default-header-first-row">
                             <tr>
-                                <td class="sheet-default-header">Defense Name</td>
-                                <td class="sheet-default-header">Macro</td>
-                                <td class="sheet-default-header">PSP<br>Cost</td>
+                                <td>Defense Name</td>
+                                <td>Macro</td>
+                                <td>PSP<br>Cost</td>
                             </tr>
                             <tr>
                                 <td><input type="text" name="attr_psionic-defense-name733" title="@{psionic-defense-name733}" class="sheet-midtext" placeholder="Defense Name"/></td>
@@ -2020,79 +839,49 @@ <h4><b>Psionic Defense Modes</b></h4>
                     </div>
                     <div class="sheet-col">
                         <h4>Psionic Strength Points</h4>
-                        <table style='width:250px;'>
+                        <table class="sheet-table-white sheet-default-header-first-row sheet-default-header-first-column" style='width:250px;'>
                             <tr>
-                                <td class="sheet-default-header" style="width:100px;">Value</td>
-                                <td class="sheet-default-header" style="width:50px;">Current</td>
-                                <td class="sheet-default-header" style="width:15px;">/</td>
-                                <td class="sheet-default-header" style="width:60px;">Maximum</td>
-                                <td class="sheet-default-header" style="width:25px;">Speed</td>
+                                <td style="width:100px;">Value</td>
+                                <td style="width:50px;">Current</td>
+                                <td style="width:15px;">/</td>
+                                <td style="width:60px;">Maximum</td>
+                                <td style="width:25px;">Speed</td>
                             </tr>
                             <tr>
-                                <td class="sheet-default-header" style="width:100px;">PSP:</td>
+                                <td>PSP:</td>
                                 <td><input type="number" name="attr_PSP500" title="@{PSP500}" class="sheet-short" placeholder="PSP"/></td>
-                                <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                <td>/</td>
                                 <td><input type="number" name="attr_PSP500_max" title="@{PSP500|max}" class="sheet-short"/></td>
                                 <td><button type="roll" name="roll_psispeed501" title="%{psispeed501}" value="/gmroll [[{([[1d10]]-(@{misc-mod})), 1}kh1]] [Psionic Power]&{tracker}"></button></td>
                             </tr>
                             <tr>
-                                <td class="sheet-default-header" style="width:100px;">Temp PSP:</td>
+                                <td>Temp PSP:</td>
                                 <td><input type="number" name="attr_tempPSP500" title="@{tempPSP500}" class="sheet-short" placeholder="Temp"/></td>
-                                <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                <td>/</td>
                                 <td><input type="number" name="attr_tempPSP500_max" title="@{tempPSP500|max}" class="sheet-short"/></td>
                             </tr>
                             <tr>
-                                <td class="sheet-default-header" style="width:100px;">Stored PSP:</td>
+                                <td>Stored PSP:</td>
                                 <td><input type="number" name="attr_storedPSP500" title="@{storedPSP500}" class="sheet-short" placeholder="Stored"/></td>
-                                <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                <td>/</td>
                                 <td><input type="number" name="attr_storedPSP500_max" title="@{storedPSP500|max}" class="sheet-short"/></td>
                             </tr>
                             <tr>
-                                <td class="sheet-default-header" style="width:100px;">MAC</td>
+                                <td>MAC</td>
                                 <td><input type="number" name="attr_selfMAC500" title="@{selfMAC500}" class="sheet-short"/></td>
-                                <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                <td>/</td>
                                 <td><input type="number" name="attr_temp-selfMAC500" title="@{temp-selfMAC500}" class="sheet-short"/></td>
                             </tr>
                         </table>
                     </div>
                     <div class="sheet-col">
-                        <h4><b>Psionic NWP's</b></h4>
-                        <table>
-                            <tr>
-                                <td><input type="text" name="attr_psinwp500" title="@{psinwp500}" class="sheet-maxtext" placeholder="Name of NWP"></td>
-                                <td><input type="text" name="attr_psinwpstat500" title="@{psinwpstat500}" placeholder="@{}" class="sheet-small"></td>
-                                <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod500" title="@{psinwpmod500}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots500" title="@{psinwpslots500}" class="sheet-small" placeholder="#">
-                                    <button type="roll" name="roll_psinwps505" title="%{psinwps505}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat500})+(@{psinwpmod500})]] @{psinwp500}"></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psinwp501" title="@{psinwp501}" class="sheet-maxtext" placeholder="Name of NWP"></td>
-                                <td><input type="text" name="attr_psinwpstat501" title="@{psinwpstat501}" placeholder="@{}" class="sheet-small"></td>
-                                <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod501" title="@{psinwpmod501}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots501" title="@{psinwpslots501}" class="sheet-small" placeholder="#">
-                                    <button type="roll" name="roll_psinwps506" title="%{psinwps506}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat501})+(@{psinwpmod501})]] @{psinwp501}"></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psinwp502" title="@{psinwp502}" class="sheet-maxtext" placeholder="Name of NWP"></td>
-                                <td><input type="text" name="attr_psinwpstat502" title="@{psinwpstat502}" placeholder="@{}" class="sheet-small"></td>
-                                <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod502" title="@{psinwpmod502}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots502" title="@{psinwpslots502}" class="sheet-small" placeholder="#">
-                                    <button type="roll" name="roll_psinwps507" title="%{psinwps507}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat502})+(@{psinwpmod502})]] @{psinwp502}"></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psinwp503" title="@{psinwp503}" class="sheet-maxtext" placeholder="Name of NWP"></td>
-                                <td><input type="text" name="attr_psinwpstat503" title="@{psinwpstat503}" placeholder="@{}" class="sheet-small"></td>
-                                <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod503" title="@{psinwpmod503}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots503" title="@{psinwpslots503}" class="sheet-small" placeholder="#">
-                                    <button type="roll" name="roll_psinwps508" title="%{psinwps508}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat503})+(@{psinwpmod503})]] @{psinwp503}"></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_psinwp504" title="@{psinwp504}" class="sheet-maxtext" placeholder="Name of NWP"></td>
-                                <td><input type="text" name="attr_psinwpstat504" title="@{psinwpstat504}" placeholder="@{}" class="sheet-small"></td>
-                                <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod504" title="@{psinwpmod504}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots504" title="@{psinwpslots504}" class="sheet-small" placeholder="#">
-                                    <button type="roll" name="roll_psinwps509" title="%{psinwps509}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat504})+(@{psinwpmod504})]] @{psinwp504}"></button>
-                                </td>
-                            </tr>
+                        <h4>Psionic NWP's</h4>
+                        <table class="sheet-table-white">
+                            insert_follower-psionic-skills-and-powers-proficiency.html_(500)
+                            insert_follower-psionic-skills-and-powers-proficiency.html_(501)
+                            insert_follower-psionic-skills-and-powers-proficiency.html_(502)
+                            insert_follower-psionic-skills-and-powers-proficiency.html_(503)
+                            insert_follower-psionic-skills-and-powers-proficiency.html_(504)
                         </table>
                     </div>
                 </div>
@@ -2106,15 +895,15 @@ <h4>Psionics Ability Information Storage</h4>
             <hr>
             <hr>
             <fieldset name="repeating_hench5" class="repeating_hench5">
-                <table>
+                <table class="sheet-default-header-first-row">
                     <tr>
-                        <td class="sheet-default-header">Name</td>
-                        <td class="sheet-default-header">AC</td>
-                        <td class="sheet-default-header">Race</td>
-                        <td class="sheet-default-header">Level</td>
-                        <td class="sheet-default-header">Class</td>
-                        <td class="sheet-default-header">HP/Max</td>
-                        <td class="sheet-default-header">Units</td>
+                        <td>Name</td>
+                        <td>AC</td>
+                        <td>Race</td>
+                        <td>Level</td>
+                        <td>Class</td>
+                        <td>HP/Max</td>
+                        <td>Units</td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_henchname55" title="@{repeating_hench5_$X_henchname55}"></td>
@@ -2132,7 +921,7 @@ <h4>Psionics Ability Information Storage</h4>
                 insert_saving-throws.html_(hench55,@{henchname55},repeating_hench5_$X_)
                 <hr>
                 <input type="radio" name="attr_tab23" class="sheet-tab sheet-tab67" value="1" checked/><span class="sheet-tab sheet-tab67">Psionic Core</span>&nbsp;
-                <input type="radio" name="attr_tab23" class="sheet-tab sheet-tab68" value="2"/><span class="sheet-tab sheet-tab68">Psionic S/P</span><br><br>
+                <input type="radio" name="attr_tab23" class="sheet-tab sheet-tab68" value="2"/><span class="sheet-tab sheet-tab68">Psionic S&P</span><br><br>
 
                 <div class="sheet-tab-content sheet-section-psionics-standard-repeat">
                     <h4>Psionics Core</h4>
@@ -2140,535 +929,72 @@ <h4>Psionics Core</h4>
                     <label>You can use + to denote different sources of bonuses.</label>
                     <br>
                     <br>
-
                     <div class="sheet-2colrow">
-                        <div class="sheet-col">
-                            <h4><b>Telepathy Devotions</b></h4>
-                            <ul>
-                                <table>
-                                    <tr>
-                                        <td><input type="text" name="attr_psiontelepathic500" title="@{repeating_hench5_$X_psiontelepathic500}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod500" title="@{repeating_hench5_$X_powerscore-nomod500}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod500" title="@{repeating_hench5_$X_powerscore-mod500}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod500" title="@{repeating_hench5_$X_psionic-mod500}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Telepathy-Devotion500" title="%{repeating_hench5_$X_Telepathy-Devotion500}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod500})]]&le;[[@{powerscore-nomod500}+(@{powerscore-mod500})]] @{psiontelepathic500}"></button></td>
-                                        <td><input type="text" name="attr_psiontelepathic-macro500" title="@{repeating_hench5_$X_psiontelepathic-macro500}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-macro500" title="%{repeating_hench5_$X_telepathic-macro500}" value="@{psiontelepathic-macro500}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost600" title="@{repeating_hench5_$X_PSP-cost600}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psiontelepathic501" title="@{repeating_hench5_$X_psiontelepathic501}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod501" title="@{repeating_hench5_$X_powerscore-nomod501}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod501" title="@{repeating_hench5_$X_powerscore-mod501}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod501" title="@{repeating_hench5_$X_psionic-mod501}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Telepathy-Devotion501" title="%{repeating_hench5_$X_Telepathy-Devotion501}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod501})]]&le;[[@{powerscore-nomod501}+(@{powerscore-mod501})]] @{psiontelepathic501}"></button></td>
-                                        <td><input type="text" name="attr_psiontelepathic-macro501" title="@{repeating_hench5_$X_psiontelepathic-macro501}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-macro501" title="%{repeating_hench5_$X_telepathic-macro501}" value="@{psiontelepathic-macro501}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost601" title="@{repeating_hench5_$X_PSP-cost601}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psiontelepathic502" title="@{repeating_hench5_$X_psiontelepathic502}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod502" title="@{repeating_hench5_$X_powerscore-nomod502}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod502" title="@{repeating_hench5_$X_powerscore-mod502}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod502" title="@{repeating_hench5_$X_psionic-mod502}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Telepathy-Devotion502" title="%{repeating_hench5_$X_Telepathy-Devotion502}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod502})]]&le;[[@{powerscore-nomod502}+(@{powerscore-mod502})]] @{psiontelepathic502}"></button></td>
-                                        <td><input type="text" name="attr_psiontelepathic-macro502" title="@{repeating_hench5_$X_psiontelepathic-macro502}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-macro502" title="%{repeating_hench5_$X_telepathic-macro502}" value="@{psiontelepathic-macro502}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost602" title="@{repeating_hench5_$X_PSP-cost602}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                </table>
-                            </ul>
-                        </div>
-                        <div class="sheet-col">
-                            <h4><b>Telepathy Sciences</b></h4>
-                            <ul>
-                                <table>
-                                    <tr>
-                                        <td><input type="text" name="attr_telepathic-science503" title="@{repeating_hench5_$X_telepathic-science503}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod503" title="@{repeating_hench5_$X_powerscore-nomod503}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod503" title="@{repeating_hench5_$X_powerscore-mod503}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod503" title="@{repeating_hench5_$X_psionic-mod503}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Telepathy-Science503" title="%{repeating_hench5_$X_Telepathy-Science503}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod503})]]&le;[[@{powerscore-nomod503}+(@{powerscore-mod503})]] @{telepathic-science503}"></button></td>
-                                        <td><input type="text" name="attr_psiontelepathic-science-macro503" title="@{repeating_hench5_$X_psiontelepathic-science-macro503}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-science-macro503" title="%{repeating_hench5_$X_telepathic-science-macro503}" value="@{psiontelepathic-science-macro503}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost603" title="@{repeating_hench5_$X_PSP-cost603}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_telepathic-science504" title="@{repeating_hench5_$X_telepathic-science504}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod504" title="@{repeating_hench5_$X_powerscore-nomod504}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod504" title="@{repeating_hench5_$X_powerscore-mod504}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod504" title="@{repeating_hench5_$X_psionic-mod504}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Telepathy-Science504" title="%{repeating_hench5_$X_Telepathy-Science504}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod504})]]&le;[[@{powerscore-nomod504}+(@{powerscore-mod504})]] @{telepathic-science504}"></button></td>
-                                        <td><input type="text" name="attr_psiontelepathic-science-macro504" title="@{repeating_hench5_$X_psiontelepathic-science-macro504}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-science-macro504" title="%{repeating_hench5_$X_telepathic-science-macro504}" value="@{psiontelepathic-science-macro504}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost604" title="@{repeating_hench5_$X_PSP-cost604}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_telepathic-science505" title="@{repeating_hench5_$X_telepathic-science505}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod505" title="@{repeating_hench5_$X_powerscore-nomod505}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod505" title="@{repeating_hench5_$X_powerscore-mod505}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod505" title="@{repeating_hench5_$X_psionic-mod505}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Telepathy-Science505" title="%{repeating_hench5_$X_Telepathy-Science505}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod505})]]&le;[[@{powerscore-nomod505}+(@{powerscore-mod505})]] @{telepathic-science505}"></button></td>
-                                        <td><input type="text" name="attr_psiontelepathic-macro505" title="@{repeating_hench5_$X_psiontelepathic-science-macro505}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_telepathic-science-macro505" title="%{repeating_hench5_$X_telepathic-science-macro505}" value="@{psiontelepathic-science-macro505}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost605" title="@{repeating_hench5_$X_PSP-cost605}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                </table>
-                            </ul>
-                        </div>
+                        insert_follower-psionic-core.html_(Clairsentient Sciences,Clair-Science,,clair-science,27,28,29,repeating_hench5_$X_)
+                        insert_follower-psionic-core.html_(Clairsentient Devotions,Clair-Devotion,psion,clair,24,25,26,repeating_hench5_$X_)
                     </div>
                     <br>
                     <div class="sheet-2colrow">
-                        <div class="sheet-col">
-                            <h4><b>Psychokinesis Devotions</b></h4>
-                            <ul>
-                                <table>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionkinetic506" title="@{repeating_hench5_$X_psionkinetic506}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod506" title="@{repeating_hench5_$X_powerscore-nomod506}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod506" title="@{repeating_hench5_$X_powerscore-mod506}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod506" title="@{repeating_hench5_$X_psionic-mod506}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Kinetic-Devotion506" title="%{repeating_hench5_$X_Kinetic-Devotion506}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod506})]]&le;[[@{powerscore-nomod506}+(@{powerscore-mod506})]] @{psionkinetic506}"></button></td>
-                                        <td><input type="text" name="attr_psionkinetic-macro506" title="@{repeating_hench5_$X_psionkinetic-macro506}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-macro506" title="%{repeating_hench5_$X_kinetic-macro506}" value="@{psionkinetic-macro506}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost606" title="@{repeating_hench5_$X_PSP-cost606}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionkinetic507" title="@{repeating_hench5_$X_psionkinetic507}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod507" title="@{repeating_hench5_$X_powerscore-nomod507}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod507" title="@{repeating_hench5_$X_powerscore-mod507}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod507" title="@{repeating_hench5_$X_psionic-mod507}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Kinetic-Devotion507" title="%{repeating_hench5_$X_Kinetic-Devotion507}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod507})]]&le;[[@{powerscore-nomod507}+(@{powerscore-mod507})]] @{psionkinetic507}"></button></td>
-                                        <td><input type="text" name="attr_psionkinetic-macro507" title="@{repeating_hench5_$X_psionkinetic-macro507}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-macro507" title="%{repeating_hench5_$X_kinetic-macro507}" value="@{psionkinetic-macro507}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost607" title="@{repeating_hench5_$X_PSP-cost607}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionkinetic508" title="@{repeating_hench5_$X_psionkinetic508}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod508" title="@{repeating_hench5_$X_powerscore-nomod508}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod508" title="@{repeating_hench5_$X_powerscore-mod508}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod508" title="@{repeating_hench5_$X_psionic-mod508}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Kinetic-Devotion508" title="%{repeating_hench5_$X_Kinetic-Devotion508}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod508})]]&le;[[@{powerscore-nomod508}+(@{powerscore-mod508})]] @{psionkinetic508}"></button></td>
-                                        <td><input type="text" name="attr_psionkinetic-macro508" title="@{repeating_hench5_$X_psionkinetic-macro508}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-macro508" title="%{repeating_hench5_$X_kinetic-macro508}" value="@{psionkinetic-macro508}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost608" title="@{repeating_hench5_$X_PSP-cost608}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                </table>
-                            </ul>
-                        </div>
-                        <div class="sheet-col">
-                            <h4><b>Psychokinesis Sciences</b></h4>
-                            <ul>
-                                <table>
-                                    <tr>
-                                        <td><input type="text" name="attr_kinetic-science509" title="@{repeating_hench5_$X_kinetic-science509}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod509" title="@{repeating_hench5_$X_powerscore-nomod509}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod509" title="@{repeating_hench5_$X_powerscore-mod509}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod509" title="@{repeating_hench5_$X_psionic-mod509}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Kinetic-Science509" title="%{repeating_hench5_$X_Kinetic-Science509}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod509})]]&le;[[@{powerscore-nomod509}+(@{powerscore-mod509})]] @{kinetic-science509}"></button></td>
-                                        <td><input type="text" name="attr_psionkinetic-science-macro509" title="@{repeating_hench5_$X_psionkinetic-science-macro509}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-science-macro509" title="%{repeating_hench5_$X_kinetic-science-macro509}" value="@{psionkinetic-science-macro509}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost609" title="@{repeating_hench5_$X_PSP-cost609}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_kinetic-science510" title="@{repeating_hench5_$X_kinetic-science510}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod510" title="@{repeating_hench5_$X_powerscore-nomod510}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod510" title="@{repeating_hench5_$X_powerscore-mod510}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod510" title="@{repeating_hench5_$X_psionic-mod510}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Kinetic-Science510" title="%{repeating_hench5_$X_Kinetic-Science510}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod510})]]&le;[[@{powerscore-nomod510}+(@{powerscore-mod510})]] @{kinetic-science510}"></button></td>
-                                        <td><input type="text" name="attr_psionkinetic-science-macro510" title="@{repeating_hench5_$X_psionkinetic-science-macro510}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-science-macro510" title="%{repeating_hench5_$X_kinetic-science-macro510}" value="@{psionkinetic-science-macro510}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost610" title="@{repeating_hench5_$X_PSP-cost610}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_kinetic-science511" title="@{repeating_hench5_$X_kinetic-science511}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod511" title="@{repeating_hench5_$X_powerscore-nomod511}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod511" title="@{repeating_hench5_$X_powerscore-mod511}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod511" title="@{repeating_hench5_$X_psionic-mod511}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Kinetic-Science511" title="%{repeating_hench5_$X_Kinetic-Science511}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod511})]]&le;[[@{powerscore-nomod511}+(@{powerscore-mod511})]] @{kinetic-science511}"></button></td>
-                                        <td><input type="text" name="attr_psionkinetic-science-macro511" title="@{repeating_hench5_$X_psionkinetic-science-macro511}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_kinetic-science-macro511" title="%{repeating_hench5_$X_kinetic-science-macro511}" value="@{psionkinetic-science-macro511}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost611" title="@{repeating_hench5_$X_PSP-cost611}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                </table>
-                            </ul>
-                        </div>
+                        insert_follower-psionic-core.html_(Psychokinectic Sciences,Kinetic-Science,,kinetic-science,09,10,11,repeating_hench5_$X_)
+                        insert_follower-psionic-core.html_(Psychokinectic Devotions,Kinetic-Devotion,psion,kinetic,06,07,08,repeating_hench5_$X_)
                     </div>
                     <br>
                     <div class="sheet-2colrow">
-                        <div class="sheet-col">
-                            <h4><b>Psychoportive Devotions</b></h4>
-                            <ul>
-                                <table>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionportation512" title="@{repeating_hench5_$X_psionportation512}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod512" title="@{repeating_hench5_$X_powerscore-nomod512}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod512" title="@{repeating_hench5_$X_powerscore-mod512}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod512" title="@{repeating_hench5_$X_psionic-mod512}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Portation-Devotion512" title="%{repeating_hench5_$X_Portation-Devotion512}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod512})]]&le;[[@{powerscore-nomod512}+(@{powerscore-mod512})]] @{psionportation512}"></button></td>
-                                        <td><input type="text" name="attr_psionportation-macro512" title="@{repeating_hench5_$X_psionportation-macro512}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-macro512" title="%{repeating_hench5_$X_portation-macro512}" value="@{psionportation-macro512}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost612" title="@{repeating_hench5_$X_PSP-cost612}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionportation513" title="@{repeating_hench5_$X_psionportation513}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod513" title="@{repeating_hench5_$X_powerscore-nomod513}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod513" title="@{repeating_hench5_$X_powerscore-mod513}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod513" title="@{repeating_hench5_$X_psionic-mod513}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Portation-Devotion513" title="%{repeating_hench5_$X_Portation-Devotion513}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod513})]]&le;[[@{powerscore-nomod513}+(@{powerscore-mod513})]] @{psionportation513}"></button></td>
-                                        <td><input type="text" name="attr_psionportation-macro513" title="@{repeating_hench5_$X_psionportation-macro513}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-macro513" title="%{repeating_hench5_$X_portation-macro513}" value="@{psionportation-macro513}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost613" title="@{repeating_hench5_$X_PSP-cost613}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionportation514" title="@{repeating_hench5_$X_psionportation514}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod514" title="@{repeating_hench5_$X_powerscore-nomod514}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod514" title="@{repeating_hench5_$X_powerscore-mod514}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod514" title="@{repeating_hench5_$X_psionic-mod514}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Portation-Devotion514" title="%{repeating_hench5_$X_Portation-Devotion514}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod514})]]&le;[[@{powerscore-nomod514}+(@{powerscore-mod514})]] @{psionportation514}"></button></td>
-                                        <td><input type="text" name="attr_psionportation-macro514" title="@{repeating_hench5_$X_psionportation-macro514}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-macro514" title="%{repeating_hench5_$X_portation-macro514}" value="@{psionportation-macro514}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost614" title="@{repeating_hench5_$X_PSP-cost614}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                </table>
-                            </ul>
-                        </div>
-                        <div class="sheet-col">
-                            <h4><b>Psychoportive Sciences</b></h4>
-                            <ul>
-                                <table>
-                                    <tr>
-                                        <td><input type="text" name="attr_portation-science515" title="@{repeating_hench5_$X_portation-science515}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod515" title="@{repeating_hench5_$X_powerscore-nomod515}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod515" title="@{repeating_hench5_$X_powerscore-mod515}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod515" title="@{repeating_hench5_$X_psionic-mod515}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Portation-Science515" title="%{repeating_hench5_$X_Portation-Science515}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod515})]]&le;[[@{powerscore-nomod515}+(@{powerscore-mod515})]] @{portation-science515}"></button></td>
-                                        <td><input type="text" name="attr_psionportation-science-macro515" title="@{repeating_hench5_$X_psionportation-science-macro515}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-science-macro515" title="%{repeating_hench5_$X_portation-science-macro515}" value="@{psionportation-science-macro515}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost615" title="@{repeating_hench5_$X_PSP-cost615}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_portation-science516" title="@{repeating_hench5_$X_portation-science516}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod516" title="@{repeating_hench5_$X_powerscore-nomod516}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod516" title="@{repeating_hench5_$X_powerscore-mod516}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod516" title="@{repeating_hench5_$X_psionic-mod516}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Portation-Science516" title="%{repeating_hench5_$X_Portation-Science516}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod516})]]&le;[[@{powerscore-nomod516}+(@{powerscore-mod516})]] @{portation-science516}"></button></td>
-                                        <td><input type="text" name="attr_psionportation-science-macro516" title="@{repeating_hench5_$X_psionportation-science-macro516}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-science-macro516" title="%{repeating_hench5_$X_portation-science-macro516}" value="@{psionportation-science-macro516}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost616" title="@{repeating_hench5_$X_PSP-cost616}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_portation-science517" title="@{repeating_hench5_$X_portation-science517}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod517" title="@{repeating_hench5_$X_powerscore-nomod517}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod517" title="@{repeating_hench5_$X_powerscore-mod517}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod517" title="@{repeating_hench5_$X_psionic-mod517}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Portation-Science517" title="%{repeating_hench5_$X_Portation-Science517}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod517})]]&le;[[@{powerscore-nomod517}+(@{powerscore-mod517})]] @{portation-science517}"></button></td>
-                                        <td><input type="text" name="attr_psionportation-science-macro517" title="@{repeating_hench5_$X_psionportation-science-macro517}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_portation-science-macro517" title="%{repeating_hench5_$X_portation-science-macro517}" value="@{repeating_hench5_$X_psionportation-science-macro517}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost617" title="@{repeating_hench5_$X_PSP-cost617}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                </table>
-                            </ul>
-                        </div>
+                        insert_follower-psionic-core.html_(Psychometabolic Sciences,Metabolic-Science,,metabolic-science,21,22,23,repeating_hench5_$X_)
+                        insert_follower-psionic-core.html_(Psychometabolic Devotions,Metabolic-Devotion,psion,metabolic,18,19,20,repeating_hench5_$X_)
                     </div>
                     <br>
                     <div class="sheet-2colrow">
-                        <div class="sheet-col">
-                            <h4><b>Psychometabolism Devotions</b></h4>
-                            <ul>
-                                <table>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionmetabolic518" title="@{repeating_hench5_$X_psionmetabolic518}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod518" title="@{repeating_hench5_$X_powerscore-nomod518}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod518" title="@{repeating_hench5_$X_powerscore-mod518}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod518" title="@{repeating_hench5_$X_psionic-mod518}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Metabolic-Devotion518" title="%{repeating_hench5_$X_Metabolic-Devotion518}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod518})]]&le;[[@{powerscore-nomod518}+(@{powerscore-mod518})]] @{psionmetabolic518}"></button></td>
-                                        <td><input type="text" name="attr_psionmetabolic-macro518" title="@{repeating_hench5_$X_psionmetabolic-macro518}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-macro518" title="%{repeating_hench5_$X_metabolic-macro518}" value="@{psionmetabolic-macro518}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost618" title="@{repeating_hench5_$X_PSP-cost618}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionmetabolic519" title="@{repeating_hench5_$X_psionmetabolic519}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod519" title="@{repeating_hench5_$X_powerscore-nomod519}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod519" title="@{repeating_hench5_$X_powerscore-mod519}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod519" title="@{repeating_hench5_$X_psionic-mod519}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Metabolic-Devotion519" title="%{repeating_hench5_$X_Metabolic-Devotion519}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod519})]]&le;[[@{powerscore-nomod519}+(@{powerscore-mod519})]] @{psionmetabolic519}"></button></td>
-                                        <td><input type="text" name="attr_psionmetabolic-macro519" title="@{repeating_hench5_$X_psionmetabolic-macro519}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-macro519" title="%{repeating_hench5_$X_metabolic-macro519}" value="@{psionmetabolic-macro519}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost619" title="@{repeating_hench5_$X_PSP-cost619}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionmetabolic520" title="@{repeating_hench5_$X_psionmetabolic520}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod520" title="@{repeating_hench5_$X_powerscore-nomod520}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod520" title="@{repeating_hench5_$X_powerscore-mod520}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod520" title="@{repeating_hench5_$X_psionic-mod520}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Metabolic-Devotion520" title="%{repeating_hench5_$X_Metabolic-Devotion520}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod520})]]&le;[[@{powerscore-nomod520}+(@{powerscore-mod520})]] @{psionmetabolic520}"></button></td>
-                                        <td><input type="text" name="attr_psionmetabolic-macro520" title="@{repeating_hench5_$X_psionmetabolic-macro520}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-macro520" title="%{repeating_hench5_$X_metabolic-macro520}" value="@{psionmetabolic-macro520}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost620" title="@{repeating_hench5_$X_PSP-cost620}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                </table>
-                            </ul>
-                        </div>
-                        <div class="sheet-col">
-                            <h4><b>Psychometabolism Sciences</b></h4>
-                            <ul>
-                                <table>
-                                    <tr>
-                                        <td><input type="text" name="attr_metabolic-science521" title="@{repeating_hench5_$X_metabolic-science521}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod521" title="@{repeating_hench5_$X_powerscore-nomod521}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod521" title="@{repeating_hench5_$X_powerscore-mod521}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod521" title="@{repeating_hench5_$X_psionic-mod521}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Metabolic-Science521" title="%{repeating_hench5_$X_Metabolic-Science521}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod521})]]&le;[[@{powerscore-nomod521}+(@{powerscore-mod521})]] @{metabolic-science521}"></button></td>
-                                        <td><input type="text" name="attr_psionmetabolic-science-macro521" title="@{repeating_hench5_$X_psionmetabolic-science-macro521}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-science-macro521" title="%{repeating_hench5_$X_metabolic-science-macro521}" value="@{psionmetabolic-science-macro521}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost621" title="@{repeating_hench5_$X_PSP-cost621}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_metabolic-science522" title="@{repeating_hench5_$X_metabolic-science522}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod522" title="@{repeating_hench5_$X_powerscore-nomod522}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod522" title="@{repeating_hench5_$X_powerscore-mod522}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod522" title="@{repeating_hench5_$X_psionic-mod522}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Metabolic-Science522" title="%{repeating_hench5_$X_Metabolic-Science522}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod522})]]&le;[[@{powerscore-nomod522}+(@{powerscore-mod522})]] @{metabolic-science522}"></button></td>
-                                        <td><input type="text" name="attr_psionmetabolic-science-macro522" title="@{repeating_hench5_$X_psionmetabolic-science-macro522}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-science-macro522" title="%{repeating_hench5_$X_metabolic-science-macro522}" value="@{psionmetabolic-science-macro522}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost622" title="@{repeating_hench5_$X_PSP-cost622}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_metabolic-science523" title="@{repeating_hench5_$X_metabolic-science523}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod523" title="@{repeating_hench5_$X_powerscore-nomod523}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod523" title="@{repeating_hench5_$X_powerscore-mod523}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod523" title="@{repeating_hench5_$X_psionic-mod523}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Metabolic-Science523" title="%{repeating_hench5_$X_Metabolic-Science523}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod523})]]&le;[[@{powerscore-nomod523}+(@{powerscore-mod523})]] @{metabolic-science523}"></button></td>
-                                        <td><input type="text" name="attr_psionmetabolic-science-macro523" title="@{repeating_hench5_$X_psionmetabolic-science-macro523}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_metabolic-science-macro523" title="%{repeating_hench5_$X_metabolic-science-macro523}" value="@{psionmetabolic-science-macro523}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost623" title="@{repeating_hench5_$X_PSP-cost623}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                </table>
-                            </ul>
-                        </div>
+                        insert_follower-psionic-core.html_(Psychoportive Sciences,Portation-Science,,portation-science,15,16,17,repeating_hench5_$X_)
+                        insert_follower-psionic-core.html_(Psychoportive Devotions,Portation-Devotion,psion,portation,12,13,14,repeating_hench5_$X_)
                     </div>
                     <br>
                     <div class="sheet-2colrow">
-                        <div class="sheet-col">
-                            <h4><b>Clairsentient Devotions</b></h4>
-                            <ul>
-                                <table>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionclair524" title="@{repeating_hench5_$X_psionclair524}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod524" title="@{repeating_hench5_$X_powerscore-nomod524}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod524" title="@{repeating_hench5_$X_powerscore-mod524}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod524" title="@{repeating_hench5_$X_psionic-mod524}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Clair-Devotion524" title="%{repeating_hench5_$X_Clair-Devotion524}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod524})]]&le;[[@{powerscore-nomod524}+(@{powerscore-mod524})]] @{psionclair524}"></button></td>
-                                        <td><input type="text" name="attr_psionclair-macro524" title="@{repeating_hench5_$X_psionclair-macro524}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-macro524" title="%{repeating_hench5_$X_clair-macro524}" value="@{psionclair-macro524}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost624" title="@{repeating_hench5_$X_PSP-cost624}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionclair525" title="@{repeating_hench5_$X_psionclair525}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod525" title="@{repeating_hench5_$X_powerscore-nomod525}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod525" title="@{repeating_hench5_$X_powerscore-mod525}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod525" title="@{repeating_hench5_$X_psionic-mod525}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Clair-Devotion525" title="%{repeating_hench5_$X_Clair-Devotion525}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod525})]]&le;[[@{powerscore-nomod525}+(@{powerscore-mod525})]] @{psionclair525}"></button></td>
-                                        <td><input type="text" name="attr_psionclair-macro525" title="@{repeating_hench5_$X_psionclair-macro525}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-macro525" title="%{repeating_hench5_$X_clair-macro525}" value="@{psionclair-macro525}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost625" title="@{repeating_hench5_$X_PSP-cost625}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionclair526" title="@{repeating_hench5_$X_psionclair526}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod526" title="@{repeating_hench5_$X_powerscore-nomod526}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod526" title="@{repeating_hench5_$X_powerscore-mod526}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod526" title="@{repeating_hench5_$X_psionic-mod526}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Clair-Devotion526" title="%{repeating_hench5_$X_Clair-Devotion526}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod526})]]&le;[[@{powerscore-nomod526}+(@{powerscore-mod526})]] @{psionclair526}"></button></td>
-                                        <td><input type="text" name="attr_psionclair-macro526" title="@{repeating_hench5_$X_psionclair-macro526}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-macro526" title="%{repeating_hench5_$X_clair-macro526}" value="@{psionclair-macro526}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost626" title="@{repeating_hench5_$X_PSP-cost626}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                </table>
-                            </ul>
-                        </div>
-                        <div class="sheet-col">
-                            <h4><b>Clairsentient Sciences</b></h4>
-                            <ul>
-                                <table>
-                                    <tr>
-                                        <td><input type="text" name="attr_clair-science527" title="@{repeating_hench5_$X_clair-science527}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod527" title="@{repeating_hench5_$X_powerscore-nomod527}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod527" title="@{repeating_hench5_$X_powerscore-mod527}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod527" title="@{repeating_hench5_$X_psionic-mod527}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Clair-Science527" title="%{repeating_hench5_$X_Clair-Science527}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod527})]]&le;[[@{powerscore-nomod527}+(@{powerscore-mod527})]] @{clair-science527}"></button></td>
-                                        <td><input type="text" name="attr_psionclair-science-macro527" title="@{repeating_hench5_$X_psionclair-science-macro527}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-science-macro527" title="%{repeating_hench5_$X_clair-science-macro527}" value="@{psionclair-science-macro527}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost627" title="@{repeating_hench5_$X_PSP-cost627}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_clair-science528" title="@{repeating_hench5_$X_clair-science528}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod528" title="@{repeating_hench5_$X_powerscore-nomod528}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod528" title="@{repeating_hench5_$X_powerscore-mod528}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod528" title="@{repeating_hench5_$X_psionic-mod528}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Clair-Science528" title="%{repeating_hench5_$X_Clair-Science528}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod528})]]&le;[[@{powerscore-nomod528}+(@{powerscore-mod528})]] @{clair-science528}"></button></td>
-                                        <td><input type="text" name="attr_psionclair-science-macro528" title="@{repeating_hench5_$X_psionclair-science-macro528}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-science-macro528" title="%{repeating_hench5_$X_clair-science-macro528}" value="@{psionclair-science-macro528}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost628" title="@{repeating_hench5_$X_PSP-cost628}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_clair-science529" title="@{repeating_hench5_$X_clair-science529}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod529" title="@{repeating_hench5_$X_powerscore-nomod529}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod529" title="@{repeating_hench5_$X_powerscore-mod529}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod529" title="@{repeating_hench5_$X_psionic-mod529}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Clair-Science529" title="%{repeating_hench5_$X_Clair-Science529}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod529})]]&le;[[@{powerscore-nomod529}+(@{powerscore-mod529})]] @{clair-science529}"></button></td>
-                                        <td><input type="text" name="attr_psionclair-science-macro529" title="@{repeating_hench5_$X_psionclair-science-macro529}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_clair-science-macro529" title="%{repeating_hench5_$X_clair-science-macro529}" value="@{psionclair-science-macro529}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost629" title="@{repeating_hench5_$X_PSP-cost629}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                </table>
-                            </ul>
-                        </div>
+                        insert_follower-psionic-core.html_(Telepathic Sciences,Telepathy-Science,,telepathic-science,03,04,05,repeating_hench5_$X_)
+                        insert_follower-psionic-core.html_(Telepathic Devotions,Telepathy-Devotion,psion,telepathic,00,01,02,repeating_hench5_$X_)
                     </div>
                     <br>
                     <div class="sheet-2colrow">
-                        <div class="sheet-col">
-                            <h4><b>Metapsionic Devotions</b></h4>
-                            <ul>
-                                <table>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionmeta536" title="@{repeating_hench5_$X_psionmeta536}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod536" title="@{repeating_hench5_$X_powerscore-nomod536}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod536" title="@{repeating_hench5_$X_powerscore-mod536}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod536" title="@{repeating_hench5_$X_psionic-mod536}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Meta-Devotion536" title="%{repeating_hench5_$X_Meta-Devotion536}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod536})]]&le;[[@{powerscore-nomod536}+(@{powerscore-mod536})]] @{psionmeta536}"></button></td>
-                                        <td><input type="text" name="attr_psionmeta-macro536" title="@{repeating_hench5_$X_psionmeta-macro536}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-macro536" title="%{repeating_hench5_$X_meta-macro536}" value="@{psionmeta-macro536}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost636" title="@{repeating_hench5_$X_PSP-cost636}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionmeta537" title="@{repeating_hench5_$X_psionmeta537}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod537" title="@{repeating_hench5_$X_powerscore-nomod537}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod537" title="@{repeating_hench5_$X_powerscore-mod537}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod537" title="@{repeating_hench5_$X_psionic-mod537}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Meta-Devotion537" title="%{repeating_hench5_$X_Meta-Devotion537}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod537})]]&le;[[@{powerscore-nomod537}+(@{powerscore-mod537})]] @{psionmeta537}"></button></td>
-                                        <td><input type="text" name="attr_psionmeta-macro537" title="@{repeating_hench5_$X_psionmeta-macro537}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-macro537" title="%{repeating_hench5_$X_meta-macro537}" value="@{psionmeta-macro537}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost637" title="@{repeating_hench5_$X_PSP-cost637}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionmeta538" title="@{repeating_hench5_$X_psionmeta538}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod538" title="@{repeating_hench5_$X_powerscore-nomod538}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod538" title="@{repeating_hench5_$X_powerscore-mod538}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod538" title="@{repeating_hench5_$X_psionic-mod538}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Meta-Devotion538" title="%{repeating_hench5_$X_Meta-Devotion538}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod538})]]&le;[[@{powerscore-nomod538}+(@{powerscore-mod538})]] @{psionmeta538}"></button></td>
-                                        <td><input type="text" name="attr_psionmeta-macro538" title="@{repeating_hench5_$X_psionmeta-macro538}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-macro538" title="%{repeating_hench5_$X_meta-macro538}" value="@{psionmeta-macro538}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost638" title="@{repeating_hench5_$X_PSP-cost638}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                </table>
-                            </ul>
-                        </div>
-                        <div class="sheet-col">
-                            <h4><b>Metapsionic Sciences</b></h4>
-                            <ul>
-                                <table>
-                                    <tr>
-                                        <td><input type="text" name="attr_meta-science539" title="@{repeating_hench5_$X_meta-science539}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod539" title="@{repeating_hench5_$X_powerscore-nomod539}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod539" title="@{repeating_hench5_$X_powerscore-mod539}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod539" title="@{repeating_hench5_$X_psionic-mod539}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Meta-Science539" title="%{repeating_hench5_$X_Meta-Science539}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod539})]]&le;[[@{powerscore-nomod539}+(@{powerscore-mod539})]] @{meta-science539}"></button></td>
-                                        <td><input type="text" name="attr_psionmeta-science-macro539" title="@{repeating_hench5_$X_psionmeta-science-macro539}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-science-macro539" title="%{repeating_hench5_$X_meta-science-macro539}" value="@{psionmeta-science-macro539}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost639" title="@{repeating_hench5_$X_PSP-cost639}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_meta-science540" title="@{repeating_hench5_$X_meta-science540}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod540" title="@{repeating_hench5_$X_powerscore-nomod540}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod540" title="@{repeating_hench5_$X_powerscore-mod540}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod540" title="@{repeating_hench5_$X_psionic-mod540}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Meta-Science540" title="%{repeating_hench5_$X_Meta-Science540}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod540})]]&le;[[@{powerscore-nomod540}+(@{powerscore-mod540})]] @{meta-science540}"></button></td>
-                                        <td><input type="text" name="attr_psionmeta-science-macro540" title="@{repeating_hench5_$X_psionmeta-science-macro540}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-science-macro540" title="%{meta-science-macro540}" value="@{psionmeta-science-macro540}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost640" title="@{repeating_hench5_$X_PSP-cost640}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_meta-science541" title="@{repeating_hench5_$X_meta-science541}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod541" title="@{repeating_hench5_$X_powerscore-nomod541}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod541" title="@{repeating_hench5_$X_powerscore-mod541}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod541" title="@{repeating_hench5_$X_psionic-mod541}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Meta-Science541" title="%{repeating_hench5_$X_Meta-Science541}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod541})]]&le;[[@{powerscore-nomod541}+(@{powerscore-mod541})]] @{meta-science541}"></button></td>
-                                        <td><input type="text" name="attr_psionmeta-science-macro541" title="@{repeating_hench5_$X_psionmeta-science-macro541}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_meta-science-macro541" title="%{repeating_hench5_$X_meta-science-macro541}" value="@{psionmeta-science-macro541}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost641" title="@{repeating_hench5_$X_PSP-cost641}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                </table>
-                            </ul>
-                        </div>
+                        insert_follower-psionic-core.html_(Metapsionic Sciences,Meta-Science,,meta-science,39,40,41,repeating_hench5_$X_)
+                        insert_follower-psionic-core.html_(Metapsionic Devotions,Meta-Devotion,psion,meta,36,37,38,repeating_hench5_$X_)
                     </div>
                     <br>
                     <div class="sheet-2colrow">
-                        <div class="sheet-col">
-                            <h4><b>Attack Modes</b></h4>
-                            <ul>
-                                <table>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionattacking530" title="@{repeating_hench5_$X_psionattacking530}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod530" title="@{repeating_hench5_$X_powerscore-nomod530}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod530" title="@{repeating_hench5_$X_powerscore-mod530}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod530" title="@{repeating_hench5_$X_psionic-mod530}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Attacking530" title="%{repeating_hench5_$X_Attacking530}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod530})]]&le;[[@{powerscore-nomod530}+(@{powerscore-mod530})]] @{psionattacking530}"></button></td>
-                                        <td><input type="text" name="attr_psionattacking-macro530" title="@{repeating_hench5_$X_psionattacking-macro530}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_attacking-macro530" title="%{repeating_hench5_$X_attacking-macro530}" value="@{psionattacking-macro530}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost630" title="@{repeating_hench5_$X_PSP-cost630}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionattacking531" title="@{repeating_hench5_$X_psionattacking531}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod531" title="@{repeating_hench5_$X_powerscore-nomod531}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod531" title="@{repeating_hench5_$X_powerscore-mod531}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod531" title="@{repeating_hench5_$X_psionic-mod531}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Attacking531" title="%{repeating_hench5_$X_Attacking531}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod531})]]&le;[[@{powerscore-nomod531}+(@{powerscore-mod531})]] @{psionattacking531}"></button></td>
-                                        <td><input type="text" name="attr_psionattacking-macro531" title="@{repeating_hench5_$X_psionattacking-macro531}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_attacking-macro531" title="%{repeating_hench5_$X_attacking-macro531}" value="@{psionattacking-macro531}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost631" title="@{repeating_hench5_$X_PSP-cost631}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psionattacking532" title="@{repeating_hench5_$X_psionattacking532}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod532" title="@{repeating_hench5_$X_powerscore-nomod532}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod532" title="@{repeating_hench5_$X_powerscore-mod532}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod532" title="@{repeating_hench5_$X_psionic-mod532}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Attacking532" title="%{repeating_hench5_$X_Attacking532}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod532})]]&le;[[@{powerscore-nomod532}+(@{powerscore-mod532})]] @{psionattacking532}"></button></td>
-                                        <td><input type="text" name="attr_psionattacking-macro532" title="@{repeating_hench5_$X_psionattacking-macro532}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_attacking-macro532" title="%{repeating_hench5_$X_attacking-macro532}" value="@{psionattacking-macro532}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost632" title="@{repeating_hench5_$X_PSP-cost632}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                </table>
-                            </ul>
-                        </div>
-                        <div class="sheet-col">
-                            <h4><b>Defense Modes</b></h4>
-                            <ul>
-                                <table>
-                                    <tr>
-                                        <td><input type="text" name="attr_psiondefending533" title="@{repeating_hench5_$X_psiondefending533}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod533" title="@{repeating_hench5_$X_powerscore-nomod533}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod533" title="@{repeating_hench5_$X_powerscore-mod533}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod533" title="@{repeating_hench5_$X_psionic-mod533}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Defending533" title="%{repeating_hench5_$X_Defending533}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod533})]]&le;[[@{powerscore-nomod533}+(@{powerscore-mod533})]] @{psiondefending533}"></button></td>
-                                        <td><input type="text" name="attr_psiondefending-macro533" title="@{repeating_hench5_$X_psiondefending-macro533}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_defending-macro533" title="%{repeating_hench5_$X_defending-macro533}" value="@{psiondefending-macro533}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost633" title="@{repeating_hench5_$X_PSP-cost633}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psiondefending534" title="@{repeating_hench5_$X_psiondefending534}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod534" title="@{repeating_hench5_$X_powerscore-nomod534}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod534" title="@{repeating_hench5_$X_powerscore-mod534}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod534" title="@{repeating_hench5_$X_psionic-mod534}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Defending534" title="%{repeating_hench5_$X_Defending534}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod534})]]&le;[[@{powerscore-nomod534}+(@{powerscore-mod534})]] @{psiondefending534}"></button></td>
-                                        <td><input type="text" name="attr_psiondefending-macro534" title="@{repeating_hench5_$X_psiondefending-macro534}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_defending-macro534" title="%{repeating_hench5_$X_defending-macro534}" value="@{psiondefending-macro534}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost634" title="@{repeating_hench5_$X_PSP-cost634}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psiondefending535" title="@{repeating_hench5_$X_psiondefending535}" class="sheet-medium"></td>
-                                        <td><input type="text" name="attr_powerscore-nomod535" title="@{repeating_hench5_$X_powerscore-nomod535}" placeholder="@{}" class="sheet-small"></td>
-                                        <td><input type="text" name="attr_powerscore-mod535" title="@{repeating_hench5_$X_powerscore-mod535}" placeholder="#" class="sheet-tiny"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionic-mod535" title="@{repeating_hench5_$X_psionic-mod535}" placeholder="#" class="sheet-tiny">
-                                            <button type="roll" name="roll_Defending535" title="%{repeating_hench5_$X_Defending535}" value="/roll [[1d20cs<1cf>20-(@{psionic-mod535})]]&le;[[@{powerscore-nomod535}+(@{powerscore-mod535})]] @{psiondefending535}"></button></td>
-                                        <td><input type="text" name="attr_psiondefending-macro535" title="@{repeating_hench5_$X_psiondefending-macro535}" class="sheet-track" placeholder="Macro"><button type="roll" name="roll_defending-macro535" title="%{repeating_hench5_$X_defending-macro535}" value="@{psiondefending-macro535}"></button></td>
-                                        <td><input type="text" name="attr_PSP-cost635" title="@{repeating_hench5_$X_PSP-cost635}" placeholder="#" class="sheet-small"/></td>
-                                    </tr>
-                                </table>
-                            </ul>
-                        </div>
+                        insert_follower-psionic-core.html_(Attack Modes,Attacking,psion,attacking,30,31,32,repeating_hench5_$X_)
+                        insert_follower-psionic-core.html_(Defense Modes,Defending,psion,defending,33,34,35,repeating_hench5_$X_)
                     </div>
                     <br>
                     <div class="sheet-2colrow">
                         <div class="sheet-col">
                             <h4>Psionic Strength Points</h4>
-                            <table style='width:250px;'>
+                            <table class="sheet-table-white sheet-default-header-first-row sheet-default-header-first-column" style='width:250px;'>
                                 <tr>
-                                    <td class="sheet-default-header" style="width:100px;">Value</td>
-                                    <td class="sheet-default-header" style="width:50px;">Current</td>
-                                    <td class="sheet-default-header" style="width:15px;">/</td>
-                                    <td class="sheet-default-header" style="width:60px;">Maximum</td>
-                                    <td class="sheet-default-header" style="width:25px;">Speed</td>
+                                    <td style="width:100px;">Value</td>
+                                    <td style="width:50px;">Current</td>
+                                    <td style="width:15px;">/</td>
+                                    <td style="width:60px;">Maximum</td>
+                                    <td style="width:25px;">Speed</td>
                                 </tr>
                                 <tr>
-                                    <td class="sheet-default-header" style=" width:100px;">PSP:</td>
+                                    <td>PSP:</td>
                                     <td><input type="number" name="attr_PSP500" title="@{repeating_hench5_$X_PSP500}" class="sheet-short" placeholder="PSP"/></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold; width:15px">/</td>
+                                    <td>/</td>
                                     <td><input type="number" name="attr_PSP500_max" title="@{repeating_hench5_$X_PSP500|max}" class="sheet-short"/></td>
                                 </tr>
                                 <tr>
-                                    <td class="sheet-default-header" style="width:100px;">Temp PSP:</td>
+                                    <td>Temp PSP:</td>
                                     <td><input type="number" name="attr_tempPSP500" title="@{repeating_hench5_$X_tempPSP500}" class="sheet-short" placeholder="Temp"/></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold; width:15px;">/</td>
+                                    <td>/</td>
                                     <td><input type="number" name="attr_tempPSP500_max" title="@{repeating_hench5_$X_tempPSP500|max}" class="sheet-short"/></td>
                                 </tr>
                                 <tr>
-                                    <td class="sheet-default-header" style="width:100px;">Stored PSP:</td>
+                                    <td>Stored PSP:</td>
                                     <td><input type="number" name="attr_storedPSP500" title="@{repeating_hench5_$X_storedPSP500}" class="sheet-short" placeholder="Stored"/></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold; width:15px;">/</td>
+                                    <td>/</td>
                                     <td><input type="number" name="attr_storedPSP500_max" title="@{repeating_hench5_$X_storedPSP500|max}" class="sheet-short"/></td>
                                 </tr>
                                 <tr>
-                                    <td class="sheet-default-header" style="width: 25px;">Speed</td>
+                                    <td>Speed</td>
                                     <td></td>
                                     <td></td>
                                     <td><input type="text" name="attr_psispeed501" title="@{repeating_hench5_$X_psispeed501}" class="sheet-small"></td>
@@ -2677,39 +1003,14 @@ <h4>Psionic Strength Points</h4>
                             </table>
                         </div>
                         <div class="sheet-col">
-                            <h4><b>Psionic Proficiencies</b></h4>
+                            <h4>Psionic Proficiencies</h4>
                             <ul>
-                                <table>
-                                    <tr>
-                                        <td><input type="text" name="attr_psiprofname500" title="@{repeating_hench5_$X_psiprofname500}" placeholder="Name of NWP"></td>
-                                        <td><input type="text" name="attr_psiprofstatnum500" title="@{repeating_hench5_$X_psiprofstatnum500}" placeholder="@{}" class="sheet-short"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod500" title="@{repeating_hench5_$X_psiprofmod500}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots500" title="@{repeating_hench5_$X_psiprofslots500}" class="sheet-short" placeholder="#">
-                                            <button type="roll" name="roll_Psiprof500" title="%{repeating_hench5_$X_Psiprof500}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum500})+(@{psiprofmod500})]] @{psiprofname500}"></button></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psiprofname501" title="@{repeating_hench5_$X_psiprofname501}" placeholder="Name of NWP"></td>
-                                        <td><input type="text" name="attr_psiprofstatnum501" title="@{repeating_hench5_$X_psiprofstatnum501}" placeholder="@{}" class="sheet-short"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod501" title="@{repeating_hench5_$X_psiprofmod501}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots501" title="@{repeating_hench5_$X_psiprofslots501}" class="sheet-short" placeholder="#">
-                                            <button type="roll" name="roll_Psiprof501" title="%{repeating_hench5_$X_Psiprof501}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum501})+(@{psiprofmod501})]] @{psiprofname501}"></button></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psiprofname502" title="@{repeating_hench5_$X_psiprofname502}" placeholder="Name of NWP"></td>
-                                        <td><input type="text" name="attr_psiprofstatnum502" title="@{repeating_hench5_$X_psiprofstatnum502}" placeholder="@{}" class="sheet-short"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod502" title="@{repeating_hench5_$X_psiprofmod502}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots502" title="@{repeating_hench5_$X_psiprofslots502}" class="sheet-short" placeholder="#">
-                                            <button type="roll" name="roll_Psiprof502" title="%{repeating_hench5_$X_Psiprof502}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum502})+(@{psiprofmod502})]] @{psiprofname502}"></button></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psiprofname503" title="@{repeating_hench5_$X_psiprofname503}" placeholder="Name of NWP"></td>
-                                        <td><input type="text" name="attr_psiprofstatnum503" title="@{repeating_hench5_$X_psiprofstatnum503}" placeholder="@{}" class="sheet-short"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod503" title="@{repeating_hench5_$X_psiprofmod503}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots503" title="@{repeating_hench5_$X_psiprofslots503}" class="sheet-short" placeholder="#">
-                                            <button type="roll" name="roll_Psiprof503" title="%{repeating_hench5_$X_Psiprof503}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum503})+(@{psiprofmod503})]] @{psiprofname503}"></button></td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="text" name="attr_psiprofname504" title="@{repeating_hench5_$X_psiprofname504}" placeholder="Name of NWP"></td>
-                                        <td><input type="text" name="attr_psiprofstatnum504" title="@{repeating_hench5_$X_psiprofstatnum504}" placeholder="@{}" class="sheet-short"></td>
-                                        <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psiprofmod504" title="@{repeating_hench5_$X_psiprofmod504}" value="0" class="sheet-short"><input type="number" name="attr_psiprofslots504" title="@{repeating_hench5_$X_psiprofslots504}" class="sheet-short" placeholder="#">
-                                            <button type="roll" name="roll_Psiprof504" title="%{repeating_hench5_$X_Psiprof504}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psiprofstatnum504})+(@{psiprofmod504})]] @{psiprofname504}"></button></td>
-                                    </tr>
+                                <table class="sheet-table-white">
+                                    insert_follower-psionic-core-proficiency.html_(500,repeating_hench5_$X_,5)
+                                    insert_follower-psionic-core-proficiency.html_(501,repeating_hench5_$X_,5)
+                                    insert_follower-psionic-core-proficiency.html_(502,repeating_hench5_$X_,5)
+                                    insert_follower-psionic-core-proficiency.html_(503,repeating_hench5_$X_,5)
+                                    insert_follower-psionic-core-proficiency.html_(504,repeating_hench5_$X_,5)
                                 </table>
                             </ul>
                         </div>
@@ -2732,400 +1033,40 @@ <h4>Psionics Revised</h4>
                     <br>
                     <br>
                     <div class="sheet-2colrow">
-                        <div class="sheet-col">
-                            <h4><b>Telepathy Devotions</b></h4>
-                            <table>
-                                <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-telepathy-name700" title="@{repeating_hench5_$X_psionic-telepathy-name700}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj700" title="@{repeating_hench5_$X_mthac0adj700}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac700" title="@{repeating_hench5_$X_mac700}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0700" title="@{repeating_hench5_$X_MThAC0700}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit700" title="%{repeating_hench5_$X_mthac02-hit700}" value="@{henchname55} hits a MAC of [[@{MThAC0700}-(1d20+(@{mthac0adj700})+(@{misc-mod}))]]&le;[[@{mac700}]] using their @{psionic-telepathy-name700}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro700" title="@{repeating_hench5_$X_psionic-macro700}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check700" title="%{repeating_hench5_$X_psionic-macro3-check700}" value="@{psionic-macro700}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost700" title="@{repeating_hench5_$X_PSP-cost700}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-telepathy-name701" title="@{repeating_hench5_$X_psionic-telepathy-name701}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj701" title="@{repeating_hench5_$X_mthac0adj701}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac701" title="@{repeating_hench5_$X_mac701}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0701" title="@{repeating_hench5_$X_MThAC0701}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit701" title="%{repeating_hench5_$X_mthac02-hit701}" value="@{henchname55} hits a MAC of [[@{MThAC0701}-(1d20+(@{mthac0adj701})+(@{misc-mod}))]]&le;[[@{mac701}]] using their @{psionic-telepathy-name701}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro701" title="@{repeating_hench5_$X_psionic-macro701}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check701" title="%{repeating_hench5_$X_psionic-macro3-check701}" value="@{psionic-macro701}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost701" title="@{repeating_hench5_$X_PSP-cost701}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-telepathy-name702" title="@{repeating_hench5_$X_psionic-telepathy-name702}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj702" title="@{repeating_hench5_$X_mthac0adj702}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac702" title="@{mrepeating_hench5_$X_ac702}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0702" title="@{repeating_hench5_$X_MThAC0702}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit702" title="%{repeating_hench5_$X_mthac02-hit702}" value="@{henchname55} hits a MAC of [[@{MThAC0702}-(1d20+(@{mthac0adj702})+(@{misc-mod}))]]&le;[[@{mac702}]] using their @{psionic-telepathy-name702}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro702" title="@{repeating_hench5_$X_psionic-macro702}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check702" title="%{repeating_hench5_$X_psionic-macro3-check702}" value="@{psionic-macro702}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost702" title="@{repeating_hench5_$X_PSP-cost702}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </div>
-                        <div class="sheet-col">
-                            <h4><b>Telepathy Sciences</b></h4>
-                            <table>
-                                <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-telepathy-science-name703" title="@{repeating_hench5_$X_psionic-telepathy-science-name703}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj703" title="@{repeating_hench5_$X_mthac0adj703}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac703" title="@{repeating_hench5_$X_mac703}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0703" title="@{repeating_hench5_$X_MThAC0703}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit703" title="%{repeating_hench5_$X_mthac03-hit703}" value="@{henchname55} hits a MAC of [[@{MThAC0703}-(1d20+(@{mthac0adj703})+(@{misc-mod}))]]&le;[[@{mac703}]] using their @{psionic-telepathy-science-name703}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro703" title="@{repeating_hench5_$X_psionic-macro703}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check703" title="%{repeating_hench5_$X_psionic-macro4-check703}" value="@{psionic-macro703}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost703" title="@{repeating_hench5_$X_PSP-cost703}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-telepathy-science-name704" title="@{repeating_hench5_$X_psionic-telepathy-science-name704}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj704" title="@{repeating_hench5_$X_mthac0adj704}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac704" title="@{repeating_hench5_$X_mac704}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0704" title="@{repeating_hench5_$X_MThAC0704}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit704" title="%{repeating_hench5_$X_mthac03-hit704}" value="@{henchname55} hits a MAC of [[@{MThAC0704}-(1d20+(@{mthac0adj704})+(@{misc-mod}))]]&le;[[@{mac704}]] using their @{psionic-telepathy-science-name704}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro704" title="@{repeating_hench5_$X_psionic-macro704}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check704" title="%{repeating_hench5_$X_psionic-macro4-check704}" value="@{psionic-macro704}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost704" title="@{repeating_hench5_$X_PSP-cost704}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-telepathy-science-name705" title="@{repeating_hench5_$X_psionic-telepathy-science-name705}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj705" title="@{repeating_hench5_$X_mthac0adj705}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac705" title="@{repeating_hench5_$X_mac705}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0705" title="@{repeating_hench5_$X_MThAC0705}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit705" title="%{repeating_hench5_$X_mthac03-hit705}" value="@{henchname55} hits a MAC of [[@{MThAC0705}-(1d20+(@{mthac0adj705})+(@{misc-mod}))]]&le;[[@{mac705}]] using their @{psionic-telepathy-science-name705}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro705" title="@{repeating_hench5_$X_psionic-macro705}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check705" title="%{repeating_hench5_$X_psionic-macro4-check705}" value="@{psionic-macro705}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost705" title="@{repeating_hench5_$X_PSP-cost705}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </div>
+                        insert_follower-psionic-skills-and-powers.html_(Clairsentient Sciences,clairsentience-science,27,28,29,011,12,repeating_hench5_$X_,5)
+                        insert_follower-psionic-skills-and-powers.html_(Clairsentient Devotions,clairsentience,24,25,26,010,11,repeating_hench5_$X_,5)
                     </div>
                     <br>
                     <div class="sheet-2colrow">
-                        <div class="sheet-col">
-                            <h4><b>Psychokinesis Devotions</b></h4>
-                            <table>
-                                <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychokinesis-name706" title="@{repeating_hench5_$X_psionic-psychokinesis-name706}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj706" title="@{repeating_hench5_$X_mthac0adj706}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac706" title="@{repeating_hench5_$X_mac706}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0706" title="@{repeating_hench5_$X_MThAC0706}" class="sheet-small" value="20"><button type="roll" name="roll_mthac04-hit706" title="%{repeating_hench5_$X_mthac04-hit706}" value="@{henchname55} hits a MAC of [[@{MThAC0706}-(1d20+(@{mthac0adj706})+(@{misc-mod}))]]&le;[[@{mac706}]] using their @{psionic-psychokinesis-name706}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro706" title="@{repeating_hench5_$X_psionic-macro706}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro5-check706" title="%{repeating_hench5_$X_psionic-macro5-check706}" value="@{psionic-macro706}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost706" title="@{repeating_hench5_$X_PSP-cost706}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychokinesis-name707" title="@{repeating_hench5_$X_psionic-psychokinesis-name707}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj707" title="@{repeating_hench5_$X_mthac0adj707}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac707" title="@{repeating_hench5_$X_mac707}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0707" title="@{repeating_hench5_$X_MThAC0707}" class="sheet-small" value="20"><button type="roll" name="roll_mthac04-hit707" title="%{repeating_hench5_$X_mthac04-hit707}" value="@{henchname55} hits a MAC of [[@{MThAC0707}-(1d20+(@{mthac0adj707})+(@{misc-mod}))]]&le;[[@{mac707}]] using their @{psionic-psychokinesis-name707}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro707" title="@{repeating_hench5_$X_psionic-macro707}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro5-check707" title="%{repeating_hench5_$X_psionic-macro5-check707}" value="@{psionic-macro707}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost707" title="@{repeating_hench5_$X_PSP-cost707}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychokinesis-name708" title="@{repeating_hench5_$X_psionic-psychokinesis-name708}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj708" title="@{repeating_hench5_$X_mthac0adj708}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac708" title="@{repeating_hench5_$X_mac708}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0708" title="@{repeating_hench5_$X_MThAC0708}" class="sheet-small" value="20"><button type="roll" name="roll_mthac04-hit708" title="%{repeating_hench5_$X_mthac04-hit708}" value="@{henchname55} hits a MAC of [[@{MThAC0708}-(1d20+(@{mthac0adj708})+(@{misc-mod}))]]&le;[[@{mac708}]] using their @{psionic-psychokinesis-name708}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro708" title="@{repeating_hench5_$X_psionic-macro708}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro5-check708" title="%{repeating_hench5_$X_psionic-macro5-check708}" value="@{psionic-macro708}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost708" title="@{repeating_hench5_$X_PSP-cost708}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </div>
-                        <div class="sheet-col">
-                            <h4><b>Psychokinesis Sciences</b></h4>
-                            <table>
-                                <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychokinesis-science-name709" title="@{repeating_hench5_$X_psionic-psychokinesis-science-name709}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj709" title="@{repeating_hench5_$X_mthac0adj709}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac709" title="@{repeating_hench5_$X_mac709}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0709" title="@{repeating_hench5_$X_MThAC0709}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit709" title="%{repeating_hench5_$X_mthac05-hit709}" value="@{henchname55} hits a MAC of [[@{MThAC0709}-(1d20+(@{mthac0adj709})+(@{misc-mod}))]]&le;[[@{mac709}]] using their @{psionic-psychokinesis-science-name709}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro709" title="@{repeating_hench5_$X_psionic-macro709}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check709" title="%{repeating_hench5_$X_psionic-macro6-check709}" value="@{psionic-macro709}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost709" title="@{repeating_hench5_$X_PSP-cost709}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychokinesis-science-name710" title="@{repeating_hench5_$X_psionic-psychokinesis-science-name710}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj710" title="@{repeating_hench5_$X_mthac0adj710}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac710" title="@{repeating_hench5_$X_mac710}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0710" title="@{repeating_hench5_$X_MThAC0710}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit710" title="%{repeating_hench5_$X_mthac05-hit710}" value="@{henchname55} hits a MAC of [[@{MThAC0710}-(1d20+(@{mthac0adj710})+(@{misc-mod}))]]&le;[[@{mac710}]] using their @{psionic-psychokinesis-science-name710}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro710" title="@{repeating_hench5_$X_psionic-macro710}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check710" title="%{repeating_hench5_$X_psionic-macro6-check710}" value="@{psionic-macro710}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost710" title="@{repeating_hench5_$X_PSP-cost710}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychokinesis-science-name711" title="@{repeating_hench5_$X_psionic-psychokinesis-science-name711}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj711" title="@{repeating_hench5_$X_mthac0adj711}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac711" title="@{repeating_hench5_$X_mac711}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0711" title="@{repeating_hench5_$X_MThAC0711}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit711" title="%{repeating_hench5_$X_mthac05-hit711}" value="@{henchname55} hits a MAC of [[@{MThAC0711}-(1d20+(@{mthac0adj711})+(@{misc-mod}))]]&le;[[@{mac711}]] using their @{psionic-psychokinesis-science-name711}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro711" title="@{repeating_hench5_$X_psionic-macro711}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check711" title="%{repeating_hench5_$X_psionic-macro6-check711}" value="@{psionic-macro711}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost711" title="@{repeating_hench5_$X_PSP-cost711}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </div>
+                        insert_follower-psionic-skills-and-powers.html_(Psychokinectic Sciences,psychokinesis-science,09,10,11,05,6,repeating_hench5_$X_,5)
+                        insert_follower-psionic-skills-and-powers.html_(Psychokinectic Devotions,psychokinesis,06,07,08,04,5,repeating_hench5_$X_,5)
                     </div>
                     <br>
                     <div class="sheet-2colrow">
-                        <div class="sheet-col">
-                            <h4><b>Psychoportive Devotions</b></h4>
-                            <table>
-                                <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychoportation-name712" title="@{repeating_hench5_$X_psionic-psychoportation-name712}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj712" title="@{repeating_hench5_$X_mthac0adj712}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac712" title="@{repeating_hench5_$X_mac712}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0712" title="@{repeating_hench5_$X_MThAC0712}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit712" title="%{repeating_hench5_$X_mthac06-hit712}" value="@{henchname55} hits a MAC of [[@{MThAC0712}-(1d20+(@{mthac0adj712})+(@{misc-mod}))]]&le;[[@{mac712}]] using their @{psionic-psychoportation-name712}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro712" title="@{repeating_hench5_$X_psionic-macro712}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check712" title="%{repeating_hench5_$X_psionic-macro7-check712}" value="@{psionic-macro712}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost712" title="@{repeating_hench5_$X_PSP-cost712}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychoportation-name713" title="@{repeating_hench5_$X_psionic-psychoportation-name713}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj713" title="@{repeating_hench5_$X_mthac0adj713}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac713" title="@{repeating_hench5_$X_mac713}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0713" title="@{repeating_hench5_$X_MThAC0713}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit713" title="%{repeating_hench5_$X_mthac06-hit713}" value="@{henchname55} hits a MAC of [[@{MThAC0713}-(1d20+(@{mthac0adj713})+(@{misc-mod}))]]&le;[[@{mac713}]] using their @{psionic-psychoportation-name713}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro713" title="@{repeating_hench5_$X_psionic-macro713}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check713" title="%{repeating_hench5_$X_psionic-macro7-check713}" value="@{psionic-macro713}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost713" title="@{repeating_hench5_$X_PSP-cost713}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychoportation-name714" title="@{repeating_hench5_$X_psionic-psychoportation-name714}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj714" title="@{repeating_hench5_$X_mthac0adj714}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac714" title="@{repeating_hench5_$X_mac714}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0714" title="@{repeating_hench5_$X_MThAC0714}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit714" title="%{repeating_hench5_$X_mthac06-hit714}" value="@{henchname55} hits a MAC of [[@{MThAC0714}-(1d20+(@{mthac0adj714})+(@{misc-mod}))]]&le;[[@{mac714}]] using their @{psionic-psychoportation-name714}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro714" title="@{repeating_hench5_$X_psionic-macro714}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check714" title="%{repeating_hench5_$X_psionic-macro7-check714}" value="@{psionic-macro714}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost714" title="@{repeating_hench5_$X_PSP-cost714}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </div>
-                        <div class="sheet-col">
-                            <h4><b>Psychoportive Sciences</b></h4>
-                            <table>
-                                <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychoportation-science-name715" title="@{repeating_hench5_$X_psionic-psychoportation-science-name715}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj715" title="@{repeating_hench5_$X_mthac0adj715}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac715" title="@{repeating_hench5_$X_mac715}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0715" title="@{repeating_hench5_$X_MThAC0715}" class="sheet-small" value="20"><button type="roll" name="roll_mthac07-hit715" title="%{repeating_hench5_$X_mthac07-hit715}" value="@{henchname55} hits a MAC of [[@{MThAC0715}-(1d20+(@{mthac0adj715})+(@{misc-mod}))]]&le;[[@{mac715}]] using their @{psionic-psychoportation-science-name715}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro715" title="@{repeating_hench5_$X_psionic-macro715}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro8-check715" title="%{repeating_hench5_$X_psionic-macro8-check715}" value="@{psionic-macro715}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost715" title="@{repeating_hench5_$X_PSP-cost715}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychoportation-science-name716" title="@{repeating_hench5_$X_psionic-psychoportation-science-name716}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj716" title="@{repeating_hench5_$X_mthac0adj716}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac716" title="@{repeating_hench5_$X_mac716}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0716" title="@{repeating_hench5_$X_MThAC0716}" class="sheet-small" value="20"><button type="roll" name="roll_mthac07-hit716" title="%{repeating_hench5_$X_mthac07-hit716}" value="@{henchname55} hits a MAC of [[@{MThAC0716}-(1d20+(@{mthac0adj716})+(@{misc-mod}))]]&le;[[@{mac716}]] using their @{psionic-psychoportation-science-name716}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro716" title="@{repeating_hench5_$X_psionic-macro716}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro8-check716" title="%{repeating_hench5_$X_psionic-macro8-check716}" value="@{psionic-macro716}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost716" title="@{repeating_hench5_$X_PSP-cost716}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychoportation-science-name717" title="@{repeating_hench5_$X_psionic-psychoportation-science-name717}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj717" title="@{repeating_hench5_$X_mthac0adj717}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac717" title="@{repeating_hench5_$X_mac717}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0717" title="@{repeating_hench5_$X_MThAC0717}" class="sheet-small" value="20"><button type="roll" name="roll_mthac07-hit717" title="%{repeating_hench5_$X_mthac07-hit717}" value="@{henchname55} hits a MAC of [[@{MThAC0717}-(1d20+(@{mthac0adj717})+(@{misc-mod}))]]&le;[[@{mac717}]] using their @{psionic-psychoportation-science-name717}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro717" title="@{repeating_hench5_$X_psionic-macro717}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro8-check717" title="%{repeating_hench5_$X_psionic-macro8-check717}" value="@{psionic-macro717}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost717" title="@{repeating_hench5_$X_PSP-cost717}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </div>
+                        insert_follower-psionic-skills-and-powers.html_(Psychometabolic Sciences,psychometabolism-science,21,22,23,09,10,repeating_hench5_$X_,5)
+                        insert_follower-psionic-skills-and-powers.html_(Psychometabolic Devotions,psychometabolism,18,19,20,08,9,repeating_hench5_$X_,5)
                     </div>
                     <br>
                     <div class="sheet-2colrow">
-                        <div class="sheet-col">
-                            <h4><b>Psychometabolism Devotions</b></h4>
-                            <table>
-                                <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychometabolism-name718" title="@{repeating_hench5_$X_psionic-psychometabolism-name718}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj718" title="@{repeating_hench5_$X_mthac0adj718}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac718" title="@{repeating_hench5_$X_mac718}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0718" title="@{repeating_hench5_$X_MThAC0718}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit718" title="%{repeating_hench5_$X_mthac08-hit718}" value="@{henchname55} hits a MAC of [[@{MThAC0718}-(1d20+(@{mthac0adj718})+(@{misc-mod}))]]&le;[[@{mac718}]] using their @{psionic-psychometabolism-name718}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro718" title="@{repeating_hench5_$X_psionic-macro718}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check718" title="%{repeating_hench5_$X_psionic-macro9-check718}" value="@{psionic-macro718}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost718" title="@{repeating_hench5_$X_PSP-cost718}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychometabolism-name719" title="@{repeating_hench5_$X_psionic-psychometabolism-name719}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj719" title="@{repeating_hench5_$X_mthac0adj719}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac719" title="@{repeating_hench5_$X_mac719}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0719" title="@{repeating_hench5_$X_MThAC0719}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit719" title="%{repeating_hench5_$X_mthac08-hit719}" value="@{henchname55} hits a MAC of [[@{MThAC0719}-(1d20+(@{mthac0adj719})+(@{misc-mod}))]]&le;[[@{mac719}]] using their @{psionic-psychometabolism-name719}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro719" title="@{repeating_hench5_$X_psionic-macro719}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check719" title="%{repeating_hench5_$X_psionic-macro9-check719}" value="@{psionic-macro719}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost719" title="@{repeating_hench5_$X_PSP-cost719}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychometabolism-name720" title="@{repeating_hench5_$X_psionic-psychometabolism-name720}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj720" title="@{repeating_hench5_$X_mthac0adj720}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac720" title="@{repeating_hench5_$X_mac720}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0720" title="@{repeating_hench5_$X_MThAC0720}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit720" title="%{repeating_hench5_$X_mthac08-hit720}" value="@{henchname55} hits a MAC of [[@{MThAC0720}-(1d20+(@{mthac0adj720})+(@{misc-mod}))]]&le;[[@{mac720}]] using their @{psionic-psychometabolism-name720}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro720" title="@{repeating_hench5_$X_psionic-macro720}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check720" title="%{repeating_hench5_$X_psionic-macro9-check720}" value="@{psionic-macro720}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost720" title="@{repeating_hench5_$X_PSP-cost720}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </div>
-                        <div class="sheet-col">
-                            <h4><b>Psychometabolism Sciences</b></h4>
-                            <table>
-                                <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychometabolism-science-name721" title="@{repeating_hench5_$X_psionic-psychometabolism-science-name721}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj721" title="@{repeating_hench5_$X_mthac0adj721}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac721" title="@{repeating_hench5_$X_mac721}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0721" title="@{repeating_hench5_$X_MThAC0721}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit721" title="%{repeating_hench5_$X_mthac09-hit721}" value="@{henchname55} hits a MAC of [[@{MThAC0721}-(1d20+(@{mthac0adj721})+(@{misc-mod}))]]&le;[[@{mac721}]] using their @{psionic-psychometabolism-science-name721}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro721" title="@{repeating_hench5_$X_psionic-macro721}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check721" title="%{repeating_hench5_$X_psionic-macro10-check721}" value="@{psionic-macro721}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost721" title="@{repeating_hench5_$X_PSP-cost721}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychometabolism-science-name722" title="@{repeating_hench5_$X_psionic-psychometabolism-science-name722}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj722" title="@{repeating_hench5_$X_mthac0adj722}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac722" title="@{repeating_hench5_$X_mac722}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0722" title="@{repeating_hench5_$X_MThAC0722}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit722" title="%{repeating_hench5_$X_mthac09-hit722}" value="@{henchname55} hits a MAC of [[@{MThAC0722}-(1d20+(@{mthac0adj722})+(@{misc-mod}))]]&le;[[@{mac722}]] using their @{psionic-psychometabolism-science-name722}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro722" title="@{repeating_hench5_$X_psionic-macro722}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check722" title="%{repeating_hench5_$X_psionic-macro10-check722}" value="@{psionic-macro722}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost722" title="@{repeating_hench5_$X_PSP-cost722}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-psychometabolism-science-name723" title="@{repeating_hench5_$X_psionic-psychometabolism-science-name723}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj723" title="@{repeating_hench5_$X_mthac0adj723}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac723" title="@{repeating_hench5_$X_mac723}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0723" title="@{repeating_hench5_$X_MThAC0723}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit723" title="%{repeating_hench5_$X_mthac09-hit723}" value="@{henchname55} hits a MAC of [[@{MThAC0723}-(1d20+(@{mthac0adj723})+(@{misc-mod}))]]&le;[[@{mac723}]] using their @{psionic-psychometabolism-science-name723}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro723" title="@{repeating_hench5_$X_psionic-macro723}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check723" title="%{repeating_hench5_$X_psionic-macro10-check723}" value="@{psionic-macro723}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost723" title="@{repeating_hench5_$X_PSP-cost723}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </div>
+                        insert_follower-psionic-skills-and-powers.html_(Psychoportive Sciences,psychoportation-science,15,16,17,07,8,repeating_hench5_$X_,5)
+                        insert_follower-psionic-skills-and-powers.html_(Psychoportive Devotions,psychoportation,12,13,14,06,7,repeating_hench5_$X_,5)
                     </div>
                     <br>
                     <div class="sheet-2colrow">
-                        <div class="sheet-col">
-                            <h4><b>Clairsentient Devotions</b></h4>
-                            <table>
-                                <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-clairsentience-name724" title="@{repeating_hench5_$X_psionic-clairsentience-name724}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj724" title="@{repeating_hench5_$X_mthac0adj724}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac724" title="@{repeating_hench5_$X_mac724}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0724" title="@{repeating_hench5_$X_MThAC0724}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit724" title="%{repeating_hench5_$X_mthac010-hit724}" value="@{henchname55} hits a MAC of [[@{MThAC0724}-(1d20+(@{mthac0adj724})+(@{misc-mod}))]]&le;[[@{mac724}]] using their @{psionic-clairsentience-name724}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro724" title="@{repeating_hench5_$X_psionic-macro724}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check724" title="%{repeating_hench5_$X_psionic-macro11-check724}" value="@{psionic-macro724}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost724" title="@{repeating_hench5_$X_PSP-cost724}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-clairsentience-name725" title="@{repeating_hench5_$X_psionic-clairsentience-name725}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj725" title="@{repeating_hench5_$X_mthac0adj725}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac725" title="@{repeating_hench5_$X_mac725}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0725" title="@{repeating_hench5_$X_MThAC0725}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit725" title="%{repeating_hench5_$X_mthac010-hit725}" value="@{henchname55} hits a MAC of [[@{MThAC0725}-(1d20+(@{mthac0adj725})+(@{misc-mod}))]]&le;[[@{mac725}]] using their @{psionic-clairsentience-name725}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro725" title="@{repeating_hench5_$X_psionic-macro725}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check725" title="%{repeating_hench5_$X_psionic-macro11-check725}" value="@{psionic-macro725}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost725" title="@{repeating_hench5_$X_PSP-cost725}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-clairsentience-name726" title="@{repeating_hench5_$X_psionic-clairsentience-name726}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj726" title="@{repeating_hench5_$X_mthac0adj726}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac726" title="@{repeating_hench5_$X_mac726}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0726" title="@{repeating_hench5_$X_MThAC0726}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit726" title="%@{repeating_hench5_$X_mthac010-hit726}" value="@{henchname55} hits a MAC of [[@{MThAC0726}-(1d20+(@{mthac0adj726})+(@{misc-mod}))]]&le;[[@{mac726}]] using their @{psionic-clairsentience-name726}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro726" title="@{repeating_hench5_$X_psionic-macro726}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check726" title="%{repeating_hench5_$X_psionic-macro11-check726}" value="@{psionic-macro726}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost726" title="@{repeating_hench5_$X_PSP-cost726}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </div>
-                        <div class="sheet-col">
-                            <h4><b>Clairsentient Sciences</b></h4>
-                            <table>
-                                <tr>
-                                    <td class="sheet-default-header">Ability Name</td>
-                                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                                    <td class="sheet-default-header">MAC</td>
-                                    <td class="sheet-default-header">MThAC0</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-clairsentience-science-name727" title="@{repeating_hench5_$X_psionic-clairsentience-science-name727}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj727" title="@{repeating_hench5_$X_mthac0adj727}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac727" title="@{repeating_hench5_$X_mac727}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0727" title="@{repeating_hench5_$X_MThAC0727}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit727" title="%{repeating_hench5_$X_mthac011-hit727}" value="@{henchname55} hits a MAC of [[@{MThAC0727}-(1d20+(@{mthac0adj727})+(@{misc-mod}))]]&le;[[@{mac727}]] using their @{psionic-clairsentience-science-name727}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro727" title="@{repeating_hench5_$X_psionic-macro727}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check727" title="%{repeating_hench5_$X_psionic-macro12-check727}" value="@{psionic-macro727}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost727" title="@{repeating_hench5_$X_PSP-cost727}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-clairsentience-science-name728" title="@{repeating_hench5_$X_psionic-clairsentience-science-name728}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj728" title="@{repeating_hench5_$X_mthac0adj728}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac728" title="@{repeating_hench5_$X_mac728}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0728" title="@{repeating_hench5_$X_MThAC0728}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit728" title="%{repeating_hench5_$X_mthac011-hit728}" value="@{henchname55} hits a MAC of [[@{MThAC0728}-(1d20+(@{mthac0adj728})+(@{misc-mod}))]]&le;[[@{mac728}]] using their @{psionic-clairsentience-science-name728}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro728" title="@{repeating_hench5_$X_psionic-macro728}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check728" title="%{repeating_hench5_$X_psionic-macro12-check728}" value="@{psionic-macro728}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost728" title="@{repeating_hench5_$X_PSP-cost728}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psionic-clairsentience-science-name729" title="@{repeating_hench5_$X_psionic-clairsentience-science-name729}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                                    <td><input type="text" name="attr_mthac0adj729" title="@{repeating_hench5_$X_mthac0adj729}" class="sheet-short" value="0"></td>
-                                    <td><input type="text" name="attr_mac729" title="@{repeating_hench5_$X_mac729}" class="sheet-small" value="10"></td>
-                                    <td><input type="text" name="attr_MThAC0729" title="@{repeating_hench5_$X_MThAC0729}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit729" title="%{repeating_hench5_$X_mthac011-hit729}" value="@{henchname55} hits a MAC of [[@{MThAC0729}-(1d20+(@{mthac0adj729})+(@{misc-mod}))]]&le;[[@{mac729}]] using their @{psionic-clairsentience-science-name729}"></button></td>
-                                    <td><input type="text" name="attr_psionic-macro729" title="@{repeating_hench5_$X_psionic-macro729}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check729" title="%{repeating_hench5_$X_psionic-macro12-check729}" value="@{psionic-macro729}"></button></td>
-                                    <td><input type="text" name="attr_PSP-cost729" title="@{repeating_hench5_$X_PSP-cost729}" placeholder="#" class="sheet-small"/></td>
-                                </tr>
-                            </table>
-                        </div>
+                        insert_follower-psionic-skills-and-powers.html_(Telepathic Sciences,telepathy-science,03,04,05,03,4,repeating_hench5_$X_,5)
+                        insert_follower-psionic-skills-and-powers.html_(Telepathic Devotions,telepathy,00,01,02,02,3,repeating_hench5_$X_,5)
                     </div>
                     <br>
-                    <h4><b>Psionic Attack Modes</b></h4>
-                    <table>
+                    <h4>Psionic Attack Modes</h4>
+                    <table class="sheet-default-header-first-row">
                         <tr>
-                            <td class="sheet-default-header">Attack Name</td>
-                            <td class="sheet-default-header">Attack<br>Speed</td>
-                            <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                            <td class="sheet-default-header">MThAC0</td>
-                            <td class="sheet-default-header">Damage</td>
-                            <td class="sheet-default-header">Macro</td>
-                            <td class="sheet-default-header">PSP<br>Cost</td>
+                            <td>Attack Name</td>
+                            <td>Attack<br>Speed</td>
+                            <td>MThAC0<br>Adj.</td>
+                            <td>MThAC0</td>
+                            <td>Damage</td>
+                            <td>Macro</td>
+                            <td>PSP<br>Cost</td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_psionic-attack-name730" title="@{repeating_hench5_$X_psionic-attack-name730}" class="sheet-display" placeholder="Ability Name"/></td>
@@ -3158,12 +1099,12 @@ <h4><b>Psionic Attack Modes</b></h4>
                     <br>
                     <div class="sheet-3colrow">
                         <div class="sheet-col">
-                            <h4><b>Psionic Defense Modes</b></h4>
-                            <table>
+                            <h4>Psionic Defense Modes</h4>
+                            <table class="sheet-default-header-first-row">
                                 <tr>
-                                    <td class="sheet-default-header">Defense Name</td>
-                                    <td class="sheet-default-header">Macro</td>
-                                    <td class="sheet-default-header">PSP<br>Cost</td>
+                                    <td>Defense Name</td>
+                                    <td>Macro</td>
+                                    <td>PSP<br>Cost</td>
                                 </tr>
                                 <tr>
                                     <td><input type="text" name="attr_psionic-defense-name733" title="@{repeating_hench5_$X_psionic-defense-name733}" class="sheet-midtext" placeholder="Defense Name"/></td>
@@ -3184,74 +1125,49 @@ <h4><b>Psionic Defense Modes</b></h4>
                         </div>
                         <div class="sheet-col">
                             <h4>Psionic Strength Points</h4>
-                            <table style='width:250px;'>
+                            <table class="sheet-table-white sheet-default-header-first-row sheet-default-header-first-column" style='width:250px;'>
                                 <tr>
-                                    <td class="sheet-default-header" style="width:100px;">Value</td>
-                                    <td class="sheet-default-header" style="width:50px;">Current</td>
-                                    <td class="sheet-default-header" style="width:15px;">/</td>
-                                    <td class="sheet-default-header" style="width:60px;">Maximum</td>
-                                    <td class="sheet-default-header" style="width:25px;">Speed</td>
+                                    <td style="width:100px;">Value</td>
+                                    <td style="width:50px;">Current</td>
+                                    <td style="width:15px;">/</td>
+                                    <td style="width:60px;">Maximum</td>
+                                    <td style="width:25px;">Speed</td>
                                 </tr>
                                 <tr>
-                                    <td class="sheet-default-header" style="width:100px;">PSP:</td>
+                                    <td>PSP:</td>
                                     <td><input type="number" name="attr_PSP500" title="@{repeating_hench5_$X_PSP500}" class="sheet-short" placeholder="PSP"/></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                    <td>/</td>
                                     <td><input type="number" name="attr_PSP500_max" title="@{repeating_hench5_$X_PSP500|max}" class="sheet-short"/></td>
                                     <td><button type="roll" name="roll_psispeed501" title="%{repeating_hench5_$X_psispeed501}" value="/gmroll [[{([[1d10]]-(@{misc-mod})), 1}kh1]] [Psionic Power]&{tracker}"></button></td>
                                 </tr>
                                 <tr>
-                                    <td class="sheet-default-header" style="width:100px;">Temp PSP:</td>
+                                    <td>Temp PSP:</td>
                                     <td><input type="number" name="attr_tempPSP500" title="@{repeating_hench5_$X_tempPSP500}" class="sheet-short" placeholder="Temp"/></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                    <td>/</td>
                                     <td><input type="number" name="attr_tempPSP500_max" title="@{repeating_hench5_$X_tempPSP500|max}" class="sheet-short"/></td>
                                 </tr>
                                 <tr>
-                                    <td class="sheet-default-header" style="width:100px;">Stored PSP:</td>
+                                    <td>Stored PSP:</td>
                                     <td><input type="number" name="attr_storedPSP500" title="@{repeating_hench5_$X_storedPSP500}" class="sheet-short" placeholder="Stored"/></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                    <td>/</td>
                                     <td><input type="number" name="attr_storedPSP500_max" title="@{repeating_hench5_$X_storedPSP500|max}" class="sheet-short"/></td>
                                 </tr>
                                 <tr>
-                                    <td class="sheet-default-header" style="width:100px;">MAC</td>
+                                    <td>MAC</td>
                                     <td><input type="number" name="attr_selfMAC500" title="@{repeating_hench5_$X_selfMAC500}" class="sheet-short"/></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                                    <td>/</td>
                                     <td><input type="number" name="attr_temp-selfMAC500" title="@{repeating_hench5_$X_temp-selfMAC500}" class="sheet-short"/></td>
                                 </tr>
                             </table>
                         </div>
                         <div class="sheet-col">
                             <h4>Psionic NWP's</h4>
-                            <table>
-                                <tr>
-                                    <td><input type="text" name="attr_psinwp500" title="@{repeating_hench5_$X_psinwp500}" class="sheet-maxtext" placeholder="Name of NWP"></td>
-                                    <td><input type="text" name="attr_psinwpstat500" title="@{repeating_hench5_$X_psinwpstat500}" placeholder="@{}" class="sheet-small"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod500" title="@{repeating_hench5_$X_psinwpmod500}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots500" title="@{repeating_hench5_$X_psinwpslots500}" class="sheet-small" placeholder="#">
-                                        <button type="roll" name="roll_psinwps505" title="%{repeating_hench5_$X_psinwps505}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat500})+(@{psinwpmod500})]] @{psinwp500}"></button></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psinwp501" title="@{repeating_hench5_$X_psinwp501}" class="sheet-maxtext" placeholder="Name of NWP"></td>
-                                    <td><input type="text" name="attr_psinwpstat501" title="@{repeating_hench5_$X_psinwpstat501}" placeholder="@{}" class="sheet-small"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod501" title="@{repeating_hench5_$X_psinwpmod501}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots501" title="@{repeating_hench5_$X_psinwpslots501}" class="sheet-small" placeholder="#">
-                                        <button type="roll" name="roll_psinwps506" title="%{repeating_hench5_$X_psinwps506}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat501})+(@{psinwpmod501})]] @{psinwp501}"></button></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psinwp502" title="@{repeating_hench5_$X_psinwp502}" class="sheet-maxtext" placeholder="Name of NWP"></td>
-                                    <td><input type="text" name="attr_psinwpstat502" title="@{repeating_hench5_$X_psinwpstat502}" placeholder="@{}" class="sheet-small"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod502" title="@{repeating_hench5_$X_psinwpmod502}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots502" title="@{repeating_hench5_$X_psinwpslots502}" class="sheet-small" placeholder="#">
-                                        <button type="roll" name="roll_psinwps507" title="%{repeating_hench5_$X_psinwps507}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat502})+(@{psinwpmod502})]] @{psinwp502}"></button></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psinwp503" title="@{repeating_hench5_$X_psinwp503}" class="sheet-maxtext" placeholder="Name of NWP"></td>
-                                    <td><input type="text" name="attr_psinwpstat503" title="@{repeating_hench5_$X_psinwpstat503}" placeholder="@{}" class="sheet-small"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod503" title="@{repeating_hench5_$X_psinwpmod503}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots503" title="@{repeating_hench5_$X_psinwpslots503}" class="sheet-small" placeholder="#">
-                                        <button type="roll" name="roll_psinwps508" title="%{repeating_hench5_$X_psinwps508}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat503})+(@{psinwpmod503})]] @{psinwp503}"></button></td>
-                                </tr>
-                                <tr>
-                                    <td><input type="text" name="attr_psinwp504" title="@{repeating_hench5_$X_psinwp504}" class="sheet-maxtext" placeholder="Name of NWP"></td>
-                                    <td><input type="text" name="attr_psinwpstat504" title="@{repeating_hench5_$X_psinwpstat504}" placeholder="@{}" class="sheet-small"></td>
-                                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psinwpmod504" title="@{repeating_hench5_$X_psinwpmod504}" value="0" class="sheet-small"><input type="text" name="attr_psinwpslots504" title="@{repeating_hench5_$X_psinwpslots504}" class="sheet-small" placeholder="#">
-                                        <button type="roll" name="roll_psinwps509" title="%{repeating_hench5_$X_psinwps509}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psinwpstat504})+(@{psinwpmod504})]] @{psinwp504}"></button></td>
-                                </tr>
+                            <table class="sheet-table-white">
+                                insert_follower-psionic-skills-and-powers-proficiency.html_(500,repeating_hench5_$X_,5)
+                                insert_follower-psionic-skills-and-powers-proficiency.html_(501,repeating_hench5_$X_,5)
+                                insert_follower-psionic-skills-and-powers-proficiency.html_(502,repeating_hench5_$X_,5)
+                                insert_follower-psionic-skills-and-powers-proficiency.html_(503,repeating_hench5_$X_,5)
+                                insert_follower-psionic-skills-and-powers-proficiency.html_(504,repeating_hench5_$X_,5)
                             </table>
                         </div>
                     </div>
@@ -3269,13 +1185,13 @@ <h4>Psionics Ability Information Storage</h4>
         <div class="sheet-tab-content sheet-section-follower-animals">
             <h4>Pets, Mounts, Animal Familiars, Followers and Beasts of Burden</h4>
             <br>
-            <table>
+            <table class="sheet-default-header-first-row">
                 <tr>
-                    <td class="sheet-default-header">Name</td>
-                    <td class="sheet-default-header">AC</td>
-                    <td class="sheet-default-header">Race</td>
-                    <td class="sheet-default-header">Level</td>
-                    <td class="sheet-default-header">HP/Max</td>
+                    <td>Name</td>
+                    <td>AC</td>
+                    <td>Race</td>
+                    <td>Level</td>
+                    <td>HP/Max</td>
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_henchname6" title="@{henchname6}"></td>
@@ -3293,30 +1209,30 @@ <h4>Pets, Mounts, Animal Familiars, Followers and Beasts of Burden</h4>
             <details>
                 <summary><h4 style="display: initial;">Familiar Spells/Powers</h4></summary>
                 <div class="sheet-3colrow">
-                    insert_henchmen-spells.html_(425)
-                    insert_henchmen-spells.html_(426)
-                    insert_henchmen-spells.html_(427)
+                    insert_follower-spells.html_(425)
+                    insert_follower-spells.html_(426)
+                    insert_follower-spells.html_(427)
                 </div>
                 <br>
                 <br>
                 <div class="sheet-3colrow">
-                    insert_henchmen-spells.html_(428)
-                    insert_henchmen-spells.html_(429)
-                    insert_henchmen-spells.html_(430)
+                    insert_follower-spells.html_(428)
+                    insert_follower-spells.html_(429)
+                    insert_follower-spells.html_(430)
                 </div>
                 <br>
                 <br>
                 <div class="sheet-3colrow">
-                    insert_henchmen-spells.html_(431)
-                    insert_henchmen-spells.html_(432)
-                    insert_henchmen-spells.html_(433)
+                    insert_follower-spells.html_(431)
+                    insert_follower-spells.html_(432)
+                    insert_follower-spells.html_(433)
                 </div>
                 <br>
                 <br>
                 <div class="sheet-3colrow">
-                    insert_henchmen-spells.html_(434)
-                    insert_henchmen-spells.html_(435)
-                    insert_henchmen-spells.html_(436)
+                    insert_follower-spells.html_(434)
+                    insert_follower-spells.html_(435)
+                    insert_follower-spells.html_(436)
                 </div>
             </details>
             <hr>
@@ -3385,14 +1301,14 @@ <h4>Traits and Tricks</h4>
             <hr>
             <hr>
             <fieldset name="repeating_hench6" class="repeating_hench6">
-                <table>
+                <table class="sheet-default-header-first-row">
                     <tr>
-                        <td class="sheet-default-header">Name</td>
-                        <td class="sheet-default-header">AC</td>
-                        <td class="sheet-default-header">Race</td>
-                        <td class="sheet-default-header">Level</td>
-                        <td class="sheet-default-header">HP/Max</td>
-                        <td class="sheet-default-header">Units</td>
+                        <td>Name</td>
+                        <td>AC</td>
+                        <td>Race</td>
+                        <td>Level</td>
+                        <td>HP/Max</td>
+                        <td>Units</td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_henchname66" title="@{repeating_hench6_$X_henchname66}"></td>
@@ -3411,30 +1327,30 @@ <h4>Traits and Tricks</h4>
                 <details>
                     <summary><h4 style="display: initial;">Familiar Spells/Powers</h4></summary>
                     <div class="sheet-3colrow">
-                        insert_henchmen-spells.html_(437,repeating_hench6_$X_)
-                        insert_henchmen-spells.html_(438,repeating_hench6_$X_)
-                        insert_henchmen-spells.html_(439,repeating_hench6_$X_)
+                        insert_follower-spells.html_(437,repeating_hench6_$X_)
+                        insert_follower-spells.html_(438,repeating_hench6_$X_)
+                        insert_follower-spells.html_(439,repeating_hench6_$X_)
                     </div>
                     <br>
                     <br>
                     <div class="sheet-3colrow">
-                        insert_henchmen-spells.html_(440,repeating_hench6_$X_)
-                        insert_henchmen-spells.html_(441,repeating_hench6_$X_)
-                        insert_henchmen-spells.html_(442,repeating_hench6_$X_)
+                        insert_follower-spells.html_(440,repeating_hench6_$X_)
+                        insert_follower-spells.html_(441,repeating_hench6_$X_)
+                        insert_follower-spells.html_(442,repeating_hench6_$X_)
                     </div>
                     <br>
                     <br>
                     <div class="sheet-3colrow">
-                        insert_henchmen-spells.html_(443,repeating_hench6_$X_)
-                        insert_henchmen-spells.html_(444,repeating_hench6_$X_)
-                        insert_henchmen-spells.html_(445,repeating_hench6_$X_)
+                        insert_follower-spells.html_(443,repeating_hench6_$X_)
+                        insert_follower-spells.html_(444,repeating_hench6_$X_)
+                        insert_follower-spells.html_(445,repeating_hench6_$X_)
                     </div>
                     <br>
                     <br>
                     <div class="sheet-3colrow">
-                        insert_henchmen-spells.html_(446,repeating_hench6_$X_)
-                        insert_henchmen-spells.html_(447,repeating_hench6_$X_)
-                        insert_henchmen-spells.html_(448,repeating_hench6_$X_)
+                        insert_follower-spells.html_(446,repeating_hench6_$X_)
+                        insert_follower-spells.html_(447,repeating_hench6_$X_)
+                        insert_follower-spells.html_(448,repeating_hench6_$X_)
                     </div>
                 </details>
                 <hr>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-psionic-core-proficiency.html b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-psionic-core-proficiency.html
new file mode 100644
index 000000000000..d0d25b1a77fb
--- /dev/null
+++ b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-psionic-core-proficiency.html
@@ -0,0 +1,7 @@
+<tr>
+    <td><input type="text" name="attr_psiprofname#REPLACE0#" title="@{#REPLACE1#psiprofname#REPLACE0#}" placeholder="Name of NWP"></td>
+    <td><input type="text" name="attr_psiprofstatnum#REPLACE0#" title="@{#REPLACE1#psiprofstatnum#REPLACE0#}" placeholder="@{}" class="sheet-short"></td>
+    <td>&plusmn;<input type="text" name="attr_psiprofmod#REPLACE0#" title="@{#REPLACE1#psiprofmod#REPLACE0#}" value="0" class="sheet-short"></td>
+    <td><input type="number" name="attr_psiprofslots#REPLACE0#" title="@{#REPLACE1#psiprofslots#REPLACE0#}" class="sheet-short" placeholder="#"></td>
+    <td><button type="roll" name="roll_Psiprof#REPLACE0#" title="%{#REPLACE1#Psiprof#REPLACE0#}" value="&{template:2Echeck} {{checkvs=@{psiprofname#REPLACE0#} Check}} {{character=@{henchname5#REPLACE2#}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psiprofstatnum#REPLACE0#})+(@{psiprofmod#REPLACE0#})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
+</tr>
\ No newline at end of file
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-psionic-core.html b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-psionic-core.html
new file mode 100644
index 000000000000..c8ae759b55f9
--- /dev/null
+++ b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-psionic-core.html
@@ -0,0 +1,34 @@
+<div class="sheet-col">
+    <h4>#REPLACE0#</h4>
+    <ul>
+        <table class="sheet-table-white">
+            <tr>
+                <td><input type="text" name="attr_#REPLACE2##REPLACE3#5#REPLACE4#" title="@{#REPLACE7##REPLACE2##REPLACE3#5#REPLACE4#}" class="sheet-medium"></td>
+                <td><input type="text" name="attr_powerscore-nomod5#REPLACE4#" title="@{#REPLACE7#powerscore-nomod5#REPLACE4#}" placeholder="@{}" class="sheet-small"></td>
+                <td>&plusmn;<input type="text" name="attr_powerscore-mod5#REPLACE4#" title="@{#REPLACE7#powerscore-mod5#REPLACE4#}" placeholder="#" class="sheet-tiny"></td>
+                <td><button type="roll" name="roll_#REPLACE1#5#REPLACE4#" title="%{#REPLACE7##REPLACE1#5#REPLACE4#}" value="/roll [[1d20cs[[{@{powerscore-nomod5#REPLACE4#}+(@{powerscore-mod5#REPLACE4#})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod5#REPLACE4#}+(@{powerscore-mod5#REPLACE4#})+(@{misc-mod}),19}kl1]] @{#REPLACE2##REPLACE3#5#REPLACE4#}"></button></td>
+                <td><input type="text" name="attr_psion#REPLACE3#-macro5#REPLACE4#" title="@{#REPLACE7#psion#REPLACE3#-macro5#REPLACE4#}" class="sheet-track" placeholder="Macro"></td>
+                <td><button type="roll" name="roll_#REPLACE3#-macro5#REPLACE4#" title="%{#REPLACE7##REPLACE3#-macro5#REPLACE4#}" value="@{psion#REPLACE3#-macro5#REPLACE4#}"></button></td>
+                <td><input type="text" name="attr_PSP-cost6#REPLACE4#" title="@{#REPLACE7#PSP-cost6#REPLACE4#}" placeholder="#" class="sheet-small"/></td>
+            </tr>
+            <tr>
+                <td><input type="text" name="attr_#REPLACE2##REPLACE3#5#REPLACE5#" title="@{#REPLACE7##REPLACE2##REPLACE3#5#REPLACE5#}" class="sheet-medium"></td>
+                <td><input type="text" name="attr_powerscore-nomod5#REPLACE5#" title="@{#REPLACE7#powerscore-nomod5#REPLACE5#}" placeholder="@{}" class="sheet-small"></td>
+                <td>&plusmn;<input type="text" name="attr_powerscore-mod5#REPLACE5#" title="@{#REPLACE7#powerscore-mod5#REPLACE5#}" placeholder="#" class="sheet-tiny"></td>
+                <td><button type="roll" name="roll_#REPLACE1#5#REPLACE5#" title="%{#REPLACE7##REPLACE1#5#REPLACE5#}" value="/roll [[1d20cs[[{@{powerscore-nomod5#REPLACE5#}+(@{powerscore-mod5#REPLACE5#})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod5#REPLACE5#}+(@{powerscore-mod5#REPLACE5#})+(@{misc-mod}),19}kl1]] @{#REPLACE2##REPLACE3#5#REPLACE5#}"></button></td>
+                <td><input type="text" name="attr_psion#REPLACE3#-macro5#REPLACE5#" title="@{#REPLACE7#psion#REPLACE3#-macro5#REPLACE5#}" class="sheet-track" placeholder="Macro"></td>
+                <td><button type="roll" name="roll_#REPLACE3#-macro5#REPLACE5#" title="%{#REPLACE7##REPLACE3#-macro5#REPLACE5#}" value="@{psion#REPLACE3#-macro5#REPLACE5#}"></button></td>
+                <td><input type="text" name="attr_PSP-cost6#REPLACE5#" title="@{#REPLACE7#PSP-cost6#REPLACE5#}" placeholder="#" class="sheet-small"/></td>
+            </tr>
+            <tr>
+                <td><input type="text" name="attr_#REPLACE2##REPLACE3#5#REPLACE6#" title="@{#REPLACE7##REPLACE2##REPLACE3#5#REPLACE6#}" class="sheet-medium"></td>
+                <td><input type="text" name="attr_powerscore-nomod5#REPLACE6#" title="@{#REPLACE7#powerscore-nomod5#REPLACE6#}" placeholder="@{}" class="sheet-small"></td>
+                <td>&plusmn;<input type="text" name="attr_powerscore-mod5#REPLACE6#" title="@{#REPLACE7#powerscore-mod5#REPLACE6#}" placeholder="#" class="sheet-tiny"></td>
+                <td><button type="roll" name="roll_#REPLACE1#5#REPLACE6#" title="%{#REPLACE7##REPLACE1#5#REPLACE6#}" value="/roll [[1d20cs[[{@{powerscore-nomod5#REPLACE6#}+(@{powerscore-mod5#REPLACE6#})+(@{misc-mod}),19}kl1]]cf20]]&le;[[{@{powerscore-nomod5#REPLACE6#}+(@{powerscore-mod5#REPLACE6#})+(@{misc-mod}),19}kl1]] @{#REPLACE2##REPLACE3#5#REPLACE6#}"></button></td>
+                <td><input type="text" name="attr_psion#REPLACE3#-macro5#REPLACE6#" title="@{#REPLACE7#psion#REPLACE3#-macro5#REPLACE6#}" class="sheet-track" placeholder="Macro"></td>
+                <td><button type="roll" name="roll_#REPLACE3#-macro5#REPLACE6#" title="%{#REPLACE7##REPLACE3#-macro5#REPLACE6#}" value="@{psion#REPLACE3#-macro5#REPLACE6#}"></button></td>
+                <td><input type="text" name="attr_PSP-cost6#REPLACE6#" title="@{#REPLACE7#PSP-cost6#REPLACE6#}" placeholder="#" class="sheet-small"/></td>
+            </tr>
+        </table>
+    </ul>
+</div>
\ No newline at end of file
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-psionic-skills-and-powers-proficiency.html b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-psionic-skills-and-powers-proficiency.html
new file mode 100644
index 000000000000..aa6952724eb1
--- /dev/null
+++ b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-psionic-skills-and-powers-proficiency.html
@@ -0,0 +1,7 @@
+<tr>
+    <td><input type="text" name="attr_psinwp#REPLACE0#" title="@{#REPLACE1#psinwp#REPLACE0#}" class="sheet-maxtext" placeholder="Name of NWP"></td>
+    <td><input type="text" name="attr_psinwpstat#REPLACE0#" title="@{#REPLACE1#psinwpstat#REPLACE0#}" placeholder="@{}" class="sheet-small"></td>
+    <td>&plusmn;<input type="text" name="attr_psinwpmod#REPLACE0#" title="@{#REPLACE1#psinwpmod#REPLACE0#}" value="0" class="sheet-small"></td>
+    <td><input type="text" name="attr_psinwpslots#REPLACE0#" title="@{#REPLACE1#psinwpslots#REPLACE0#}" class="sheet-small" placeholder="#"></td>
+    <td><button type="roll" name="roll_psinwps#REPLACE0#" title="%{#REPLACE1#psinwps#REPLACE0#}" value="&{template:2Echeck} {{checkvs=@{psinwp#REPLACE0#} Check}} {{character=@{henchname5#REPLACE2#}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psinwpstat#REPLACE0#})+(@{psinwpmod#REPLACE0#})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
+</tr>
\ No newline at end of file
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-psionic-skills-and-powers.html b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-psionic-skills-and-powers.html
new file mode 100644
index 000000000000..09bccf297483
--- /dev/null
+++ b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-psionic-skills-and-powers.html
@@ -0,0 +1,37 @@
+<div class="sheet-col">
+    <h4>#REPLACE0#</h4>
+    <table class="sheet-default-header-first-row">
+        <tr>
+            <td>Ability Name</td>
+            <td>MThAC0<br>Adj.</td>
+            <td>MAC</td>
+            <td>MThAC0</td>
+            <td>Macro</td>
+            <td>PSP<br>Cost</td>
+        </tr>
+        <tr>
+            <td><input type="text" name="attr_psionic-#REPLACE1#-name7#REPLACE2#" title="@{#REPLACE7#psionic-#REPLACE1#-name7#REPLACE2#}" class="sheet-midtext" placeholder="Ability Name"/></td>
+            <td><input type="text" name="attr_mthac0adj7#REPLACE2#" title="@{#REPLACE7#mthac0adj7#REPLACE2#}" class="sheet-short" value="0"></td>
+            <td><input type="text" name="attr_mac7#REPLACE2#" title="@{#REPLACE7#mac7#REPLACE2#}" class="sheet-small" value="10"></td>
+            <td><input type="text" name="attr_MThAC07#REPLACE2#" title="@{#REPLACE7#MThAC07#REPLACE2#}" class="sheet-small" value="20"><button type="roll" name="roll_mthac#REPLACE5#-hit7#REPLACE2#" title="%{#REPLACE7#mthac#REPLACE5#-hit7#REPLACE2#}" value="@{henchname5#REPLACE8#} hits a MAC of [[@{MThAC07#REPLACE2#}-(1d20+(@{mthac0adj7#REPLACE2#})+(@{misc-mod}))]]&le;[[@{mac7#REPLACE2#}]] using their @{psionic-#REPLACE1#-name7#REPLACE2#}"></button></td>
+            <td><input type="text" name="attr_psionic-macro7#REPLACE2#" title="@{#REPLACE7#psionic-macro7#REPLACE2#}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro#REPLACE6#-check7#REPLACE2#" title="%{#REPLACE7#psionic-macro#REPLACE6#-check7#REPLACE2#}" value="@{psionic-macro7#REPLACE2#}"></button></td>
+            <td><input type="text" name="attr_PSP-cost7#REPLACE2#" title="@{#REPLACE7#PSP-cost7#REPLACE2#}" placeholder="#" class="sheet-small"/></td>
+        </tr>
+        <tr>
+            <td><input type="text" name="attr_psionic-#REPLACE1#-name7#REPLACE3#" title="@{#REPLACE7#psionic-#REPLACE1#-name7#REPLACE3#}" class="sheet-midtext" placeholder="Ability Name"/></td>
+            <td><input type="text" name="attr_mthac0adj7#REPLACE3#" title="@{#REPLACE7#mthac0adj7#REPLACE3#}" class="sheet-short" value="0"></td>
+            <td><input type="text" name="attr_mac7#REPLACE3#" title="@{#REPLACE7#mac7#REPLACE3#}" class="sheet-small" value="10"></td>
+            <td><input type="text" name="attr_MThAC07#REPLACE3#" title="@{#REPLACE7#MThAC07#REPLACE3#}" class="sheet-small" value="20"><button type="roll" name="roll_mthac#REPLACE5#-hit7#REPLACE3#" title="%{#REPLACE7#mthac#REPLACE5#-hit7#REPLACE3#}" value="@{henchname5#REPLACE8#} hits a MAC of [[@{MThAC07#REPLACE3#}-(1d20+(@{mthac0adj7#REPLACE3#})+(@{misc-mod}))]]&le;[[@{mac7#REPLACE3#}]] using their @{psionic-#REPLACE1#-name7#REPLACE3#}"></button></td>
+            <td><input type="text" name="attr_psionic-macro7#REPLACE3#" title="@{#REPLACE7#psionic-macro7#REPLACE3#}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro#REPLACE6#-check7#REPLACE3#" title="%{#REPLACE7#psionic-macro#REPLACE6#-check7#REPLACE3#}" value="@{psionic-macro7#REPLACE3#}"></button></td>
+            <td><input type="text" name="attr_PSP-cost7#REPLACE3#" title="@{#REPLACE7#PSP-cost7#REPLACE3#}" placeholder="#" class="sheet-small"/></td>
+        </tr>
+        <tr>
+            <td><input type="text" name="attr_psionic-#REPLACE1#-name7#REPLACE4#" title="@{#REPLACE7#psionic-#REPLACE1#-name7#REPLACE4#}" class="sheet-midtext" placeholder="Ability Name"/></td>
+            <td><input type="text" name="attr_mthac0adj7#REPLACE4#" title="@{#REPLACE7#mthac0adj7#REPLACE4#}" class="sheet-short" value="0"></td>
+            <td><input type="text" name="attr_mac7#REPLACE4#" title="@{#REPLACE7#mac7#REPLACE4#}" class="sheet-small" value="10"></td>
+            <td><input type="text" name="attr_MThAC07#REPLACE4#" title="@{#REPLACE7#MThAC07#REPLACE4#}" class="sheet-small" value="20"><button type="roll" name="roll_mthac#REPLACE5#-hit7#REPLACE4#" title="%{#REPLACE7#mthac#REPLACE5#-hit7#REPLACE4#}" value="@{henchname5#REPLACE8#} hits a MAC of [[@{MThAC07#REPLACE4#}-(1d20+(@{mthac0adj7#REPLACE4#})+(@{misc-mod}))]]&le;[[@{mac7#REPLACE4#}]] using their @{psionic-#REPLACE1#-name7#REPLACE4#}"></button></td>
+            <td><input type="text" name="attr_psionic-macro7#REPLACE4#" title="@{#REPLACE7#psionic-macro7#REPLACE4#}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro#REPLACE6#-check7#REPLACE4#" title="%{#REPLACE7#psionic-macro#REPLACE6#-check7#REPLACE4#}" value="@{psionic-macro7#REPLACE4#}"></button></td>
+            <td><input type="text" name="attr_PSP-cost7#REPLACE4#" title="@{#REPLACE7#PSP-cost7#REPLACE4#}" placeholder="#" class="sheet-small"/></td>
+        </tr>
+    </table>
+</div>
\ No newline at end of file
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-rogue-skill.html b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-rogue-skill.html
new file mode 100644
index 000000000000..085405677ce5
--- /dev/null
+++ b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-rogue-skill.html
@@ -0,0 +1,12 @@
+<tr>
+    <td>#REPLACE0#</td>
+    <td><input type="text" name="attr_#REPLACE1#b2#REPLACE3#" title="@{#REPLACE2##REPLACE1#b2#REPLACE3#}" class="sheet-short" value="0"/>%</td>
+    <td><input type="text" name="attr_#REPLACE1#r2#REPLACE3#" title="@{#REPLACE2##REPLACE1#r2#REPLACE3#}" value="0" class="sheet-short"/>%</td>
+    <td><input type="text" name="attr_#REPLACE1#d2#REPLACE3#" title="@{#REPLACE2##REPLACE1#d2#REPLACE3#}" value="0" class="sheet-short"/>%</td>
+    <td><input type="text" name="attr_#REPLACE1#k2#REPLACE3#" title="@{#REPLACE2##REPLACE1#k2#REPLACE3#}" value="0" class="sheet-short"/>%</td>
+    <td><input type="text" name="attr_#REPLACE1#m2#REPLACE3#" title="@{#REPLACE2##REPLACE1#m2#REPLACE3#}" value="0" class="sheet-short"/>%</td>
+    <td><input type="text" name="attr_#REPLACE1#a2#REPLACE3#" title="@{#REPLACE2##REPLACE1#a2#REPLACE3#}" value="0" class="sheet-short"/>%</td>
+    <td><input type="text" name="attr_#REPLACE1#l2#REPLACE3#" title="@{#REPLACE2##REPLACE1#l2#REPLACE3#}" value="0" class="sheet-short"/>%</td>
+    <td><input type="text" name="attr_#REPLACE1#t2#REPLACE3#" title="@{#REPLACE2##REPLACE1#t2#REPLACE3#}" value="(@{#REPLACE1#b2#REPLACE3#})+(@{#REPLACE1#r2#REPLACE3#})+(@{#REPLACE1#d2#REPLACE3#})+(@{#REPLACE1#k2#REPLACE3#})+(@{#REPLACE1#m2#REPLACE3#})+(@{#REPLACE1#a2#REPLACE3#})+(@{#REPLACE1#l2#REPLACE3#})" disabled class="sheet-short"/>%</td>
+    <td><button type="roll" name="roll_#REPLACE1#2#REPLACE3#" title="%{#REPLACE2##REPLACE1#2#REPLACE3#}" value="/w gm &{template:2Echeck} {{checkvs=#REPLACE0#\n(in @{armorname2#REPLACE3#})}} {{character=@{henchname4#REPLACE4#}}} {{checkroll=[[1d100cs<1cf>96]]%}} {{checktarget=[[{@{#REPLACE1#t2#REPLACE3#}+(@{misc-mod}),95}kl1]]%}}">#REPLACE0#</button></td>
+</tr>
\ No newline at end of file
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/henchmen-spells.html b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-spells.html
similarity index 100%
rename from ADnD_2E_Revised/html/tabs/character-tab/followers-tab/henchmen-spells.html
rename to ADnD_2E_Revised/html/tabs/character-tab/followers-tab/follower-spells.html
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html
index 80a9c148af4f..1896175c9583 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html
@@ -255,7 +255,7 @@ <h4>Proficiency notes</h4>
                             <td class="sheet-td-dynamic50"><input type="text" name="attr_profstatnum" title="@{repeating_profs_$X_profstatnum}" placeholder="@{abilityScore}" class="sheet-maxtext-min" list="ability-scores"><span></span></td>
                             <td>&plusmn;</td>
                             <td><input type="text" name="attr_profmod" title="@{repeating_profs_$X_profmod}" value="0" class="sheet-minish"></td>
-                            <td><button type="roll" name="roll_Prof" title="%{repeating_profs_$X_Prof}" value="&{template:2Echeck} {{checkvs=@{profname} Check}} {{character=@{character_name}}} {{checkroll=[[1d20cs1cf20]]}} {{checktarget=[[(@{profstatnum})+(@{profmod})+(@{misc-mod})]]}} {{color=dark-blue}}"></button></td>
+                            <td><button type="roll" name="roll_Prof" title="%{repeating_profs_$X_Prof}" value="&{template:2Echeck} {{checkvs=@{profname} Check}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{profstatnum})+(@{profmod})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                         </tr>
                     </table>
                 </fieldset>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-core-discipline.html b/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-core-discipline.html
index c46a43bb3a57..e7bd70ff5472 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-core-discipline.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-core-discipline.html
@@ -5,14 +5,12 @@ <h4>#REPLACE0#</h4>
             <thead class="sheet-collapse sheet-show-first">
             <tr>
                 <th rowspan="2">Power name</th>
-                <th>Roll</th>
                 <th colspan="4" class="sheet-centering">Power Score</th>
                 <th></th>
                 <th colspan="2" class="sheet-centering">PSP Cost</th>
                 <th colspan="2" rowspan="2">Macro</th>
             </tr>
             <tr>
-                <th>Mod</th>
                 <th colspan="2" title="The ability score used by the power">Ability</th>
                 <th title="The modifier for the ability score">Mod</th>
                 <th title="If the power is Enhanced, like a tribal Psionicist from 'The Will and the Way', write the enhancement modifier here, ie. +4">Enh</th>
@@ -20,11 +18,10 @@ <h4>#REPLACE0#</h4>
                 <th>Initial</th>
                 <th>Maint.</th>
             </tr>
-        </thead>
+            </thead>
             <tr>
                 <td class="sheet-td-dynamic100"><input type="text" name="attr_#REPLACE2#" title="@{repeating_#REPLACE1#_$X_#REPLACE2#}" class="sheet-maxtext-min" list="#REPLACE8#"><span></span></td>
-                <td><input type="text" name="attr_psionic-mod#REPLACE3#" title="@{repeating_#REPLACE1#_$X_psionic-mod#REPLACE3#}" placeholder="#" class="sheet-small" value="0"></td>
-                <td><input type="text" name="attr_powerscore-nomod#REPLACE3#" title="@{repeating_#REPLACE1#_$X_powerscore-nomod#REPLACE3#}" placeholder="@{}" class="sheet-cent-min" list="ability-scores-psi"><span></span></td>
+                <td><input type="text" name="attr_powerscore-nomod#REPLACE3#" title="@{repeating_#REPLACE1#_$X_powerscore-nomod#REPLACE3#}" placeholder="@{}" class="sheet-track-min" list="ability-scores-psi"><span></span></td>
                 <td>&plusmn;</td>
                 <td><input type="text" name="attr_powerscore-mod#REPLACE3#" title="@{repeating_#REPLACE1#_$X_powerscore-mod#REPLACE3#}" placeholder="#" class="sheet-small" value="0"></td>
                 <td><input type="text" name="attr_powerscore-enhanced" title="@{repeating_#REPLACE1#_$X_powerscore-enhanced}" class="sheet-small" value="0"></td>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-core-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-core-tab.html
index 315e07dc0358..b24e66cbdfd3 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-core-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-core-tab.html
@@ -30,33 +30,33 @@ <h4>Psionics Core</h4>
     </table>
     <br>
     <div class="sheet-2colrow">
-        insert_psionic-core-discipline.html_(Telepathy Devotions,psion-telepathy,psiontelepathic,,Telepathy-Devotion,psiontelepathic-macro,telepathic-macro,20,telepathic-devotions)
-        insert_psionic-core-discipline.html_(Telepathy Sciences,psion-telepathic-science,telepathic-science,1,Telepathy-Science,psiontelepathic-science-macro,telepathic-science-macro,21,telepathic-sciences)
+        insert_psionic-core-discipline.html_(Clairsentient Sciences,psion-clairvoyance-science,clair-science,9,Clair-Science,psionclair-science-macro,clairvoyance-science-macro,29,clairsentient-sciences)
+        insert_psionic-core-discipline.html_(Clairsentient Devotions,psion-clairvoyance,psionclair,8,Clair-Devotion,psionclair-macro,clairvoyance-macro,28,clairsentient-devotions)
     </div>
     <br>
     <div class="sheet-2colrow">
-        insert_psionic-core-discipline.html_(Psychokinesis Devotions,psion-psychokinesis,psionkinetic,2,Kinetic-Devotion,psionkinetic-macro,kinetic-macro,22,psychokinetic-devotions)
-        insert_psionic-core-discipline.html_(Psychokinesis Sciences,psion-kinetic-science,kinetic-science,3,Kinetic-Science,psionkinetic-science-macro,kinetic-science-macro,23,psychokinetic-sciences)
+        insert_psionic-core-discipline.html_(Psychokinetic Sciences,psion-kinetic-science,kinetic-science,3,Kinetic-Science,psionkinetic-science-macro,kinetic-science-macro,23,psychokinetic-sciences)
+        insert_psionic-core-discipline.html_(Psychokinetic Devotions,psion-psychokinesis,psionkinetic,2,Kinetic-Devotion,psionkinetic-macro,kinetic-macro,22,psychokinetic-devotions)
     </div>
     <br>
     <div class="sheet-2colrow">
-        insert_psionic-core-discipline.html_(Psychoportive Devotions,psion-portation,psionportation,4,Portation-Devotion,psionportation-macro,portation-macro,24,psychoportive-devotions)
-        insert_psionic-core-discipline.html_(Psychoportive Sciences,psion-portation-science,portation-science,5,Portation-Science,psionportation-science-macro,portation-science-macro,25,psychoportive-sciences)
+        insert_psionic-core-discipline.html_(Psychometabolic Sciences,psion-metabolic-science,metabolic-science,7,Metabolic-Science,psionmetabolic-science-macro,metabolic-science-macro,27,psychometabolic-sciences)
+        insert_psionic-core-discipline.html_(Psychometabolic Devotions,psion-metabolic,psionmetabolic,6,Metabolic-Devotion,psionmetabolic-macro,metabolic-macro,26,psychometabolic-devotions)
     </div>
     <br>
     <div class="sheet-2colrow">
-        insert_psionic-core-discipline.html_(Psychometabolism Devotions,psion-metabolic,psionmetabolic,6,Metabolic-Devotion,psionmetabolic-macro,metabolic-macro,26,psychometabolic-devotions)
-        insert_psionic-core-discipline.html_(Psychometabolism Sciences,psion-metabolic-science,metabolic-science,7,Metabolic-Science,psionmetabolic-science-macro,metabolic-science-macro,27,psychometabolic-sciences)
+        insert_psionic-core-discipline.html_(Psychoportive Sciences,psion-portation-science,portation-science,5,Portation-Science,psionportation-science-macro,portation-science-macro,25,psychoportive-sciences)
+        insert_psionic-core-discipline.html_(Psychoportive Devotions,psion-portation,psionportation,4,Portation-Devotion,psionportation-macro,portation-macro,24,psychoportive-devotions)
     </div>
     <br>
     <div class="sheet-2colrow">
-        insert_psionic-core-discipline.html_(Clairsentient Devotions,psion-clairvoyance,psionclair,8,Clair-Devotion,psionclair-macro,clairvoyance-macro,28,clairsentient-devotions)
-        insert_psionic-core-discipline.html_(Clairsentient Sciences,psion-clairvoyance-science,clair-science,9,Clair-Science,psionclair-science-macro,clairvoyance-science-macro,29,clairsentient-sciences)
+        insert_psionic-core-discipline.html_(Telepathic Sciences,psion-telepathic-science,telepathic-science,1,Telepathy-Science,psiontelepathic-science-macro,telepathic-science-macro,21,telepathic-sciences)
+        insert_psionic-core-discipline.html_(Telepathic Devotions,psion-telepathy,psiontelepathic,,Telepathy-Devotion,psiontelepathic-macro,telepathic-macro,20,telepathic-devotions)
     </div>
     <br>
     <div class="sheet-2colrow">
-        insert_psionic-core-discipline.html_(Metapsionic Devotions,psion-metapsionics,psionmeta,12,Meta-Devotion,psionmeta-macro,metapsionic-macro,32,metapsionic-devotions)
         insert_psionic-core-discipline.html_(Metapsionic Sciences,psion-metapsionic-science,meta-science,13,Meta-Science,psionmeta-science-macro,metapsionic-science-macro,33,metapsionic-sciences)
+        insert_psionic-core-discipline.html_(Metapsionic Devotions,psion-metapsionics,psionmeta,12,Meta-Devotion,psionmeta-macro,metapsionic-macro,32,metapsionic-devotions)
     </div>
     <br>
     <div class="sheet-2colrow">
@@ -103,7 +103,7 @@ <h4>Psionic Strength Points</h4>
             </table>
         </div>
         <div class="sheet-col">
-            <h4><b>Psionic Proficiencies</b></h4>
+            <h4>Psionic Proficiencies</h4>
             <table>
                 <tr>
                     <td style="text-align: end;">Remaining: </td>
@@ -138,7 +138,7 @@ <h4><b>Psionic Proficiencies</b></h4>
                         <td class="sheet-td-dynamic50"><input type="text" name="attr_psiprofstatnum" title="@{repeating_psiprofs_$X_psiprofstatnum}" placeholder="@{}" class="sheet-maxtext-min"></td>
                         <td>&plusmn;</td>
                         <td><input type="text" name="attr_psiprofmod" title="@{repeating_psiprofs_$X_psiprofmod}" value="0" class="sheet-minish"></td>
-                        <td><button type="roll" name="roll_Psiprof" title="%{repeating_psiprofs_$X_Psiprof}" value="&{template:2Echeck} {{checkvs=@{psiprofname} Check}} {{character=@{character_name}}} {{checkroll=[[1d20cs1cf20]]}} {{checktarget=[[(@{psiprofstatnum})+(@{psiprofmod})+(@{misc-mod})]]}} {{color=dark-blue}}"></button></td>
+                        <td><button type="roll" name="roll_Psiprof" title="%{repeating_psiprofs_$X_Psiprof}" value="&{template:2Echeck} {{checkvs=@{psiprofname} Check}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psiprofstatnum})+(@{psiprofmod})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                     </tr>
                 </table>
             </fieldset>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-skills-and-powers-discipline.html b/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-skills-and-powers-discipline.html
new file mode 100644
index 000000000000..79ed8585de36
--- /dev/null
+++ b/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-skills-and-powers-discipline.html
@@ -0,0 +1,33 @@
+<div class="sheet-col">
+    <h4>#REPLACE0#</h4>
+    <table>
+        <tr>
+            <td class="sheet-default-header">Ability Name</td>
+            <td class="sheet-default-header">MThAC0<br>Adj.</td>
+            <td class="sheet-default-header">MAC</td>
+            <td class="sheet-default-header">MThAC0</td>
+            <td class="sheet-default-header">Macro</td>
+            <td class="sheet-default-header">PSP<br>Cost</td>
+        </tr>
+        <tr>
+            <td><input type="text" name="attr_psionic-#REPLACE1#-name" title="@{psionic-#REPLACE1#-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+            <td><input type="text" name="attr_mthac0adj#REPLACE4#" title="@{mthac0adj#REPLACE4#}" class="sheet-short" value="0"></td>
+            <td><input type="text" name="attr_mac#REPLACE3#" title="@{mac#REPLACE3#}" class="sheet-small" value="10"></td>
+            <td><input type="text" name="attr_MThAC0#REPLACE4#" title="@{MThAC0#REPLACE4#}" class="sheet-small" value="20"><button type="roll" name="roll_mthac0#REPLACE4#-hit1" title="%{mthac0#REPLACE4#-hit1}" value="/em hits a MAC of [[@{MThAC0#REPLACE4#}-(1d20+(@{mthac0adj#REPLACE4#})+(@{misc-mod}))]]&le;[[@{mac#REPLACE3#}]] using their @{psionic-#REPLACE1#-name}"></button></td>
+            <td><input type="text" name="attr_psionic-macro#REPLACE5#" title="@{psionic-macro#REPLACE5#}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro#REPLACE5#-check" title="%{psionic-macro#REPLACE5#-check}" value="@{psionic-macro#REPLACE5#}"></button></td>
+            <td><input type="text" name="attr_PSP-cost#REPLACE5#" title="@{PSP-cost#REPLACE5#}" placeholder="#" class="sheet-small"/></td>
+        </tr>
+    </table>
+    <fieldset name="repeating_psionic-#REPLACE2#" title="@{psionic-#REPLACE2#}" class="repeating_psionic-#REPLACE2#">
+        <table>
+            <tr>
+                <td><input type="text" name="attr_psionic-#REPLACE1#-name" title="@{repeating_psionic-#REPLACE2#_$X_psionic-#REPLACE1#-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
+                <td><input type="text" name="attr_mthac0adj#REPLACE4#" title="@{repeating_psionic-#REPLACE2#_$X_mthac0adj#REPLACE4#}" class="sheet-short" value="0"> &nbsp;</td>
+                <td><input type="text" name="attr_mac#REPLACE3#" title="@{repeating_psionic-#REPLACE2#_$X_mac#REPLACE3#}" class="sheet-small" value="10"></td>
+                <td><input type="text" name="attr_MThAC0#REPLACE4#" title="@{repeating_psionic-#REPLACE2#_$X_MThAC0#REPLACE4#}" class="sheet-small" value="20"><button type="roll" name="roll_mthac0#REPLACE4#-hit1" title="%{repeating_psionic-#REPLACE2#_$X_mthac0#REPLACE4#-hit1}" value="/em hits a MAC of [[@{MThAC0#REPLACE4#}-(1d20+(@{mthac0adj#REPLACE4#})+(@{misc-mod}))]]&le;[[@{mac#REPLACE3#}]] using their @{psionic-#REPLACE1#-name}"></button></td>
+                <td><input type="text" name="attr_psionic-macro#REPLACE5#" title="@{repeating_psionic-#REPLACE2#_$X_psionic-macro#REPLACE5#}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro#REPLACE5#-check" title="%{repeating_psionic-#REPLACE2#_$X_psionic-macro#REPLACE5#-check}" value="@{psionic-macro#REPLACE5#}"></button></td>
+                <td><input type="text" name="attr_PSP-cost#REPLACE5#" title="@{repeating_psionic-#REPLACE2#_$X_PSP-cost#REPLACE5#}" placeholder="#" class="sheet-small"/></td>
+            </tr>
+        </table>
+    </fieldset>
+</div>
\ No newline at end of file
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-skills-and-powers-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-skills-and-powers-tab.html
index 030d19cb73e2..5259f515e1a3 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-skills-and-powers-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-skills-and-powers-tab.html
@@ -3,373 +3,41 @@ <h4>Psionics Revised</h4>
     <label>This section applies to the Player's Option: Skills & Powers and the Dark Sun Campaign Setting Revised Psionics.</label>
     <br>
     <br>
-
     <div class="sheet-2colrow">
-        <div class="sheet-col">
-            <h4><b>Telepathy Devotions</b></h4>
-            <table>
-
-                <tr>
-                    <td class="sheet-default-header">Ability Name</td>
-                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                    <td class="sheet-default-header">MAC</td>
-                    <td class="sheet-default-header">MThAC0</td>
-                    <td class="sheet-default-header">Macro</td>
-                    <td class="sheet-default-header">PSP<br>Cost</td>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_psionic-telepathy-name" title="@{psionic-telepathy-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                    <td><input type="text" name="attr_mthac0adj2" title="@{mthac0adj2}" class="sheet-short" value="0"></td>
-                    <td><input type="text" name="attr_mac" title="@{mac}" class="sheet-small" value="10"></td>
-                    <td><input type="text" name="attr_MThAC02" title="@{MThAC02}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit1" title="%{mthac02-hit1}" value="/em hits a MAC of [[@{MThAC02}-(1d20+(@{mthac0adj2})+(@{misc-mod}))]]&le;[[@{mac}]] using their @{psionic-telepathy-name}"></button></td>
-                    <td><input type="text" name="attr_psionic-macro3" title="@{psionic-macro3}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check" title="%{psionic-macro3-check}" value="@{psionic-macro3}"></button></td>
-                    <td><input type="text" name="attr_PSP-cost3" title="@{PSP-cost3}" placeholder="#" class="sheet-small"/></td>
-                </tr>
-            </table>
-            <fieldset name="repeating_psionic-telepathics" title="@{psionic-telepathics}" class="repeating_psionic-telepathics">
-                <table>
-                    <tr>
-                        <td><input type="text" name="attr_psionic-telepathy-name" title="@{repeating_psionic-telepathics_$X_psionic-telepathy-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                        <td><input type="text" name="attr_mthac0adj2" title="@repeating_psionic-telepathics_$X_{mthac0adj2}" class="sheet-short" value="0"> &nbsp;</td>
-                        <td><input type="text" name="attr_mac" title="@{repeating_psionic-telepathics_$X_mac}" class="sheet-small" value="10"></td>
-                        <td><input type="text" name="attr_MThAC02" title="@{repeating_psionic-telepathics_$X_MThAC02}" class="sheet-small" value="20"><button type="roll" name="roll_mthac02-hit1" title="%{repeating_psionic-telepathics_$X_mthac02-hit1}" value="/em hits a MAC of [[@{MThAC02}-(1d20+(@{mthac0adj2})+(@{misc-mod}))]]&le;[[@{mac}]] using their @{psionic-telepathy-name}"></button></td>
-                        <td><input type="text" name="attr_psionic-macro3" title="@{repeating_psionic-telepathics_$X_psionic-macro3}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro3-check" title="%{repeating_psionic-telepathics_$X_psionic-macro3-check}" value="@{psionic-macro3}"></button>
-                        <td><input type="text" name="attr_PSP-cost3" title="@{repeating_psionic-telepathics_$X_PSP-cost3}" placeholder="#" class="sheet-small"/></td>
-                    </tr>
-                </table>
-            </fieldset>
-        </div>
-        <div class="sheet-col">
-            <h4><b>Telepathy Sciences</b></h4>
-            <table>
-
-                <tr>
-                    <td class="sheet-default-header">Ability Name</td>
-                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                    <td class="sheet-default-header">MAC</td>
-                    <td class="sheet-default-header">MThAC0</td>
-                    <td class="sheet-default-header">Macro</td>
-                    <td class="sheet-default-header">PSP<br>Cost</td>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_psionic-telepathy-science-name" title="@{psionic-telepathy-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                    <td><input type="text" name="attr_mthac0adj3" title="@{mthac0adj3}" class="sheet-short" value="0"></td>
-                    <td><input type="text" name="attr_mac1" title="@{mac1}" class="sheet-small" value="10"></td>
-                    <td><input type="text" name="attr_MThAC03" title="@{MThAC03}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit1" title="%{mthac03-hit1}" value="/em hits a MAC of [[@{MThAC03}-(1d20+(@{mthac0adj3})+(@{misc-mod}))]]&le;[[@{mac1}]] using their @{psionic-telepathy-science-name}"></button></td>
-                    <td><input type="text" name="attr_psionic-macro4" title="@{psionic-macro4}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check" title="%{psionic-macro4-check}" value="@{psionic-macro4}"></button></td>
-                    <td><input type="text" name="attr_PSP-cost4" title="@{PSP-cost4}" placeholder="#" class="sheet-small"/></td>
-                </tr>
-            </table>
-            <fieldset name="repeating_psionic-telepathic-sciences" title="@{psionic-telepathic-sciences}" class="repeating_psionic-telepathic-sciences">
-                <table>
-                    <tr>
-                        <td><input type="text" name="attr_psionic-telepathy-science-name" title="@{repeating_psionic-telepathic-sciences_$X_psionic-telepathy-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                        <td><input type="text" name="attr_mthac0adj3" title="@{repeating_psionic-telepathic-sciences_$X_mthac0adj3}" class="sheet-short" value="0"> &nbsp;</td>
-                        <td><input type="text" name="attr_mac1" title="@{repeating_psionic-telepathic-sciences_$X_mac1}" class="sheet-small" value="0"></td>
-                        <td><input type="text" name="attr_MThAC03" title="@{repeating_psionic-telepathic-sciences_$X_MThAC03}" class="sheet-small" value="20"><button type="roll" name="roll_mthac03-hit1" title="%{repeating_psionic-telepathic-sciences_$X_mthac03-hit1}" value="/em hits a MAC of [[@{MThAC03}-(1d20+(@{mthac0adj3})+(@{misc-mod}))]]&le;[[@{mac1}]] using their @{psionic-telepathy-science-name}"></button></td>
-                        <td><input type="text" name="attr_psionic-macro4" title="@{repeating_psionic-telepathic-sciences_$X_psionic-macro4}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro4-check" title="%{repeating_psionic-telepathic-sciences_$X_psionic-macro4-check}" value="@{psionic-macro4}"></button></td>
-                        <td><input type="text" name="attr_PSP-cost4" title="@{repeating_psionic-telepathic-sciences_$X_PSP-cost4}" placeholder="#" class="sheet-small"/></td>
-                    </tr>
-                </table>
-            </fieldset>
-        </div>
+        insert_psionic-skills-and-powers-discipline.html_(Clairsentient Sciences,clairsentience-science,clairsentience-sciences,9,11,12)
+        insert_psionic-skills-and-powers-discipline.html_(Clairsentient Devotions,clairsentience,clairsentience,8,10,11)
     </div>
     <br>
     <div class="sheet-2colrow">
-        <div class="sheet-col">
-            <h4><b>Psychokinesis Devotions</b></h4>
-            <table>
-
-                <tr>
-                    <td class="sheet-default-header">Ability Name</td>
-                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                    <td class="sheet-default-header">MAC</td>
-                    <td class="sheet-default-header">MThAC0</td>
-                    <td class="sheet-default-header">Macro</td>
-                    <td class="sheet-default-header">PSP<br>Cost</td>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_psionic-psychokinesis-name" title="@{psionic-psychokinesis-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                    <td><input type="text" name="attr_mthac0adj4" title="@{mthac0adj4}" class="sheet-short" value="0"></td>
-                    <td><input type="text" name="attr_mac2" title="@{mac2}" class="sheet-small" value="10"></td>
-                    <td><input type="text" name="attr_MThAC04" title="@{MThAC04}" class="sheet-small" value="20"><button type="roll" name="roll_mthac04-hit1" title="%{mthac04-hit1}" value="/em hits a MAC of [[@{MThAC04}-(1d20+(@{mthac0adj4})+(@{misc-mod}))]]&le;[[@{mac2}]] using their @{psionic-psychokinesis-name}"></button></td>
-                    <td><input type="text" name="attr_psionic-macro5" title="@{psionic-macro5}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro5-check" title="%{psionic-macro5-check}" value="@{psionic-macro5}"></button></td>
-                    <td><input type="text" name="attr_PSP-cost4" title="@{PSP-cost5}" placeholder="#" class="sheet-small"/></td>
-                </tr>
-            </table>
-            <fieldset name="repeating_psionic-psychokinesis" title="@{psionic-psychokinesis}" class="repeating_psionic-psychokinesis">
-                <table>
-                    <tr>
-                        <td><input type="text" name="attr_psionic-psychokinesis-name" title="@{repeating_psionic-psychokinesis_$X_psionic-psychokinesis-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                        <td><input type="text" name="attr_mthac0adj4" title="@{repeating_psionic-psychokinesis_$X_mthac0adj4}" class="sheet-short" value="0"> &nbsp;</td>
-                        <td><input type="text" name="attr_mac2" title="@{repeating_psionic-psychokinesis_$X_mac2}" class="sheet-small" value="10"></td>
-                        <td><input type="text" name="attr_MThAC04" title="@{repeating_psionic-psychokinesis_$X_MThAC04}" class="sheet-small" value="20"><button type="roll" name="roll_mthac04-hit1" title="%{repeating_psionic-psychokinesis_$X_mthac04-hit1}" value="/em hits a MAC of [[@{MThAC04}-(1d20+(@{mthac0adj4})+(@{misc-mod}))]]&le;[[@{mac2}]] using their @{psionic-psychokinesis-name}"></button></td>
-                        <td><input type="text" name="attr_psionic-macro5" title="@{repeating_psionic-psychokinesis_$X_psionic-macro5}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro5-check" title="%{repeating_psionic-psychokinesis_$X_psionic-macro5-check}" value="@{psionic-macro5}"></button></td>
-                        <td><input type="text" name="attr_PSP-cost5" title="@{repeating_psionic-psychokinesis_$X_PSP-cost5}" placeholder="#" class="sheet-small"/></td>
-                    </tr>
-                </table>
-            </fieldset>
-        </div>
-        <div class="sheet-col">
-            <h4><b>Psychokinesis Sciences</b></h4>
-            <table>
-
-                <tr>
-                    <td class="sheet-default-header">Ability Name</td>
-                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                    <td class="sheet-default-header">MAC</td>
-                    <td class="sheet-default-header">MThAC0</td>
-                    <td class="sheet-default-header">Macro</td>
-                    <td class="sheet-default-header">PSP<br>Cost</td>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_psionic-psychokinesis-science-name" title="@{psionic-psychokinesis-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                    <td><input type="text" name="attr_mthac0adj5" title="@{mthac0adj5}" class="sheet-short" value="0"></td>
-                    <td><input type="text" name="attr_mac3" title="@{mac3}" class="sheet-small" value="10"></td>
-                    <td><input type="text" name="attr_MThAC05" title="@{MThAC05}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit1" title="%{mthac05-hit1}" value="/em hits a MAC of [[@{MThAC05}-(1d20+(@{mthac0adj5})+(@{misc-mod}))]]&le;[[@{mac3}]] using their @{psionic-psychokinesis-science-name}"></button></td>
-                    <td><input type="text" name="attr_psionic-macro6" title="@{psionic-macro6}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check" title="%{psionic-macro6-check}" value="@{psionic-macro6}"></button></td>
-                    <td><input type="text" name="attr_PSP-cost6" title="@{PSP-cost6}" placeholder="#" class="sheet-small"/></td>
-                </tr>
-            </table>
-            <fieldset name="repeating_psionic-psychokinesis-sciences" title="@{psionic-psychokinesis-sciences}" class="repeating_psionic-psychokinesis-sciences">
-                <table>
-                    <tr>
-                        <td><input type="text" name="attr_psionic-psychokinesis-science-name" title="@{repeating_psionic_psychokinesis-sciences_$X_psionic-psychokinesis-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                        <td><input type="text" name="attr_mthac0adj5" title="@{repeating_psionic_psychokinesis-sciences_$X_mthac0adj5}" class="sheet-short" value="0"> &nbsp;</td>
-                        <td><input type="text" name="attr_mac3" title="@{repeating_psionic_psychokinesis-sciences_$X_mac3}" class="sheet-small" value="10"></td>
-                        <td><input type="text" name="attr_MThAC05" title="@{repeating_psionic_psychokinesis-sciences_$X_MThAC05}" class="sheet-small" value="20"><button type="roll" name="roll_mthac05-hit1" title="%{repeating_psionic_psychokinesis-sciences_$X_mthac05-hit1}" value="/em hits a MAC of [[@{MThAC05}-(1d20+(@{mthac0adj5})+(@{misc-mod}))]]&le;[[@{mac3}]] using their @{psionic-psychokinesis-science-name}"></button></td>
-                        <td><input type="text" name="attr_psionic-macro6" title="@{repeating_psionic_psychokinesis-sciences_$X_psionic-macro6}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro6-check" title="%{repeating_psionic_psychokinesis-sciences_$X_psionic-macro6-check}" value="@{psionic-macro6}"></button></td>
-                        <td><input type="text" name="attr_PSP-cost6" title="@{repeating_psionic_psychokinesis-sciences_$X_PSP-cost6}" placeholder="#" class="sheet-small"/></td>
-                    </tr>
-                </table>
-            </fieldset>
-        </div>
+        insert_psionic-skills-and-powers-discipline.html_(Psychokinetic Sciences,psychokinesis-science,psychokinesis-sciences,3,5,6)
+        insert_psionic-skills-and-powers-discipline.html_(Psychokinetic Devotions,psychokinesis,psychokinesis,2,4,5)
     </div>
     <br>
     <div class="sheet-2colrow">
-        <div class="sheet-col">
-            <h4><b>Psychoportive Devotions</b></h4>
-            <table>
-
-                <tr>
-                    <td class="sheet-default-header">Ability Name</td>
-                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                    <td class="sheet-default-header">MAC</td>
-                    <td class="sheet-default-header">MThAC0</td>
-                    <td class="sheet-default-header">Macro</td>
-                    <td class="sheet-default-header">PSP<br>Cost</td>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_psionic-psychoportation-name" title="@{psionic-psychoportation-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                    <td><input type="text" name="attr_mthac0adj6" title="@{mthac0adj6}" class="sheet-short" value="0"></td>
-                    <td><input type="text" name="attr_mac4" title="@{mac4}" class="sheet-small" value="10"></td>
-                    <td><input type="text" name="attr_MThAC06" title="@{MThAC06}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit1" title="%{mthac06-hit1}" value="/em hits a MAC of [[@{MThAC06}-(1d20+(@{mthac0adj6})+(@{misc-mod}))]]&le;[[@{mac4}]] using their @{psionic-psychoportation-name}"></button></td>
-                    <td><input type="text" name="attr_psionic-macro7" title="@{psionic-macro7}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check" title="%{psionic-macro7-check}" value="@{psionic-macro7}"></button></td>
-                    <td><input type="text" name="attr_PSP-cost7" title="@{PSP-cost7}" placeholder="#" class="sheet-small"/></td>
-                </tr>
-            </table>
-            <fieldset name="repeating_psionic-psychoportive" title="@{psionic-psychoportive}" class="repeating_psionic-psychoportive">
-                <table>
-                    <tr>
-                        <td><input type="text" name="attr_psionic-psychoportation-name" title="@{repeating_psionic-psychoportive_$X_psionic-psychoportation-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                        <td><input type="text" name="attr_mthac0adj6" title="@{repeating_psionic-psychoportive_$X_mthac0adj6}" class="sheet-short" value="0"> &nbsp;</td>
-                        <td><input type="text" name="attr_mac4" title="@{repeating_psionic-psychoportive_$X_mac4}" class="sheet-small" value="10"></td>
-                        <td><input type="text" name="attr_MThAC06" title="@{repeating_psionic-psychoportive_$X_MThAC06}" class="sheet-small" value="20"><button type="roll" name="roll_mthac06-hit1" title="%{repeating_psionic-psychoportive_$X_mthac06-hit1}" value="/em hits a MAC of [[@{MThAC06}-(1d20+(@{mthac0adj6})+(@{misc-mod}))]]&le;[[@{mac4}]] using their @{psionic-psychoportation-name}"></button></td>
-                        <td><input type="text" name="attr_psionic-macro7" title="@{repeating_psionic-psychoportive_$X_psionic-macro7}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro7-check" title="%{repeating_psionic-psychoportive_$X_psionic-macro7-check}" value="@{psionic-macro7}"></button></td>
-                        <td><input type="text" name="attr_PSP-cost7" title="@{repeating_psionic-psychoportive_$X_PSP-cost7}" placeholder="#" class="sheet-small"/></td>
-                    </tr>
-                </table>
-            </fieldset>
-        </div>
-        <div class="sheet-col">
-            <h4><b>Psychoportive Sciences</b></h4>
-            <table>
-
-                <tr>
-                    <td class="sheet-default-header">Ability Name</td>
-                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                    <td class="sheet-default-header">MAC</td>
-                    <td class="sheet-default-header">MThAC0</td>
-                    <td class="sheet-default-header">Macro</td>
-                    <td class="sheet-default-header">PSP<br>Cost</td>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_psionic-psychoportation-science-name" title="@{psionic-psychoportation-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                    <td><input type="text" name="attr_mthac0adj7" title="@{mthac0adj7}" class="sheet-short" value="0"></td>
-                    <td><input type="text" name="attr_mac5" title="@{mac5}" class="sheet-small" value="10"></td>
-                    <td><input type="text" name="attr_MThAC07" title="@{MThAC07}" class="sheet-small" value="20"><button type="roll" name="roll_mthac07-hit1" title="%{mthac07-hit1}" value="/em hits a MAC of [[@{MThAC07}-(1d20+(@{mthac0adj7})+(@{misc-mod}))]]&le;[[@{mac5}]] using their @{psionic-psychoportation-science-name}"></button></td>
-                    <td><input type="text" name="attr_psionic-macro8" title="@{psionic-macro8}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro8-check" title="%{psionic-macro8-check}" value="@{psionic-macro8}"></button></td>
-                    <td><input type="text" name="attr_PSP-cost8" title="@{PSP-cost8}" placeholder="#" class="sheet-small"/></td>
-                </tr>
-            </table>
-            <fieldset name="repeating_psionic-psychoportive-sciences" title="@{psionic-psychoportive-sciences}" class="repeating_psionic-psychoportive-sciences">
-                <table>
-                    <tr>
-                        <td><input type="text" name="attr_psionic-psychoportation-science-name" title="@{repeating_psionic-psychoportive-sciences_$X_psionic-psychoportation-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                        <td><input type="text" name="attr_mthac0adj7" title="@{repeating_psionic-psychoportive-sciences_$X_mthac0adj7}" class="sheet-short" value="0"> &nbsp;</td>
-                        <td><input type="text" name="attr_mac5" title="@{repeating_psionic-psychoportive-sciences_$X_mac5}" class="sheet-small" value="10"></td>
-                        <td><input type="text" name="attr_MThAC07" title="@{repeating_psionic-psychoportive-sciences_$X_MThAC07}" class="sheet-small" value="20"><button type="roll" name="roll_mthac07-hit1" title="%{repeating_psionic-psychoportive-sciences_$X_mthac07-hit1}" value="/em hits a MAC of [[@{MThAC07}-(1d20+(@{mthac0adj7})+(@{misc-mod}))]]&le;[[@{mac5}]] using their @{psionic-psychoportation-science-name}"></button></td>
-                        <td><input type="text" name="attr_psionic-macro8" title="@{repeating_psionic-psychoportive-sciences_$X_psionic-macro6}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro8-check" title="%{repeating_psionic-psychoportive-sciences_$X_psionic-macro8-check}" value="@{psionic-macro8}"></button></td>
-                        <td><input type="text" name="attr_PSP-cost8" title="@{repeating_psionic-psychoportive-sciences_$X_PSP-cost8}" placeholder="#" class="sheet-small"/></td>
-                    </tr>
-                </table>
-            </fieldset>
-        </div>
+        insert_psionic-skills-and-powers-discipline.html_(Psychometabolic Sciences,psychometabolism-science,psychometabolic-sciences,7,9,10)
+        insert_psionic-skills-and-powers-discipline.html_(Psychometabolic Devotions,psychometabolism,psychometabolics,6,8,9)
     </div>
     <br>
     <div class="sheet-2colrow">
-        <div class="sheet-col">
-            <h4><b>Psychometabolism Devotions</b></h4>
-            <table>
-
-                <tr>
-                    <td class="sheet-default-header">Ability Name</td>
-                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                    <td class="sheet-default-header">MAC</td>
-                    <td class="sheet-default-header">MThAC0</td>
-                    <td class="sheet-default-header">Macro</td>
-                    <td class="sheet-default-header">PSP<br>Cost</td>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_psionic-psychometabolism-name" title="@{psionic-psychometabolism-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                    <td><input type="text" name="attr_mthac0adj8" title="@{mthac0adj8}" class="sheet-short" value="0"></td>
-                    <td><input type="text" name="attr_mac6" title="@{mac6}" class="sheet-small" value="10"></td>
-                    <td><input type="text" name="attr_MThAC08" title="@{MThAC08}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit1" title="%{mthac08-hit1}" value="/em hits a MAC of [[@{MThAC08}-(1d20+(@{mthac0adj8})+(@{misc-mod}))]]&le;[[@{mac6}]] using their @{psionic-psychometabolism-name}"></button></td>
-                    <td><input type="text" name="attr_psionic-macro9" title="@{psionic-macro9}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check" title="%{psionic-macro9-check}" value="@{psionic-macro9}"></button></td>
-                    <td><input type="text" name="attr_PSP-cost9" title="@{PSP-cost9}" placeholder="#" class="sheet-small"/></td>
-                </tr>
-            </table>
-            <fieldset name="repeating_psionic-psychometabolics" title="@{psionic-psychometabolics}" class="repeating_psionic-psychometabolics">
-                <table>
-                    <tr>
-                        <td><input type="text" name="attr_psionic-psychometabolism-name" title="@{repeating_psionic-pschometabolics_$X_psionic-psychometabolism-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                        <td><input type="text" name="attr_mthac0adj8" title="@{repeating_psionic-pschometabolics_$X_mthac0adj8}" class="sheet-short" value="0"> &nbsp;</td>
-                        <td><input type="text" name="attr_mac6" title="@{repeating_psionic-pschometabolics_$X_mac6}" class="sheet-small" value="10"></td>
-                        <td><input type="text" name="attr_MThAC08" title="@{repeating_psionic-pschometabolics_$X_MThAC08}" class="sheet-small" value="20"><button type="roll" name="roll_mthac08-hit1" title="%{repeating_psionic-pschometabolics_$X_mthac08-hit1}" value="/em hits a MAC of [[@{MThAC08}-(1d20+(@{mthac0adj8})+(@{misc-mod}))]]&le;[[@{mac6}]] using their @{psionic-psychometabolism-name}"></button></td>
-                        <td><input type="text" name="attr_psionic-macro9" title="@{repeating_psionic-pschometabolics_$X_psionic-macro9}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro9-check" title="%{repeating_psionic-pschometabolics_$X_psionic-macro9-check}" value="@{psionic-macro9}"></button></td>
-                        <td><input type="text" name="attr_PSP-cost9" title="@{repeating_psionic-pschometabolics_$X_PSP-cost9}" placeholder="#" class="sheet-small"/></td>
-                    </tr>
-                </table>
-            </fieldset>
-        </div>
-        <div class="sheet-col">
-            <h4><b>Psychometabolism Sciences</b></h4>
-            <table>
-
-                <tr>
-                    <td class="sheet-default-header">Ability Name</td>
-                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                    <td class="sheet-default-header">MAC</td>
-                    <td class="sheet-default-header">MThAC0</td>
-                    <td class="sheet-default-header">Macro</td>
-                    <td class="sheet-default-header">PSP<br>Cost</td>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_psionic-psychometabolism-science-name" title="@{psionic-psychometabolism-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                    <td><input type="text" name="attr_mthac0adj9" title="@{mthac0adj9}" class="sheet-short" value="0"></td>
-                    <td><input type="text" name="attr_mac7" title="@{mac7}" class="sheet-small" value="10"></td>
-                    <td><input type="text" name="attr_MThAC09" title="@{MThAC09}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit1" title="%{mthac09-hit1}" value="/em hits a MAC of [[@{MThAC09}-(1d20+(@{mthac0adj9})+(@{misc-mod}))]]&le;[[@{mac7}]] using their @{psionic-psychometabolism-science-name}"></button></td>
-                    <td><input type="text" name="attr_psionic-macro10" title="@{psionic-macro10}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check" title="%{psionic-macro10-check}" value="@{psionic-macro10}"></button></td>
-                    <td><input type="text" name="attr_PSP-cost10" title="@{PSP-cost10}" placeholder="#" class="sheet-small"/></td>
-                </tr>
-            </table>
-            <fieldset name="repeating_psionic-psychometabolic-sciences" title="@{psionic-psychometabolic-sciences}" class="repeating_psionic-psychometabolic-sciences">
-                <table>
-                    <tr>
-                        <td><input type="text" name="attr_psionic-psychometabolism-science-name" title="@{repeating_psychometabolic-sciences_$X_psionic-psychometabolism-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                        <td><input type="text" name="attr_mthac0adj9" title="@{repeating_psychometabolic-sciences_$X_mthac0adj9}" class="sheet-short" value="0"> &nbsp;</td>
-                        <td><input type="text" name="attr_mac7" title="@{repeating_psychometabolic-sciences_$X_mac7}" class="sheet-small" value="10"></td>
-                        <td><input type="text" name="attr_MThAC09" title="@{repeating_psychometabolic-sciences_$X_MThAC09}" class="sheet-small" value="20"><button type="roll" name="roll_mthac09-hit1" title="%{repeating_psychometabolic-sciences_$X_mthac09-hit1}" value="/em hits a MAC of [[@{MThAC09}-(1d20+(@{mthac0adj9})+(@{misc-mod}))]]&le;[[@{mac7}]] using their @{psionic-psychometabolism-science-name}"></button></td>
-                        <td><input type="text" name="attr_psionic-macro10" title="@{repeating_psychometabolic-sciences_$X_psionic-macro10}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro10-check" title="%{repeating_psychometabolic-sciences_$X_psionic-macro10-check}" value="@{psionic-macro10}"></button></td>
-                        <td><input type="text" name="attr_PSP-cost10" title="@{repeating_psychometabolic-sciences_$X_PSP-cost10}" placeholder="#" class="sheet-small"/></td>
-                    </tr>
-                </table>
-            </fieldset>
-        </div>
+        insert_psionic-skills-and-powers-discipline.html_(Psychoportive Sciences,psychoportation-science,psychoportive-sciences,5,7,8)
+        insert_psionic-skills-and-powers-discipline.html_(Psychoportive Devotions,psychoportation,psychoportive,4,6,7)
     </div>
     <br>
     <div class="sheet-2colrow">
-        <div class="sheet-col">
-            <h4><b>Clairsentient Devotions</b></h4>
-            <table>
-
-                <tr>
-                    <td class="sheet-default-header">Ability Name</td>
-                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                    <td class="sheet-default-header">MAC</td>
-                    <td class="sheet-default-header">MThAC0</td>
-                    <td class="sheet-default-header">Macro</td>
-                    <td class="sheet-default-header">PSP<br>Cost</td>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_psionic-clairsentience-name" title="@{psionic-clairsentience-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                    <td><input type="text" name="attr_mthac0adj10" title="@{mthac0adj10}" class="sheet-short" value="0"></td>
-                    <td><input type="text" name="attr_mac8" title="@{mac8}" class="sheet-small" value="10"></td>
-                    <td><input type="text" name="attr_MThAC010" title="@{MThAC010}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit1" title="%{mthac010-hit1}" value="/em hits a MAC of [[@{MThAC010}-(1d20+(@{mthac0adj10})+(@{misc-mod}))]]&le;[[@{mac8}]] using their @{psionic-clairsentience-name}"></button></td>
-                    <td><input type="text" name="attr_psionic-macro11" title="@{psionic-macro11}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check" title="%{psionic-macro11-check}" value="@{psionic-macro11}"></button></td>
-                    <td><input type="text" name="attr_PSP-cost11" title="@{PSP-cost11}" placeholder="#" class="sheet-small"/></td>
-                </tr>
-            </table>
-            <fieldset name="repeating_psionic-clairsentience" title="@{psionic-clairsentience}" class="repeating_psionic-clairsentience">
-                <table>
-                    <tr>
-                        <td><input type="text" name="attr_psionic-clairsentience-name" title="@{repeating_psionic_clairsentience_$X_psionic-clairentience-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                        <td><input type="text" name="attr_mthac0adj10" title="@{repeating_psionic_clairsentience_$X_mthac0adj10}" class="sheet-short" value="0"> &nbsp;</td>
-                        <td><input type="text" name="attr_mac8" title="@{repeating_psionic_clairsentience_$X_mac8}" class="sheet-small" value="10"></td>
-                        <td><input type="text" name="attr_MThAC010" title="@repeating_psionic_clairsentience_$X_{MThAC010}" class="sheet-small" value="20"><button type="roll" name="roll_mthac010-hit1" title="%{repeating_psionic_clairsentience_$X_mthac010-hit1}" value="/em hits a MAC of [[@{MThAC010}-(1d20+(@{mthac0adj10})+(@{misc-mod}))]]&le;[[@{mac8}]] using their @{psionic-clairsentience-name}"></button></td>
-                        <td><input type="text" name="attr_psionic-macro11" title="@{repeating_psionic_clairsentience_$X_psionic-macro11}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro11-check" title="%{repeating_psionic_clairsentience_$X_psionic-macro11-check}" value="@{psionic-macro11}"></button></td>
-                        <td><input type="text" name="attr_PSP-cost11" title="@{repeating_psionic_clairsentience_$X_PSP-cost11}" placeholder="#" class="sheet-small"/></td>
-                    </tr>
-                </table>
-            </fieldset>
-        </div>
-        <div class="sheet-col">
-            <h4><b>Clairsentient Sciences</b></h4>
-            <table>
-
-                <tr>
-                    <td class="sheet-default-header">Ability Name</td>
-                    <td class="sheet-default-header">MThAC0<br>Adj.</td>
-                    <td class="sheet-default-header">MAC</td>
-                    <td class="sheet-default-header">MThAC0</td>
-                    <td class="sheet-default-header">Macro</td>
-                    <td class="sheet-default-header">PSP<br>Cost</td>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_psionic-clairsentience-science-name" title="@{psionic-clairsentience-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                    <td><input type="text" name="attr_mthac0adj11" title="@{mthac0adj11}" class="sheet-short" value="0"></td>
-                    <td><input type="text" name="attr_mac9" title="@{mac9}" class="sheet-small" value="10"></td>
-                    <td><input type="text" name="attr_MThAC011" title="@{MThAC011}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit1" title="%{mthac011-hit1}" value="/em hits a MAC of [[@{MThAC011}-(1d20+(@{mthac0adj11})+(@{misc-mod}))]]&le;[[@{mac9}]] using their @{psionic-clairsentience-science-name}"></button></td>
-                    <td><input type="text" name="attr_psionic-macro12" title="@{psionic-macro12}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check" title="%{psionic-macro12-check}" value="@{psionic-macro12}"></button></td>
-                    <td><input type="text" name="attr_PSP-cost12" title="@{PSP-cost12}" placeholder="#" class="sheet-small"/></td>
-                </tr>
-            </table>
-            <fieldset name="repeating_psionic-clairsentience-sciences" title="@{psionic-clairsentience-sciences}" class="repeating_psionic-clairsentience-sciences">
-                <table>
-                    <tr>
-                        <td><input type="text" name="attr_psionic-clairsentience-science-name" title="@{repeating_psionic-clairsentience-sciences_$X_psionic-clairsentience-science-name}" class="sheet-midtext" placeholder="Ability Name"/></td>
-                        <td><input type="text" name="attr_mthac0adj11" title="@{repeating_psionic-clairsentience-sciences_$X_mthac0adj11}" class="sheet-short" value="0"> &nbsp;</td>
-                        <td><input type="text" name="attr_mac9" title="@{repeating_psionic-clairsentience-sciences_$X_mac9}" class="sheet-small" value="10"></td>
-                        <td><input type="text" name="attr_MThAC011" title="@{repeating_psionic-clairsentience-sciences_$X_MThAC011}" class="sheet-small" value="20"><button type="roll" name="roll_mthac011-hit1" title="%{repeating_psionic-clairsentience-sciences_$X_mthac011-hit1}" value="/em hits a MAC of [[@{MThAC011}-(1d20+(@{mthac0adj11})+(@{misc-mod}))]]&le;[[@{mac9}]] using their @{psionic-clairsentience-science-name}"></button></td>
-                        <td><input type="text" name="attr_psionic-macro12" title="@{repeating_psionic-clairsentience-sciences_$X_psionic-macro12}" class="sheet-mintext" placeholder="Enter macro effects"><button type="roll" name="roll_psionic-macro12-check" title="%{repeating_psionic-clairsentience-sciences_$X_psionic-macro12-check}" value="@{psionic-macro12}"></button></td>
-                        <td><input type="text" name="attr_PSP-cost12" title="@{repeating_psionic-clairsentience-sciences_$X_PSP-cost12}" placeholder="#" class="sheet-small"/></td>
-                    </tr>
-                </table>
-            </fieldset>
-        </div>
+        insert_psionic-skills-and-powers-discipline.html_(Telepathic Sciences,telepathy-science,telepathic-sciences,1,3,4)
+        insert_psionic-skills-and-powers-discipline.html_(Telepathic Devotions,telepathy,telepathics,,2,3)
     </div>
     <br>
-    <h4><b>Psionic Attack Modes</b></h4>
-    <table>
-
+    <h4>Psionic Attack Modes</h4>
+    <table class="sheet-default-header-first-row">
         <tr>
-            <td class="sheet-default-header">Attack Name</td>
-            <td class="sheet-default-header">Attack<br>Speed</td>
-            <td class="sheet-default-header">MThAC0<br>Adj.</td>
-            <td class="sheet-default-header">MThAC0</td>
-            <td class="sheet-default-header">Damage</td>
-            <td class="sheet-default-header">Macro</td>
-            <td class="sheet-default-header">PSP<br>Cost</td>
+            <td>Attack Name</td>
+            <td>Attack<br>Speed</td>
+            <td>MThAC0<br>Adj.</td>
+            <td>MThAC0</td>
+            <td>Damage</td>
+            <td>Macro</td>
+            <td>PSP<br>Cost</td>
         </tr>
         <tr>
             <td><input type="text" name="attr_psionic-attack-name" title="@{psionic-attack-name}" class="sheet-display" placeholder="Ability Name"/></td>
@@ -397,13 +65,12 @@ <h4><b>Psionic Attack Modes</b></h4>
     <br>
     <div class="sheet-3colrow">
         <div class="sheet-col">
-            <h4><b>Psionic Defense Modes</b></h4>
-            <table>
-
+            <h4>Psionic Defense Modes</h4>
+            <table class="sheet-default-header-first-row">
                 <tr>
-                    <td class="sheet-default-header">Attack Name</td>
-                    <td class="sheet-default-header">Macro</td>
-                    <td class="sheet-default-header">PSP<br>Cost</td>
+                    <td>Attack Name</td>
+                    <td>Macro</td>
+                    <td>PSP<br>Cost</td>
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_psionic-defense-name" title="@{psionic-defense-name}" class="sheet-midtext" placeholder="Defense Name"/></td>
@@ -422,51 +89,51 @@ <h4><b>Psionic Defense Modes</b></h4>
             </fieldset>
         </div>
         <div class="sheet-col">
-            <h4><b>Psionic Strength Points</b></h4>
-            <table style='width:250px;'>
+            <h4>Psionic Strength Points</h4>
+            <table class="sheet-table-white sheet-default-header-first-row sheet-default-header-first-column" style='width:250px;'>
                 <tr>
-                    <td class="sheet-default-header" style="width:100px;">Value</td>
-                    <td class="sheet-default-header" style="width:50px;">Current</td>
-                    <td class="sheet-default-header" style="width:15px;">/</td>
-                    <td class="sheet-default-header" style="width:60px;">Maximum</td>
-                    <td class="sheet-default-header" style="width:25px;">Speed</td>
+                    <td style="width:100px;">Value</td>
+                    <td style="width:50px;">Current</td>
+                    <td style="width:15px;">/</td>
+                    <td style="width:60px;">Maximum</td>
+                    <td style="width:25px;">Speed</td>
                 </tr>
                 <tr>
-                    <td class="sheet-default-header" style="width:100px;">PSP:</td>
+                    <td>PSP:</td>
                     <td><input type="number" name="attr_PSP" title="@{PSP}" class="sheet-short" placeholder="PSP"/></td>
-                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                    <td>/</td>
                     <td><input type="number" name="attr_PSP_max" title="@{PSP|max}" class="sheet-short"/></td>
                     <td><button type="roll" name="roll_psispeed2" title="@{psispeed2}" value="/gmroll [[{([[1d10]]-(@{misc-mod})), 1}kh1]] [Initiative Psionics]&{tracker}"></button></td>
                 </tr>
                 <tr>
-                    <td class="sheet-default-header" style="width:100px;">Temp PSP:</td>
+                    <td>Temp PSP:</td>
                     <td><input type="number" name="attr_tempPSP" title="@{tempPSP}" class="sheet-short" placeholder="Temp"/></td>
-                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                    <td>/</td>
                     <td><input type="number" name="attr_tempPSP_max" title="@{tempPSP|max}" class="sheet-short"/></td>
                 </tr>
                 <tr>
-                    <td class="sheet-default-header" style="width:100px;">Stored PSP:</td>
+                    <td>Stored PSP:</td>
                     <td><input type="number" name="attr_storedPSP" title="@{storedPSP}" class="sheet-short" placeholder="Stored"/></td>
-                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                    <td>/</td>
                     <td><input type="number" name="attr_storedPSP_max" title="@{storedPSP|max}" class="sheet-short"/></td>
                 </tr>
                 <tr>
-                    <td class="sheet-default-header" style="width:100px;">M.A.C.</td>
+                    <td>M.A.C.</td>
                     <td><input type="number" name="attr_selfMAC" title="@{selfMAC}" class="sheet-short"/></td>
-                    <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">/</td>
+                    <td>/</td>
                     <td><input type="number" name="attr_temp-selfMAC" title="@{temp-selfMAC}" class="sheet-short"/></td>
                 </tr>
             </table>
         </div>
         <div class="sheet-col">
-            <h4><b>Psionic Proficiencies</b></h4>
+            <h4>Psionic Proficiencies</h4>
             <fieldset name="repeating_psionicprofs" title="@{psionicprofs}" class="repeating_psionicprofs">
                 <table>
                     <tr>
                         <td><input type="text" name="attr_psionicprofname" title="@{repeating_psionicprofs_$X_psionicprofname}" class="sheet-maxtext" placeholder="Name of NWP"></td>
                         <td><input type="text" name="attr_psionicprofstatnum" title="@{repeating_psionicprofs_$X_psionicprofstatnum}" placeholder="@{}" class="sheet-small"></td>
                         <td style="color: #FFF; font-family: Arial, sans-serif; font-weight: bold;">&plusmn;<input type="text" name="attr_psionicprofmod" title="@{repeating_psionicprofs_$X_psionicprofmod}" value="0" class="sheet-small"><input type="text" name="attr_psionicprofslots" title="@{repeating_psionicprofs_$X_profslots}" class="sheet-small" placeholder="#">
-                            <button type="roll" name="roll_Psionicprof" title="%{repeating_psionicprofs_$X_Psionicprof}" value="/roll [[1d20cs<1cf>20]]&le;[[(@{psionicprofstatnum})+(@{psionicprofmod})]] @{psionicprofname}"></button></td>
+                            <button type="roll" name="roll_Psionicprof" title="%{repeating_psionicprofs_$X_Psionicprof}" value="&{template:2Echeck} {{checkvs=@{psionicprofname} Check}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20cs1cf20]])-([[(@{psionicprofstatnum})+(@{psionicprofmod})+(@{misc-mod})]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{crit=You made your check by $[[2]]}} {{fumble=You failed despite your best efforts}} {{checkroll=$[[0]]}} {{checktarget=$[[1]]}} {{color=dark-blue}}"></button></td>
                     </tr>
                 </table>
             </fieldset>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/rogue-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/rogue-tab.html
index 7a9e4148c1e5..a9afe0410ca4 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/rogue-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/rogue-tab.html
@@ -216,7 +216,8 @@ <h4>Skills & Powers / Dark Sun / Sages & Specialists</h4>
                 <!--  Invisible header row to keep the spacing of all the cells  -->
                 <tr class="sheet-collapse">
                     <td>Find/Remove Traps</td>
-                    <td colspan="9"></td>
+                    <td colspan="8"></td>
+                    <td><button class="btn sheet-action-button-roll">Find/Remove Traps</button></td>
                 </tr>
                 <tr>
                     <td>Detect Magic*</td>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/spells-tab/casting-from-scrolls.html b/ADnD_2E_Revised/html/tabs/character-tab/spells-tab/casting-from-scrolls.html
index ac69b907ea90..a65671a79c05 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/spells-tab/casting-from-scrolls.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/spells-tab/casting-from-scrolls.html
@@ -27,7 +27,7 @@
     <li>No adverse effects associated with casting the spell are suffered by the reader. These requirements or penalties have already been fulfilled or suffered by the creator of the scroll (DMG p. 196)</li>
     <li><strong>Scroll Spell Failure</strong>
         <ul>
-            <li>Wizards and Priests casting scrolls containing spells of a level too high for him to cast incurs a 5% failure rate per level between the character's present level and the level at which the spell could be cast (DMG p. 196)<br>
+            <li>Wizards and Priests casting scrolls containing spells of a level too high for the character to cast incurs a 5% failure rate per level between the character's present level and the level at which the spell could be cast (DMG p. 196)<br>
                 Wizards and Priests scroll spell failure is either Total Failure (nothing happens) or Reverse / Harmful Failure effect (DMG p. 196)
             </li>
             <li>Thieves casting scrolls have 25% failure chance. Failure is always a reverse of the effect (PHB p. 58)</li>
diff --git a/ADnD_2E_Revised/javascript/sheetWorkers.js b/ADnD_2E_Revised/javascript/sheetWorkers.js
index 40d654b578cf..28701e7f2268 100644
--- a/ADnD_2E_Revised/javascript/sheetWorkers.js
+++ b/ADnD_2E_Revised/javascript/sheetWorkers.js
@@ -1453,23 +1453,31 @@ on(`${rogueLevelAttributes.map(s => 'change:'+s).join(' ')} change:rogue-level-t
 });
 
 //Rogue armor modifier auto fill
-on('change:armorname', function(eventInfo) {
+const ARMOR_NUMBER_REGEX = /armorname(\d{0,2})$/;
+on('change:armorname change:armorname2 change:repeating_hench4:armorname22', function(eventInfo) {
     let armor = ROGUE_ARMOR[eventInfo.newValue];
     if (armor === undefined)
         return;
 
-    let armorModifiers = {
-        'ppa': armor['Pick Pockets'] || '0',
-        'ola': armor['Open Locks'] || '0',
-        'rta': armor['Find/Remove Traps'] || '0',
-        'msa': armor['Move Silently'] || '0',
-        'hsa': armor['Hide in Shadows'] || '0',
-        'dna': armor['Detect Noise'] || '0',
-        'cwa': armor['Climb Walls'] || '0',
-        'bra': armor['Bribe'] || '0',
-        'tua': armor['Tunneling'] || '0',
-        'eba': armor['Escape bonds'] || '0',
-    };
+    let row = '';
+    let parse = parseSourceAttribute(eventInfo);
+    if (parse.rowId) {
+        row = `repeating_${parse.section}_${parse.rowId}_`;
+    }
+    let armorNumber = parse.attribute.match(ARMOR_NUMBER_REGEX)[1];
+
+    let armorModifiers = {};
+    armorModifiers[`${row}ppa${armorNumber}`]= armor['Pick Pockets'] || '0';
+    armorModifiers[`${row}ola${armorNumber}`]= armor['Open Locks'] || '0';
+    armorModifiers[`${row}rta${armorNumber}`]= armor['Find/Remove Traps'] || '0';
+    armorModifiers[`${row}msa${armorNumber}`]= armor['Move Silently'] || '0';
+    armorModifiers[`${row}hsa${armorNumber}`]= armor['Hide in Shadows'] || '0';
+    armorModifiers[`${row}dna${armorNumber}`]= armor['Detect Noise'] || '0';
+    armorModifiers[`${row}cwa${armorNumber}`]= armor['Climb Walls'] || '0';
+    armorModifiers[`${row}bra${armorNumber}`]= armor['Bribe'] || '0';
+    armorModifiers[`${row}tua${armorNumber}`]= armor['Tunneling'] || '0';
+    armorModifiers[`${row}eba${armorNumber}`]= armor['Escape bonds'] || '0';
+    console.log(armorModifiers);
     setAttrs(armorModifiers);
 });
 
@@ -1477,7 +1485,7 @@ on('clicked:rt', function (eventInfo){
     getAttrs([''], async function (values) {
         console.log(eventInfo);
         let rollBuilder = new RollTemplateBuilder('2Echeck');
-        rollBuilder.push('character=@{character_name}', 'checkroll=[[1d100cs<1cf>96]]');
+        rollBuilder.push('character=@{character_name}', 'checkroll=[[1d100cs<1cf>96]]%');
 
         let skill = await extractQueryResult(`?{Find or Removing Trap?|Find Traps|Remove Traps|Remove Invisible/Magical Traps}`);
         if (skill === 'Find Traps') {
@@ -1496,7 +1504,7 @@ on('clicked:ms clicked:hs', function (eventInfo){
     getAttrs(['rogue-ranger'], async function (values) {
         let skill = eventInfo.triggerName.replace('clicked:', '');
         let rollBuilder = new RollTemplateBuilder('2Echeck');
-        rollBuilder.push('character=@{character_name}','checkroll=[[1d100cs<1cf>[[@{rogue-ranger}+1]] ]]');
+        rollBuilder.push('character=@{character_name}','checkroll=[[1d100cs<1cf>[[@{rogue-ranger}+1]] ]]%');
 
         if (skill ==='ms') {
             rollBuilder.push('success=You are silent. Movement rate reduced to 1/3 of normal. Opponents get -2 to surprise roll from silence and another -2 if you are unseen.', 'fail=You are not silent. Movement rate reduced to 1/3 of normal.');
@@ -1511,7 +1519,7 @@ on('clicked:ms clicked:hs', function (eventInfo){
             return printRoll(`/w gm ${rollBuilder.string()}`);
         }
 
-        let surroundings = await extractQueryResult(`?{What are your surroundings?|Natural (woodland / forrest / plains),Natural|Non-natural (crypt / city street / indoor / underground),Non-natural}`);
+        let surroundings = await extractQueryResult(`?{What are your surroundings?|Natural (woodland / forest / plains),Natural|Non-natural (crypt / city street / indoor / underground),Non-natural}`);
         let displaySurrounding = `*${surroundings} surroundings*`;
         let skillName = skill === 'ms' ? `checkvs=Move Silently\n${displaySurrounding}\n(in @{armorname})` : `checkvs=Hide in Shadows\n${displaySurrounding}\n(in @{armorname})`;
         if (surroundings === 'Natural') {
@@ -2888,7 +2896,7 @@ PSIONIC_CORE_SECTIONS.forEach(({section, name, macro, number, cost_number, disci
             macroBuilder.push(`prep=${prep}`);
             macroBuilder.push(`prereq=${power['prerequisites']}`);
             macroBuilder.push(`reference=${power['reference']}, ${power['book']}`)
-            macroBuilder.push(`powerroll=[[1d20cf20-(@{psionic-mod${number}})]]`);
+            macroBuilder.push(`powerroll=[[1d20cf20]]`);
             if (power['secret-by-dm']) {
                 macroBuilder.push('secret=true');
             }
@@ -2896,8 +2904,8 @@ PSIONIC_CORE_SECTIONS.forEach(({section, name, macro, number, cost_number, disci
             if (power['context-modifier']) {
                 powerScore += `+(${power['context-modifier']})`;
             }
-            macroBuilder.push(`powerscore=[[${powerScore}]]`);
-            macroBuilder.push(`powerscoreenhanced=[[${powerScore}+(@{powerscore-enhanced})]]`)
+            macroBuilder.push(`powerscore=[[${powerScore}+(@{misc-mod})]]`);
+            macroBuilder.push(`powerscoreenhanced=[[${powerScore}+(@{powerscore-enhanced})+(@{misc-mod})]]`)
             macroBuilder.push(`powerscoreeffect=${power['power-score']}`);
             macroBuilder.push(`20effect=${power['20']}`);
             macroBuilder.push(`1effect=${power['1']}`);
@@ -2966,16 +2974,16 @@ PSIONIC_CORE_SECTIONS.forEach(({section, name, macro, number, cost_number, disci
 
             match = fullMacro.match(/\{\{(powerroll=\[\[.*?]])}} *\{\{/);
             if (match) macroBuilder.push(match[1]);
-            else macroBuilder.push(`powerroll=[[1d20cf20-(@{psionic-mod${number}})]]`);
+            else macroBuilder.push(`powerroll=[[1d20cf20]]`);
 
             let powerScore = `@{powerscore-nomod${number}}+(@{powerscore-mod${number}})+(@{psion-armor-penalty})`;
             match = fullMacro.match(/\{\{(powerscore=\[\[.*?]])}} *\{\{/);
             if (match) macroBuilder.push(match[1]);
-            else macroBuilder.push(`powerscore=[[${powerScore}]]`);
+            else macroBuilder.push(`powerscore=[[${powerScore}+(@{misc-mod})]]`);
 
             match = fullMacro.match(/\{\{(powerscoreenhanced=\[\[.*?]])}} *\{\{/);
             if (match) macroBuilder.push(match[1]);
-            else macroBuilder.push(`powerscoreenhanced=[[${powerScore}+(@{powerscore-enhanced})]]`);
+            else macroBuilder.push(`powerscoreenhanced=[[${powerScore}+(@{powerscore-enhanced})+(@{misc-mod})]]`);
 
             match = fullMacro.match(/\{\{(powerscoreeffect=.*?)}} *\{\{/);
             if (match) macroBuilder.push(match[1]);
@@ -3020,7 +3028,6 @@ PSIONIC_CORE_SECTIONS.forEach(({section, name, macro, number, cost_number, disci
     let rollPsionicTemplate = async function(macroValue, rowId, values) {
         let repeating = `repeating_${section}_${rowId}`;
         macroValue = macroValue.replaceAll(`${name}`,`${repeating}_${name}`)
-            .replaceAll(`psionic-mod${number}`,`${repeating}_psionic-mod${number}`)
             .replaceAll(`powerscore-nomod${number}`,`${repeating}_powerscore-nomod${number}`)
             .replaceAll(`powerscore-mod${number}`,`${repeating}_powerscore-mod${number}`)
             .replaceAll(`powerscore-enhanced`,`${repeating}_powerscore-enhanced`)
diff --git a/ADnD_2E_Revised/javascript/version.js b/ADnD_2E_Revised/javascript/version.js
index 3587df093f7d..0ba932276a96 100644
--- a/ADnD_2E_Revised/javascript/version.js
+++ b/ADnD_2E_Revised/javascript/version.js
@@ -1,7 +1,7 @@
 // --- Version change start --- //
 
 const SHEET_NAME = 'AD&D 2E Revised';
-const SHEET_VERSION = '4.17.0';
+const SHEET_VERSION = '4.18.0';
 
 on('sheet:opened', function(){
     getAttrs(['character_sheet'],function(attrs){
@@ -36,6 +36,9 @@ on('sheet:opened', function(){
 
             if (oldSheetVersion.isBelowMigrate(4, 17, 0))
                 migrate4_17_0();
+
+            if (oldSheetVersion.isBelowMigrate(4, 18, 0))
+                migrate4_18_0();
         }
     });
 });
@@ -83,6 +86,28 @@ function moveStaticToRepeating(section, fieldsToMove) {
 }
 //#endregion
 
+//#region verison 4.18.0
+function migrate4_18_0() {
+    console.log('Migrate to v4.18.0');
+    TAS.repeating('hench5')
+        .attrs('psionclai-science-macro527','psionclair-science-macro527')
+        .fields('psiontelepathic-macro505','psiontelepathic-science-macro505')
+        .each(function (row) {
+            let macro = row.S['psiontelepathic-macro505'].trim();
+            if (macro !== '') {
+                console.log('Moved macro from psiontelepathic-macro505 to psiontelepathic-science-macro505');
+                row.S['psiontelepathic-science-macro505'] = macro;
+            }
+        }, function (rowSet, attrSet) {
+            let macro = attrSet.S['psionclai-science-macro527'].trim();
+            if (macro !== '') {
+                console.log('Moved macro from psionclai-science-macro527 to psionclair-science-macro527');
+                attrSet.S['psionclair-science-macro527'] = macro;
+            }
+        }).execute();
+}
+//#endregion
+
 //#region version 4.17.0
 function migrate4_17_0() {
     console.log('Migrate to v4.17.0');
diff --git a/ADnD_2E_Revised/package-lock.json b/ADnD_2E_Revised/package-lock.json
index f6de3c8ceeb3..361146de3bc5 100644
--- a/ADnD_2E_Revised/package-lock.json
+++ b/ADnD_2E_Revised/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "ADnD 2E Revised",
+  "name": "ADnD_2E_Revised",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {