diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html
index 158bde4d73..2e931d6c54 100644
--- a/ADnD_2E_Revised/2ESheet.html
+++ b/ADnD_2E_Revised/2ESheet.html
@@ -14046,16 +14046,16 @@
                 <hr>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
-                        <td><button type="roll" name="roll_hench5parsave" title="%{hench5parsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5partar}]] [@{henchname5} Save versus Paralyzation]"><br>Para<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5poisave" title="%{hench5poisave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5poitar}]] [@{henchname5} Save versus Poison]"><br>Pois<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5deasave" title="%{hench5deasave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5deatar}]] [@{henchname5} Save versus Death]"><br>Death<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5rodsave" title="%{hench5rodsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5rodtar}]] [@{henchname5} Save versus Rod]"><br>Rod<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5stasave" title="%{hench5stasave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5statar}]] [@{henchname5} Save versus Staff]"><br>Staff<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5wansave" title="%{hench5wansave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5wantar}]] [@{henchname5} Save versus Wand]"><br>Wand<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5petsave" title="%{hench5petsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5pettar}]] [@{henchname5} Save versus Petrification]"><br>Pet<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5polsave" title="%{hench5polsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5poltar}]] [@{henchname5} Save versus Polymorph]"><br>Poly<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5bresave" title="%{hench5bresave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5bretar}]] [@{henchname5} Save versus Breath]"><br>Breath<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench5spesave" title="%{hench5spesave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5spetar}]] [@{henchname5} Save versus Spell]"><br>Spell<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5parsave" title="%{hench5parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname5}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench5partar}]]}} {{color=orange}}"><br>Para<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5parsave" title="%{hench5poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname5}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench5poitar}]]}} {{color=orange}}"><br>Pois<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5deasave" title="%{hench5deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname5}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench5deatar}]]}} {{color=orange}}"><br>Death<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5rodsave" title="%{hench5rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname5}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench5rodtar}]]}} {{color=orange}}"><br>Rod<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5stasave" title="%{hench5stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname5}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench5statar}]]}} {{color=orange}}"><br>Staff<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5wansave" title="%{hench5wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname5}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench5wantar}]]}} {{color=orange}}"><br>Wand<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5petsave" title="%{hench5petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname5}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench5pettar}]]}} {{color=orange}}"><br>Pet<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5polsave" title="%{hench5polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname5}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench5poltar}]]}} {{color=orange}}"><br>Poly<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5bresave" title="%{hench5bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname5}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench5bretar}]]}} {{color=orange}}"><br>Breath<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench5spesave" title="%{hench5spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname5}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench5spetar}]]}} {{color=orange}}"><br>Spell<br>Save</button></td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_hench5partar" title="@{hench5partar}" class="sheet-small"></td>
@@ -15344,16 +15344,16 @@
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
-                            <td><button type="roll" name="roll_hench55parsave" title="%{repeating_hench5_$X_hench55parsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55partar}]] [@{henchname55} Save versus Paralyzation]"><br>Para<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55poisave" title="%{repeating_hench5_$X_hench55poisave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55poitar}]] [@{henchname55} Save versus Poison]"><br>Pois<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55deasave" title="%{repeating_hench5_$X_hench55deasave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55deatar}]] [@{henchname55} Save versus Death]"><br>Death<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55rodsave" title="%{repeating_hench5_$X_hench55rodsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55rodtar}]] [@{henchname55} Save versus Rod]"><br>Rod<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55stasave" title="%{repeating_hench5_$X_hench55stasave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55statar}]] [@{henchname55} Save versus Staff]"><br>Staff<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55wansave" title="%{repeating_hench5_$X_hench55wansave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55wantar}]] [@{henchname55} Save versus Wand]"><br>Wand<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55petsave" title="%{repeating_hench5_$X_hench55petsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55pettar}]] [@{henchname55} Save versus Petrification]"><br>Pet<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55polsave" title="%{repeating_hench5_$X_hench55polsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55poltar}]] [@{henchname55} Save versus Polymorph]"><br>Poly<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55bresave" title="%{repeating_hench5_$X_hench55bresave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55bretar}]] [@{henchname55} Save versus Breath]"><br>Breath<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench55spesave" title="%{repeating_hench5_$X_hench55spesave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55spetar}]] [@{henchname55} Save versus Spell]"><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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench55partar}]]}} {{color=orange}}"><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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench55poitar}]]}} {{color=orange}}"><br>Pois<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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench55deatar}]]}} {{color=orange}}"><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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench55rodtar}]]}} {{color=orange}}"><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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench55statar}]]}} {{color=orange}}"><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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench55wantar}]]}} {{color=orange}}"><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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench55pettar}]]}} {{color=orange}}"><br>Pet<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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench55poltar}]]}} {{color=orange}}"><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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench55bretar}]]}} {{color=orange}}"><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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench55spetar}]]}} {{color=orange}}"><br>Spell<br>Save</button></td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_hench55partar" title="@{repeating_hench5_$X_hench55partar}" class="sheet-small"></td>
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 390e554a65..6d81154099 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html
@@ -1566,32 +1566,7 @@
             <hr>
             insert_follower-weapons.html_(5,024,025,026)
             <hr>
-            <table class="sheet-centering" style="width: 100%;">
-                <tr>
-                    <td><button type="roll" name="roll_hench5parsave" title="%{hench5parsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5partar}]] [@{henchname5} Save versus Paralyzation]"><br>Para<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench5poisave" title="%{hench5poisave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5poitar}]] [@{henchname5} Save versus Poison]"><br>Pois<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench5deasave" title="%{hench5deasave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5deatar}]] [@{henchname5} Save versus Death]"><br>Death<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench5rodsave" title="%{hench5rodsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5rodtar}]] [@{henchname5} Save versus Rod]"><br>Rod<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench5stasave" title="%{hench5stasave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5statar}]] [@{henchname5} Save versus Staff]"><br>Staff<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench5wansave" title="%{hench5wansave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5wantar}]] [@{henchname5} Save versus Wand]"><br>Wand<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench5petsave" title="%{hench5petsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5pettar}]] [@{henchname5} Save versus Petrification]"><br>Pet<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench5polsave" title="%{hench5polsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5poltar}]] [@{henchname5} Save versus Polymorph]"><br>Poly<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench5bresave" title="%{hench5bresave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5bretar}]] [@{henchname5} Save versus Breath]"><br>Breath<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench5spesave" title="%{hench5spesave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench5spetar}]] [@{henchname5} Save versus Spell]"><br>Spell<br>Save</button></td>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_hench5partar" title="@{hench5partar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench5poitar" title="@{hench5poitar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench5deatar" title="@{hench5deatar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench5rodtar" title="@{hench5rodtar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench5statar" title="@{hench5statar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench5wantar" title="@{hench5wantar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench5pettar" title="@{hench5pettar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench5poltar" title="@{hench5poltar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench5bretar" title="@{hench5bretar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench5spetar" title="@{hench5spetar}" class="sheet-small"></td>
-                </tr>
-            </table>
+            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>
@@ -2810,32 +2785,7 @@
                 <hr>
                 insert_follower-weapons.html_(55,027,028,029,repeating_hench5_$X_)
                 <hr>
-                <table class="sheet-centering" style="width: 100%;">
-                    <tr>
-                        <td><button type="roll" name="roll_hench55parsave" title="%{repeating_hench5_$X_hench55parsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55partar}]] [@{henchname55} Save versus Paralyzation]"><br>Para<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench55poisave" title="%{repeating_hench5_$X_hench55poisave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55poitar}]] [@{henchname55} Save versus Poison]"><br>Pois<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench55deasave" title="%{repeating_hench5_$X_hench55deasave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55deatar}]] [@{henchname55} Save versus Death]"><br>Death<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench55rodsave" title="%{repeating_hench5_$X_hench55rodsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55rodtar}]] [@{henchname55} Save versus Rod]"><br>Rod<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench55stasave" title="%{repeating_hench5_$X_hench55stasave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55statar}]] [@{henchname55} Save versus Staff]"><br>Staff<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench55wansave" title="%{repeating_hench5_$X_hench55wansave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55wantar}]] [@{henchname55} Save versus Wand]"><br>Wand<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench55petsave" title="%{repeating_hench5_$X_hench55petsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55pettar}]] [@{henchname55} Save versus Petrification]"><br>Pet<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench55polsave" title="%{repeating_hench5_$X_hench55polsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55poltar}]] [@{henchname55} Save versus Polymorph]"><br>Poly<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench55bresave" title="%{repeating_hench5_$X_hench55bresave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55bretar}]] [@{henchname55} Save versus Breath]"><br>Breath<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench55spesave" title="%{repeating_hench5_$X_hench55spesave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench55spetar}]] [@{henchname55} Save versus Spell]"><br>Spell<br>Save</button></td>
-                    </tr>
-                    <tr>
-                        <td><input type="text" name="attr_hench55partar" title="@{repeating_hench5_$X_hench55partar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench55poitar" title="@{repeating_hench5_$X_hench55poitar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench55deatar" title="@{repeating_hench5_$X_hench55deatar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench55rodtar" title="@{repeating_hench5_$X_hench55rodtar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench55statar" title="@{repeating_hench5_$X_hench55statar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench55wantar" title="@{repeating_hench5_$X_hench55wantar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench55pettar" title="@{repeating_hench5_$X_hench55pettar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench55poltar" title="@{repeating_hench5_$X_hench55poltar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench55bretar" title="@{repeating_hench5_$X_hench55bretar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench55spetar" title="@{repeating_hench5_$X_hench55spetar}" class="sheet-small"></td>
-                    </tr>
-                </table>
+                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>