diff --git a/Pathfinder Community/pathfinder_community.html b/Pathfinder Community/pathfinder_community.html
index 274f987c9b..2388c11666 100644
--- a/Pathfinder Community/pathfinder_community.html	
+++ b/Pathfinder Community/pathfinder_community.html	
@@ -28,6 +28,7 @@
                         <span data-i18n="new-features">New Features and Updates</span>
                     </h2>
                     <ol>
+                        <li>Fixed extra macro code showing for NPC saves.</li>
                         <li>Fixed a bug with a Buff to CMD(type:Dodge) that applied the Dodge bonus to Flat Footed CMD.</li>
                         <li>Fixed a bug with all Skill tabs being shown regardless if the Unchained options state.</li>
                         <li>Fixed which Menu Buttons should be displayed when Unchained Skills is enabled (ie Background/Adventure or Consolidated). Also updated the All menus chat output to match.</li>
@@ -2316,8 +2317,7 @@
                                 <span class="table-cell extra-sect">
                                     <details>
                                         <summary class="hide-readonly">...</summary>
-                                        <textarea class="skill-macro-text options" title="@{fort-save-macro-text}" name="attr_fort-save-macro-text">&{template:pf_defense} @{toggle_accessible_flag} @{toggle_rounded_flag} {{font=@{apply_specfont_chat}@{use_specfont}}} {{scroll_desc=@{scroll-desc}}} {{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_defense}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=^{fortitude}}} {{^{save}=@{fort-macro-text}}} @{toggle_save_notes} {{buff_note=@{buff_save_notes}}} {{condition_note=@{condition_save_notes}}} {{condition_note=@{condition_save_notes}}}
-                                        </textarea>
+                                        <textarea class="skill-macro-text options" title="@{fort-save-macro-text}" name="attr_fort-save-macro-text">&{template:pf_defense} @{toggle_accessible_flag} @{toggle_rounded_flag} {{font=@{apply_specfont_chat}@{use_specfont}}} {{scroll_desc=@{scroll-desc}}} {{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_defense}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=^{fortitude}}} {{^{save}=@{fort-macro-text}}} @{toggle_save_notes} {{buff_note=@{buff_save_notes}}} {{condition_note=@{condition_save_notes}}} {{condition_note=@{condition_save_notes}}}</textarea>
                                     </details>
                                 </span>
                             </div>
@@ -2362,8 +2362,7 @@
                                 <span class="table-cell extra-sect">
                                     <details>
                                         <summary class="hide-readonly">...</summary>
-                                        <textarea class="skill-macro-text options" title="@{ref-save-macro-text}" name="attr_ref-save-macro-text">&{template:pf_defense} @{toggle_accessible_flag} @{toggle_rounded_flag} {{font=@{apply_specfont_chat}@{use_specfont}}} {{scroll_desc=@{scroll-desc}}} {{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_defense}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=^{reflex}}} {{^{save}=@{ref-macro-text}}} @{toggle_save_notes} {{buff_note=@{buff_save_notes}}} {{condition_note=@{condition_save_notes}}} {{condition_note=@{condition_save_notes}}}
-                                        </textarea>
+                                        <textarea class="skill-macro-text options" title="@{ref-save-macro-text}" name="attr_ref-save-macro-text">&{template:pf_defense} @{toggle_accessible_flag} @{toggle_rounded_flag} {{font=@{apply_specfont_chat}@{use_specfont}}} {{scroll_desc=@{scroll-desc}}} {{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_defense}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=^{reflex}}} {{^{save}=@{ref-macro-text}}} @{toggle_save_notes} {{buff_note=@{buff_save_notes}}} {{condition_note=@{condition_save_notes}}} {{condition_note=@{condition_save_notes}}}</textarea>
                                     </details>
                                 </span>
                             </div>
@@ -2408,8 +2407,7 @@
                                 <span class="table-cell extra-sect">
                                     <details>
                                         <summary class="hide-readonly">...</summary>
-                                        <textarea class="skill-macro-text options" title="@{will-save-macro-text}" name="attr_will-save-macro-text">&{template:pf_defense} @{toggle_accessible_flag} @{toggle_rounded_flag} {{font=@{apply_specfont_chat}@{use_specfont}}} {{scroll_desc=@{scroll-desc}}} {{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_defense}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=^{willpower}}} {{^{save}=@{will-macro-text}}} @{toggle_save_notes} {{buff_note=@{buff_save_notes}}} {{condition_note=@{condition_save_notes}}} {{condition_note=@{condition_save_notes}}}
-                                        </textarea>
+                                        <textarea class="skill-macro-text options" title="@{will-save-macro-text}" name="attr_will-save-macro-text">&{template:pf_defense} @{toggle_accessible_flag} @{toggle_rounded_flag} {{font=@{apply_specfont_chat}@{use_specfont}}} {{scroll_desc=@{scroll-desc}}} {{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_defense}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=^{willpower}}} {{^{save}=@{will-macro-text}}} @{toggle_save_notes} {{buff_note=@{buff_save_notes}}} {{condition_note=@{condition_save_notes}}} {{condition_note=@{condition_save_notes}}}</textarea>
                                     </details>
                                 </span>
                             </div>
@@ -15606,7 +15604,7 @@
     </div>
     <div data-i18n-aria-label="footer-aria" class="footer" aria-label="Help links and footer information">
         <div class="table">
-            <span data-i18n="footer-info">Created by Samuel Marino w/contributions by Vince, Chris Buchholz, Magik, James W. | Last updated:&nbsp;</span> <i>Thu Apr 20 2023 22:42:31 GMT&nbsp;</i>v.<input type="text" name="attr_PFSheet_Version" value="0" class="calc number" readonly="" title="A non-blank version indicates attributes have been successfully recalculated.">
+            <span data-i18n="footer-info">Created by Samuel Marino w/contributions by Vince, Chris Buchholz, Magik, James W. | Last updated:&nbsp;</span> <i>Fri May 05 2023 15:44:04 GMT&nbsp;</i>v.<input type="text" name="attr_PFSheet_Version" value="0" class="calc number" readonly="" title="A non-blank version indicates attributes have been successfully recalculated.">
         </div>
         <div class="three-columns" style="margin-top:-.5em;">
             <span><button type="roll" class="no-decoration" data-i18n-title="url-link" name="roll_blank" value="https://tinyurl.com/PFRoll20Thread7"><b style="font-size:1.1rem;" data-i18n="questions-feedback">Questions/Feedback?</b></button></span>