diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html
index fc465e7c6c..85f505f420 100644
--- a/ADnD_2E_Revised/2ESheet.html
+++ b/ADnD_2E_Revised/2ESheet.html
@@ -9,7 +9,6 @@
         <h2 style="color: black;">Changes in <span name="attr_version"></span></h2>
         <div class="sheet-announce-items">
             <ul style="font-style:italic">
-                <li>2Espell - Sensory signature and Knockdown switched places to make them appear in the same order as in the PO: Spells & Magic book</li>
                 <li>Completely redesigned the new spell section, so each spell can be on a single line, showing Name, Range, and Area of Effect
                     <ul>
                         <li>Single line spells can be folded out to show additional information of the spells</li>
@@ -20,9 +19,11 @@
                 <li>Redesigned the Spells tab to only show the spell tracking system that selected on the Sheet Settings Tab</li>
                 <li>High Wisdom now triggers a popup asking if you are a priest. Bonus spells are only added if you are a priest</li>
                 <li>High Wisdom now autofill bonus Winds for Priests for the Arcs/Winds spell tracking system. If the PO: S&P sub ability scores are used, base Wisdom is still used for determining bonus winds</li>
+                <li>Added support for automatic Spell Points for Wizards with high Intelligence</li>
                 <li>High Constitution Regeneration now clarifies that it is per turn(s)</li>
                 <li>Fixed bonus spells from high Intuition. Willpower was incorrectly used</li>
                 <li>Styled Monster tab to have dynamically sized fields, and larger fields for Hit Dice, HP, and Max HP</li>
+                <li>2Espell - Sensory signature and Knockdown switched places to make them appear in the same order as in the PO: Spells & Magic book</li>
             </ul>
             <hr>
             <p>
@@ -3903,7 +3904,7 @@
                     <td></td>
                     <td>Level</td>
                     <td class="sheet-padding-right">Specialist</td>
-                    <td class="sheet-padding-right">Intelligence</td>
+                    <td class="sheet-padding-right" colspan="2" title="Optional rules for wizards to gain extra spell points from high intelligence">Intelligence</td>
                     <td>Total</td>
                     <td class="sheet-centering-padding-5">|</td>
                     <td>Remaining</td>
@@ -3913,11 +3914,16 @@
                     <td><input type="number" name="attr_spell-points-lvl" title="@{spell-points-lvl}" class="sheet-mediumish" value="0"></td>
                     <td><input type="number" name="attr_spell-points-spc" title="@{spell-points-spc}" class="sheet-table-dynamic" value="0"></td>
                     <td><input type="number" name="attr_spell-points-int" title="@{spell-points-int}" class="sheet-table-dynamic" value="0"></td>
+                    <td><label><input type="checkbox" name="attr_spell-points-int-enabled" title="@{spell-points-int-enabled}" value='1'/><span></span></label></td>
                     <td><input type="text" name="attr_spell-points-total" title="@{spell-points-total}" class="sheet-short" value="0" readonly></td>
                     <td class="sheet-centering">|</td>
                     <td><input type="text" name="attr_spell-points-remaining" title="@{spell-points-remaining}" class="sheet-table-dynamic" value="0" readonly></td>
                 </tr>
             </table>
+            <details>
+                <summary>Bonus spell points from high Intelligence to Wizards</summary>
+                Under this optional rule, wizard characters gain a number of bonus spell points, based on their Intelligence score. PO: Spells & Powers, p. 79
+            </details>
             <table class="sheet-default-header-first-row sheet-default-header-first-column sheet-spell-arcs-winds sheet-hidden">
                 <tr>
                     <td></td>
@@ -33726,7 +33732,7 @@ intelligenceTable['intimm4th'] = ['Error','','','','','','','','','','','','',''
 intelligenceTable['intimm5th'] = ['Error','','','','','','','','','','','','','','','','','','','','','','','5th-level','5th-level','5th-level'];
 intelligenceTable['intimm6th'] = ['Error','','','','','','','','','','','','','','','','','','','','','','','','6th-level','6th-level'];
 intelligenceTable['intimm7th'] = ['Error','','','','','','','','','','','','','','','','','','','','','','','','','7th-level'];
-// intelligenceTable['spell-points-int'] = ['Error','','','','','','','','','2','2','2','3','3','4','4','5','6','7','8','9','9','9','9','9','9'];
+intelligenceTable['spell-points-int'] = [0,0,0,0,0,0,0,0,0,2,2,2,3,3,4,4,5,6,7,8,9,9,9,9,9,9];
 intelligenceTable['intnotes'] = ['INVALID INTELLIGENCE','Communicate by Grunts & Gestures','','','','','','','','','','','','','','','','','','','','','','','','',''];
 
 const wisdomTable = {};
@@ -69808,6 +69814,17 @@ setupRepeatingSpellSumming(allWizardSpellSections, wizardSpellPoints, 'spell-poi
 setupRepeatingSpellSumming(allWizardSpellSections, 'arc', 'spell-arc', `${arc}-sum`, true);
 setupCalculateRemaining(`${wizardSpellPoints}-total`, `${wizardSpellPoints}-sum`, `${wizardSpellPoints}-remaining`);
 setupCalculateRemaining(arc, `${arc}-sum`, `${arc}-remaining`);
+on('change:spell-points-int-enabled change:intelligence', function (eventInfo) {
+    getAttrs(['spell-points-int-enabled', 'intelligence'], function (values) {
+        let newValue = {'spell-points-int': 0}
+        if (values['spell-points-int-enabled'] !== '1') {
+            return setAttrs(newValue)
+        }
+        let intelligence = getLookupValue(values['intelligence'], 0);
+        newValue['spell-points-int'] = intelligenceTable['spell-points-int'][intelligence];
+        setAttrs(newValue);
+    });
+});
 
 let priestSpellPoints = 'spell-points-priest';
 let wind = 'total-wind';
diff --git a/ADnD_2E_Revised/html/changelog.html b/ADnD_2E_Revised/html/changelog.html
index 57571987f7..441c7fa495 100644
--- a/ADnD_2E_Revised/html/changelog.html
+++ b/ADnD_2E_Revised/html/changelog.html
@@ -4,7 +4,6 @@
         <h2 style="color: black;">Changes in <span name="attr_version"></span></h2>
         <div class="sheet-announce-items">
             <ul style="font-style:italic">
-                <li>2Espell - Sensory signature and Knockdown switched places to make them appear in the same order as in the PO: Spells & Magic book</li>
                 <li>Completely redesigned the new spell section, so each spell can be on a single line, showing Name, Range, and Area of Effect
                     <ul>
                         <li>Single line spells can be folded out to show additional information of the spells</li>
@@ -15,9 +14,11 @@
                 <li>Redesigned the Spells tab to only show the spell tracking system that selected on the Sheet Settings Tab</li>
                 <li>High Wisdom now triggers a popup asking if you are a priest. Bonus spells are only added if you are a priest</li>
                 <li>High Wisdom now autofill bonus Winds for Priests for the Arcs/Winds spell tracking system. If the PO: S&P sub ability scores are used, base Wisdom is still used for determining bonus winds</li>
+                <li>Added support for automatic Spell Points for Wizards with high Intelligence</li>
                 <li>High Constitution Regeneration now clarifies that it is per turn(s)</li>
                 <li>Fixed bonus spells from high Intuition. Willpower was incorrectly used</li>
                 <li>Styled Monster tab to have dynamically sized fields, and larger fields for Hit Dice, HP, and Max HP</li>
+                <li>2Espell - Sensory signature and Knockdown switched places to make them appear in the same order as in the PO: Spells & Magic book</li>
             </ul>
             <hr>
             <p>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/spells-tab/wizard-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/spells-tab/wizard-tab.html
index d07d15f437..b240705946 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/spells-tab/wizard-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/spells-tab/wizard-tab.html
@@ -34,7 +34,7 @@
             <td></td>
             <td>Level</td>
             <td class="sheet-padding-right">Specialist</td>
-            <td class="sheet-padding-right">Intelligence</td>
+            <td class="sheet-padding-right" colspan="2" title="Optional rules for wizards to gain extra spell points from high intelligence">Intelligence</td>
             <td>Total</td>
             <td class="sheet-centering-padding-5">|</td>
             <td>Remaining</td>
@@ -44,11 +44,16 @@
             <td><input type="number" name="attr_spell-points-lvl" title="@{spell-points-lvl}" class="sheet-mediumish" value="0"></td>
             <td><input type="number" name="attr_spell-points-spc" title="@{spell-points-spc}" class="sheet-table-dynamic" value="0"></td>
             <td><input type="number" name="attr_spell-points-int" title="@{spell-points-int}" class="sheet-table-dynamic" value="0"></td>
+            <td><label><input type="checkbox" name="attr_spell-points-int-enabled" title="@{spell-points-int-enabled}" value='1'/><span></span></label></td>
             <td><input type="text" name="attr_spell-points-total" title="@{spell-points-total}" class="sheet-short" value="0" readonly></td>
             <td class="sheet-centering">|</td>
             <td><input type="text" name="attr_spell-points-remaining" title="@{spell-points-remaining}" class="sheet-table-dynamic" value="0" readonly></td>
         </tr>
     </table>
+    <details>
+        <summary>Bonus spell points from high Intelligence to Wizards</summary>
+        Under this optional rule, wizard characters gain a number of bonus spell points, based on their Intelligence score. PO: Spells & Powers, p. 79
+    </details>
     <table class="sheet-default-header-first-row sheet-default-header-first-column sheet-spell-arcs-winds sheet-hidden">
         <tr>
             <td></td>
diff --git a/ADnD_2E_Revised/javascript/abilityScores.js b/ADnD_2E_Revised/javascript/abilityScores.js
index 8470822ad9..30f09d49f9 100644
--- a/ADnD_2E_Revised/javascript/abilityScores.js
+++ b/ADnD_2E_Revised/javascript/abilityScores.js
@@ -99,7 +99,7 @@ intelligenceTable['intimm4th'] = ['Error','','','','','','','','','','','','',''
 intelligenceTable['intimm5th'] = ['Error','','','','','','','','','','','','','','','','','','','','','','','5th-level','5th-level','5th-level'];
 intelligenceTable['intimm6th'] = ['Error','','','','','','','','','','','','','','','','','','','','','','','','6th-level','6th-level'];
 intelligenceTable['intimm7th'] = ['Error','','','','','','','','','','','','','','','','','','','','','','','','','7th-level'];
-// intelligenceTable['spell-points-int'] = ['Error','','','','','','','','','2','2','2','3','3','4','4','5','6','7','8','9','9','9','9','9','9'];
+intelligenceTable['spell-points-int'] = [0,0,0,0,0,0,0,0,0,2,2,2,3,3,4,4,5,6,7,8,9,9,9,9,9,9];
 intelligenceTable['intnotes'] = ['INVALID INTELLIGENCE','Communicate by Grunts & Gestures','','','','','','','','','','','','','','','','','','','','','','','','',''];
 
 const wisdomTable = {};
diff --git a/ADnD_2E_Revised/javascript/sheetWorkers.js b/ADnD_2E_Revised/javascript/sheetWorkers.js
index 8dd46a163e..d02523196f 100644
--- a/ADnD_2E_Revised/javascript/sheetWorkers.js
+++ b/ADnD_2E_Revised/javascript/sheetWorkers.js
@@ -1323,6 +1323,17 @@ setupRepeatingSpellSumming(allWizardSpellSections, wizardSpellPoints, 'spell-poi
 setupRepeatingSpellSumming(allWizardSpellSections, 'arc', 'spell-arc', `${arc}-sum`, true);
 setupCalculateRemaining(`${wizardSpellPoints}-total`, `${wizardSpellPoints}-sum`, `${wizardSpellPoints}-remaining`);
 setupCalculateRemaining(arc, `${arc}-sum`, `${arc}-remaining`);
+on('change:spell-points-int-enabled change:intelligence', function (eventInfo) {
+    getAttrs(['spell-points-int-enabled', 'intelligence'], function (values) {
+        let newValue = {'spell-points-int': 0}
+        if (values['spell-points-int-enabled'] !== '1') {
+            return setAttrs(newValue)
+        }
+        let intelligence = getLookupValue(values['intelligence'], 0);
+        newValue['spell-points-int'] = intelligenceTable['spell-points-int'][intelligence];
+        setAttrs(newValue);
+    });
+});
 
 let priestSpellPoints = 'spell-points-priest';
 let wind = 'total-wind';