diff --git a/ADnD 2E Revised/2ESheet.html b/ADnD 2E Revised/2ESheet.html
index 41c206b06d..65530e4c7b 100644
--- a/ADnD 2E Revised/2ESheet.html	
+++ b/ADnD 2E Revised/2ESheet.html	
@@ -22,6 +22,14 @@
                 <li>Added checkboxes on the Sheet Settings tab to control the new books</li>
                 <li>Added detailed information about potions initiative modifier and duration</li>
                 <li>Added information box to help inform players when errors happen</li>
+                <li>Renamed Follower -> Psion -> <b>Standard</b> to <b>Psionic Core</b> to align it with the PC Psionics Tab</li>
+                <li>Renamed Follower -> Psion -> <b>Advanced</b> to <b>Psionic S/P</b> to align it with the PC Psionics Tab</li>
+                <li>Fixed a bug with the first Follower -> Psion -> Psionic Core -> Psychometabolism Devotions field
+                    <ul>
+                        <li><b>@{psionmetabolic518 }</b> renamed to <b>@{psionmetabolic518}</b>. Trailing whitespace was removed</li>
+                        <li><b>@{repeating_hench5_$X_psionmetabolic518 }</b> renamed to <b>@{repeating_hench5_$X_psionmetabolic518}</b>. Trailing whitespace was removed</li>
+                    </ul>
+                </li>
             </ul>
             <hr>
             <p>
@@ -9597,9 +9605,9 @@
 
             <div class="sheet-tab-content sheet-section-psionic-advanced">
                 <h4>Psionics Revised</h4>
-                <br>
                 <label>This section applies to Dark Sun Campaign Setting Revised Psionics.</label>
                 <br>
+                <br>
 
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
@@ -13898,8 +13906,8 @@
                     </tr>
                 </table>
                 <hr>
-                <input type="radio" name="attr_tab30" class="sheet-tab sheet-tab65" value="1" checked/><span class="sheet-tab sheet-tab65">Standard</span>&nbsp;
-                <input type="radio" name="attr_tab30" class="sheet-tab sheet-tab66" value="2"/><span class="sheet-tab sheet-tab66">Advanced</span>
+                <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>
                 <br>
                 <br>
 
@@ -14111,7 +14119,7 @@
                             <ul>
                                 <table>
                                     <tr>
-                                        <td><input type="text" name="attr_psionmetabolic518 " title="@{psionmetabolic518}" class="sheet-medium"></td>
+                                        <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>
@@ -14447,7 +14455,8 @@
                     <textarea name="attr_psiweps500" title="@{psiweps500}"></textarea>
                 </div>
                 <div class="sheet-tab-content sheet-section-psionics-advanced-hench">
-                    <h4>Advanced Psionics</h4>
+                    <h4>Psionics Revised</h4>
+                    <label>This section applies to Dark Sun Campaign Setting Revised Psionics.</label>
                     <br>
                     <label>You can use + to denote different sources of bonuses.</label>
                     <br>
@@ -15195,8 +15204,8 @@
                         </tr>
                     </table>
                     <hr>
-                    <input type="radio" name="attr_tab23" class="sheet-tab sheet-tab67" value="1" checked/><span class="sheet-tab sheet-tab67">Standard</span>&nbsp;
-                    <input type="radio" name="attr_tab23" class="sheet-tab sheet-tab68" value="2"/><span class="sheet-tab sheet-tab68">Advanced</span><br><br>
+                    <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>
 
                     <div class="sheet-tab-content sheet-section-psionics-standard-repeat">
                         <h4>Psionics Core</h4>
@@ -15424,7 +15433,7 @@
                                 <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_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">
@@ -15790,7 +15799,8 @@
                     </div>
 
                     <div class="sheet-tab-content sheet-section-psionics-advanced-repeat">
-                        <h4>Advanced Psionics</h4>
+                        <h4>Psionics Revised</h4>
+                        <label>This section applies to Dark Sun Campaign Setting Revised Psionics.</label>
                         <br>
                         <label>You can use + to denote different sources of bonuses.</label>
                         <br>
diff --git a/ADnD 2E Revised/html/2ESheet-base.html b/ADnD 2E Revised/html/2ESheet-base.html
index 3eebd018e3..021a77dcf6 100644
--- a/ADnD 2E Revised/html/2ESheet-base.html	
+++ b/ADnD 2E Revised/html/2ESheet-base.html	
@@ -22,6 +22,14 @@
                 <li>Added checkboxes on the Sheet Settings tab to control the new books</li>
                 <li>Added detailed information about potions initiative modifier and duration</li>
                 <li>Added information box to help inform players when errors happen</li>
+                <li>Renamed Follower -> Psion -> <b>Standard</b> to <b>Psionic Core</b> to align it with the PC Psionics Tab</li>
+                <li>Renamed Follower -> Psion -> <b>Advanced</b> to <b>Psionic S/P</b> to align it with the PC Psionics Tab</li>
+                <li>Fixed a bug with the first Follower -> Psion -> Psionic Core -> Psychometabolism Devotions field
+                    <ul>
+                        <li><b>@{psionmetabolic518 }</b> renamed to <b>@{psionmetabolic518}</b>. Trailing whitespace was removed</li>
+                        <li><b>@{repeating_hench5_$X_psionmetabolic518 }</b> renamed to <b>@{repeating_hench5_$X_psionmetabolic518}</b>. Trailing whitespace was removed</li>
+                    </ul>
+                </li>
             </ul>
             <hr>
             <p>
@@ -5502,9 +5510,9 @@
 
             <div class="sheet-tab-content sheet-section-psionic-advanced">
                 <h4>Psionics Revised</h4>
-                <br>
                 <label>This section applies to Dark Sun Campaign Setting Revised Psionics.</label>
                 <br>
+                <br>
 
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
@@ -9227,8 +9235,8 @@
                     </tr>
                 </table>
                 <hr>
-                <input type="radio" name="attr_tab30" class="sheet-tab sheet-tab65" value="1" checked/><span class="sheet-tab sheet-tab65">Standard</span>&nbsp;
-                <input type="radio" name="attr_tab30" class="sheet-tab sheet-tab66" value="2"/><span class="sheet-tab sheet-tab66">Advanced</span>
+                <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>
                 <br>
                 <br>
 
@@ -9440,7 +9448,7 @@
                             <ul>
                                 <table>
                                     <tr>
-                                        <td><input type="text" name="attr_psionmetabolic518 " title="@{psionmetabolic518}" class="sheet-medium"></td>
+                                        <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>
@@ -9776,7 +9784,8 @@
                     <textarea name="attr_psiweps500" title="@{psiweps500}"></textarea>
                 </div>
                 <div class="sheet-tab-content sheet-section-psionics-advanced-hench">
-                    <h4>Advanced Psionics</h4>
+                    <h4>Psionics Revised</h4>
+                    <label>This section applies to Dark Sun Campaign Setting Revised Psionics.</label>
                     <br>
                     <label>You can use + to denote different sources of bonuses.</label>
                     <br>
@@ -10524,8 +10533,8 @@
                         </tr>
                     </table>
                     <hr>
-                    <input type="radio" name="attr_tab23" class="sheet-tab sheet-tab67" value="1" checked/><span class="sheet-tab sheet-tab67">Standard</span>&nbsp;
-                    <input type="radio" name="attr_tab23" class="sheet-tab sheet-tab68" value="2"/><span class="sheet-tab sheet-tab68">Advanced</span><br><br>
+                    <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>
 
                     <div class="sheet-tab-content sheet-section-psionics-standard-repeat">
                         <h4>Psionics Core</h4>
@@ -10753,7 +10762,7 @@
                                 <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_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">
@@ -11119,7 +11128,8 @@
                     </div>
 
                     <div class="sheet-tab-content sheet-section-psionics-advanced-repeat">
-                        <h4>Advanced Psionics</h4>
+                        <h4>Psionics Revised</h4>
+                        <label>This section applies to Dark Sun Campaign Setting Revised Psionics.</label>
                         <br>
                         <label>You can use + to denote different sources of bonuses.</label>
                         <br>