diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html
index 7d8be37b11..5f096eaefc 100644
--- a/ADnD_2E_Revised/2ESheet.html
+++ b/ADnD_2E_Revised/2ESheet.html
@@ -16664,16 +16664,16 @@
                 <hr>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
-                        <td><button type="roll" name="roll_hench6parsave" title="%{hench6parsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6partar}]] [@{henchname6} Save versus Paralyzation]"><br>Para<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6poisave" title="%{hench6poisave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6poitar}]] [@{henchname6} Save versus Poison]"><br>Pois<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6deasave" title="%{hench6deasave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6deatar}]] [@{henchname6} Save versus Death]"><br>Death<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6rodsave" title="%{hench6rodsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6rodtar}]] [@{henchname6} Save versus Rod]"><br>Rod<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6stasave" title="%{hench6stasave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6statar}]] [@{henchname6} Save versus Staff]"><br>Staff<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6wansave" title="%{hench6wansave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6wantar}]] [@{henchname6} Save versus Wand]"><br>Wand<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6petsave" title="%{hench6petsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6pettar}]] [@{henchname6} Save versus Petrification]"><br>Pet<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6polsave" title="%{hench6polsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6poltar}]] [@{henchname6} Save versus Polymorph]"><br>Poly<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6bresave" title="%{hench6bresave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6bretar}]] [@{henchname6} Save versus Breath]"><br>Breath<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench6spesave" title="%{hench6spesave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6spetar}]] [@{henchname6} Save versus Spell]"><br>Spell<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6parsave" title="%{hench6parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname6}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench6partar}]]}} {{color=orange}}"><br>Para<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6parsave" title="%{hench6poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname6}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench6poitar}]]}} {{color=orange}}"><br>Pois<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6deasave" title="%{hench6deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname6}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench6deatar}]]}} {{color=orange}}"><br>Death<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6rodsave" title="%{hench6rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname6}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench6rodtar}]]}} {{color=orange}}"><br>Rod<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6stasave" title="%{hench6stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname6}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench6statar}]]}} {{color=orange}}"><br>Staff<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6wansave" title="%{hench6wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname6}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench6wantar}]]}} {{color=orange}}"><br>Wand<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6petsave" title="%{hench6petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname6}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench6pettar}]]}} {{color=orange}}"><br>Pet<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6polsave" title="%{hench6polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname6}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench6poltar}]]}} {{color=orange}}"><br>Poly<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6bresave" title="%{hench6bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname6}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench6bretar}]]}} {{color=orange}}"><br>Breath<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench6spesave" title="%{hench6spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname6}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench6spetar}]]}} {{color=orange}}"><br>Spell<br>Save</button></td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_hench6partar" title="@{hench6partar}" class="sheet-small"></td>
@@ -17231,16 +17231,16 @@
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
-                            <td><button type="roll" name="roll_hench66parsave" title="%{repeating_hench6_$X_hench66parsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66partar}]] [@{henchname66} Save versus Paralyzation]"><br>Para<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66poisave" title="%{repeating_hench6_$X_hench66poisave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66poitar}]] [@{henchname66} Save versus Poison]"><br>Pois<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66deasave" title="%{repeating_hench6_$X_hench66deasave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66deatar}]] [@{henchname66} Save versus Death]"><br>Death<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66rodsave" title="%{repeating_hench6_$X_hench66rodsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66rodtar}]] [@{henchname66} Save versus Rod]"><br>Rod<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66stasave" title="%{repeating_hench6_$X_hench66stasave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66statar}]] [@{henchname66} Save versus Staff]"><br>Staff<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66wansave" title="%{repeating_hench6_$X_hench66wansave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66wantar}]] [@{henchname66} Save versus Wand]"><br>Wand<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66petsave" title="%{repeating_hench6_$X_hench66petsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66pettar}]] [@{henchname66} Save versus Petrification]"><br>Pet<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66polsave" title="%{repeating_hench6_$X_hench66polsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66poltar}]] [@{henchname66} Save versus Polymorph]"><br>Poly<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66bresave" title="%{repeating_hench6_$X_hench66bresave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66bretar}]] [@{henchname66} Save versus Breath]"><br>Breath<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench66spesave" title="%{repeating_hench6_$X_hench66spesave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66spetar}]] [@{henchname66} Save versus Spell]"><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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench66partar}]]}} {{color=orange}}"><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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench66poitar}]]}} {{color=orange}}"><br>Pois<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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench66deatar}]]}} {{color=orange}}"><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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench66rodtar}]]}} {{color=orange}}"><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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench66statar}]]}} {{color=orange}}"><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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench66wantar}]]}} {{color=orange}}"><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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench66pettar}]]}} {{color=orange}}"><br>Pet<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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench66poltar}]]}} {{color=orange}}"><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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench66bretar}]]}} {{color=orange}}"><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}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench66spetar}]]}} {{color=orange}}"><br>Spell<br>Save</button></td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_hench66partar" title="@{repeating_hench6_$X_hench66partar}" 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 a21c75b9f8..604c148f0a 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html
@@ -4026,32 +4026,7 @@
             <hr>
             insert_follower-weapons.html_(6,030,031,032)
             <hr>
-            <table class="sheet-centering" style="width: 100%;">
-                <tr>
-                    <td><button type="roll" name="roll_hench6parsave" title="%{hench6parsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6partar}]] [@{henchname6} Save versus Paralyzation]"><br>Para<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench6poisave" title="%{hench6poisave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6poitar}]] [@{henchname6} Save versus Poison]"><br>Pois<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench6deasave" title="%{hench6deasave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6deatar}]] [@{henchname6} Save versus Death]"><br>Death<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench6rodsave" title="%{hench6rodsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6rodtar}]] [@{henchname6} Save versus Rod]"><br>Rod<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench6stasave" title="%{hench6stasave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6statar}]] [@{henchname6} Save versus Staff]"><br>Staff<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench6wansave" title="%{hench6wansave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6wantar}]] [@{henchname6} Save versus Wand]"><br>Wand<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench6petsave" title="%{hench6petsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6pettar}]] [@{henchname6} Save versus Petrification]"><br>Pet<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench6polsave" title="%{hench6polsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6poltar}]] [@{henchname6} Save versus Polymorph]"><br>Poly<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench6bresave" title="%{hench6bresave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6bretar}]] [@{henchname6} Save versus Breath]"><br>Breath<br>Save</button></td>
-                    <td><button type="roll" name="roll_hench6spesave" title="%{hench6spesave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench6spetar}]] [@{henchname6} Save versus Spell]"><br>Spell<br>Save</button></td>
-                </tr>
-                <tr>
-                    <td><input type="text" name="attr_hench6partar" title="@{hench6partar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench6poitar" title="@{hench6poitar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench6deatar" title="@{hench6deatar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench6rodtar" title="@{hench6rodtar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench6statar" title="@{hench6statar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench6wantar" title="@{hench6wantar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench6pettar" title="@{hench6pettar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench6poltar" title="@{hench6poltar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench6bretar" title="@{hench6bretar}" class="sheet-small"></td>
-                    <td><input type="text" name="attr_hench6spetar" title="@{hench6spetar}" class="sheet-small"></td>
-                </tr>
-            </table>
+            insert_saving-throws.html_(hench6,@{henchname6})
             <hr>
             <details>
                 <summary><h4 style="display: initial;">Familiar Spells/Powers</h4></summary>
@@ -4251,32 +4226,7 @@
                 <hr>
                 insert_follower-weapons.html_(66,033,034,035,repeating_hench6_$X_)
                 <hr>
-                <table class="sheet-centering" style="width: 100%;">
-                    <tr>
-                        <td><button type="roll" name="roll_hench66parsave" title="%{repeating_hench6_$X_hench66parsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66partar}]] [@{henchname66} Save versus Paralyzation]"><br>Para<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench66poisave" title="%{repeating_hench6_$X_hench66poisave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66poitar}]] [@{henchname66} Save versus Poison]"><br>Pois<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench66deasave" title="%{repeating_hench6_$X_hench66deasave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66deatar}]] [@{henchname66} Save versus Death]"><br>Death<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench66rodsave" title="%{repeating_hench6_$X_hench66rodsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66rodtar}]] [@{henchname66} Save versus Rod]"><br>Rod<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench66stasave" title="%{repeating_hench6_$X_hench66stasave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66statar}]] [@{henchname66} Save versus Staff]"><br>Staff<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench66wansave" title="%{repeating_hench6_$X_hench66wansave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66wantar}]] [@{henchname66} Save versus Wand]"><br>Wand<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench66petsave" title="%{repeating_hench6_$X_hench66petsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66pettar}]] [@{henchname66} Save versus Petrification]"><br>Pet<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench66polsave" title="%{repeating_hench6_$X_hench66polsave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66poltar}]] [@{henchname66} Save versus Polymorph]"><br>Poly<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench66bresave" title="%{repeating_hench6_$X_hench66bresave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66bretar}]] [@{henchname66} Save versus Breath]"><br>Breath<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench66spesave" title="%{repeating_hench6_$X_hench66spesave}" value="/gmroll [[d20+(@{misc-mod})]] &GreaterEqual; [[@{hench66spetar}]] [@{henchname66} Save versus Spell]"><br>Spell<br>Save</button></td>
-                    </tr>
-                    <tr>
-                        <td><input type="text" name="attr_hench66partar" title="@{repeating_hench6_$X_hench66partar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench66poitar" title="@{repeating_hench6_$X_hench66poitar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench66deatar" title="@{repeating_hench6_$X_hench66deatar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench66rodtar" title="@{repeating_hench6_$X_hench66rodtar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench66statar" title="@{repeating_hench6_$X_hench66statar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench66wantar" title="@{repeating_hench6_$X_hench66wantar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench66pettar" title="@{repeating_hench6_$X_hench66pettar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench66poltar" title="@{repeating_hench6_$X_hench66poltar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench66bretar" title="@{repeating_hench6_$X_hench66bretar}" class="sheet-small"></td>
-                        <td><input type="text" name="attr_hench66spetar" title="@{repeating_hench6_$X_hench66spetar}" class="sheet-small"></td>
-                    </tr>
-                </table>
+                insert_saving-throws.html_(hench66,@{henchname66},repeating_hench6_$X_)
                 <hr>
                 <details>
                     <summary><h4 style="display: initial;">Familiar Spells/Powers</h4></summary>