diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html
index 1c9461e7a2..67916e50f6 100644
--- a/ADnD_2E_Revised/2ESheet.html
+++ b/ADnD_2E_Revised/2ESheet.html
@@ -14105,16 +14105,16 @@
                 <hr>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
-                        <td><button type="roll" name="roll_henchparsave" title="%{henchparsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchpartar}]]}} {{color=orange}}"><br>Para<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchparsave" title="%{henchpoisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchpoitar}]]}} {{color=orange}}"><br>Pois<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchdeasave" title="%{henchdeasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchdeatar}]]}} {{color=orange}}"><br>Death<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchrodsave" title="%{henchrodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchrodtar}]]}} {{color=orange}}"><br>Rod<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchstasave" title="%{henchstasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchstatar}]]}} {{color=orange}}"><br>Staff<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchwansave" title="%{henchwansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchwantar}]]}} {{color=orange}}"><br>Wand<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchpetsave" title="%{henchpetsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchpettar}]]}} {{color=orange}}"><br>Pet<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchpolsave" title="%{henchpolsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchpoltar}]]}} {{color=orange}}"><br>Poly<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchbresave" title="%{henchbresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchbretar}]]}} {{color=orange}}"><br>Breath<br>Save</button></td>
-                        <td><button type="roll" name="roll_henchspesave" title="%{henchspesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchspetar}]]}} {{color=orange}}"><br>Spell<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchparsave" title="%{henchparsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchpartar}]]}}"><br>Para<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchparsave" title="%{henchpoisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchpoitar}]]}}"><br>Poison<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchdeasave" title="%{henchdeasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchdeatar}]]}}"><br>Death<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchrodsave" title="%{henchrodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchrodtar}]]}}"><br>Rod<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchstasave" title="%{henchstasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchstatar}]]}}"><br>Staff<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchwansave" title="%{henchwansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchwantar}]]}}"><br>Wand<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchpetsave" title="%{henchpetsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchpettar}]]}}"><br>Petri<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchpolsave" title="%{henchpolsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchpoltar}]]}}"><br>Poly<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchbresave" title="%{henchbresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchbretar}]]}}"><br>Breath<br>Save</button></td>
+                        <td><button type="roll" name="roll_henchspesave" title="%{henchspesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{henchspetar}]]}}"><br>Spell<br>Save</button></td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_henchpartar" title="@{henchpartar}" class="sheet-small"></td>
@@ -14310,16 +14310,16 @@
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
-                            <td><button type="roll" name="roll_hench1parsave" title="%{repeating_hench_$X_hench1parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1partar}]]}} {{color=orange}}"><br>Para<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1parsave" title="%{repeating_hench_$X_hench1poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1poitar}]]}} {{color=orange}}"><br>Pois<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1deasave" title="%{repeating_hench_$X_hench1deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1deatar}]]}} {{color=orange}}"><br>Death<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1rodsave" title="%{repeating_hench_$X_hench1rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1rodtar}]]}} {{color=orange}}"><br>Rod<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1stasave" title="%{repeating_hench_$X_hench1stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1statar}]]}} {{color=orange}}"><br>Staff<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1wansave" title="%{repeating_hench_$X_hench1wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1wantar}]]}} {{color=orange}}"><br>Wand<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1petsave" title="%{repeating_hench_$X_hench1petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1pettar}]]}} {{color=orange}}"><br>Pet<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1polsave" title="%{repeating_hench_$X_hench1polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1poltar}]]}} {{color=orange}}"><br>Poly<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1bresave" title="%{repeating_hench_$X_hench1bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1bretar}]]}} {{color=orange}}"><br>Breath<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench1spesave" title="%{repeating_hench_$X_hench1spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1spetar}]]}} {{color=orange}}"><br>Spell<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1parsave" title="%{repeating_hench_$X_hench1parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1partar}]]}}"><br>Para<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1parsave" title="%{repeating_hench_$X_hench1poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1poitar}]]}}"><br>Poison<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1deasave" title="%{repeating_hench_$X_hench1deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1deatar}]]}}"><br>Death<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1rodsave" title="%{repeating_hench_$X_hench1rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1rodtar}]]}}"><br>Rod<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1stasave" title="%{repeating_hench_$X_hench1stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1statar}]]}}"><br>Staff<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1wansave" title="%{repeating_hench_$X_hench1wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1wantar}]]}}"><br>Wand<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1petsave" title="%{repeating_hench_$X_hench1petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1pettar}]]}}"><br>Petri<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1polsave" title="%{repeating_hench_$X_hench1polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1poltar}]]}}"><br>Poly<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1bresave" title="%{repeating_hench_$X_hench1bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1bretar}]]}}"><br>Breath<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench1spesave" title="%{repeating_hench_$X_hench1spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname1}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench1spetar}]]}}"><br>Spell<br>Save</button></td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_hench1partar" title="@{repeating_hench_$X_hench1partar}" class="sheet-small"></td>
@@ -14514,16 +14514,16 @@
                 <hr>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
-                        <td><button type="roll" name="roll_hench2parsave" title="%{hench2parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2partar}]]}} {{color=orange}}"><br>Para<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2parsave" title="%{hench2poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2poitar}]]}} {{color=orange}}"><br>Pois<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2deasave" title="%{hench2deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2deatar}]]}} {{color=orange}}"><br>Death<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2rodsave" title="%{hench2rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2rodtar}]]}} {{color=orange}}"><br>Rod<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2stasave" title="%{hench2stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2statar}]]}} {{color=orange}}"><br>Staff<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2wansave" title="%{hench2wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2wantar}]]}} {{color=orange}}"><br>Wand<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2petsave" title="%{hench2petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2pettar}]]}} {{color=orange}}"><br>Pet<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2polsave" title="%{hench2polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2poltar}]]}} {{color=orange}}"><br>Poly<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2bresave" title="%{hench2bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2bretar}]]}} {{color=orange}}"><br>Breath<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench2spesave" title="%{hench2spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2spetar}]]}} {{color=orange}}"><br>Spell<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2parsave" title="%{hench2parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2partar}]]}}"><br>Para<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2parsave" title="%{hench2poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2poitar}]]}}"><br>Poison<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2deasave" title="%{hench2deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2deatar}]]}}"><br>Death<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2rodsave" title="%{hench2rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2rodtar}]]}}"><br>Rod<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2stasave" title="%{hench2stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2statar}]]}}"><br>Staff<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2wansave" title="%{hench2wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2wantar}]]}}"><br>Wand<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2petsave" title="%{hench2petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2pettar}]]}}"><br>Petri<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2polsave" title="%{hench2polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2poltar}]]}}"><br>Poly<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2bresave" title="%{hench2bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2bretar}]]}}"><br>Breath<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench2spesave" title="%{hench2spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname2}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench2spetar}]]}}"><br>Spell<br>Save</button></td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_hench2partar" title="@{hench2partar}" class="sheet-small"></td>
@@ -14872,16 +14872,16 @@
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
-                            <td><button type="roll" name="roll_hench22parsave" title="%{repeating_hench2_$X_hench22parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22partar}]]}} {{color=orange}}"><br>Para<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22parsave" title="%{repeating_hench2_$X_hench22poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22poitar}]]}} {{color=orange}}"><br>Pois<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22deasave" title="%{repeating_hench2_$X_hench22deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22deatar}]]}} {{color=orange}}"><br>Death<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22rodsave" title="%{repeating_hench2_$X_hench22rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22rodtar}]]}} {{color=orange}}"><br>Rod<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22stasave" title="%{repeating_hench2_$X_hench22stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22statar}]]}} {{color=orange}}"><br>Staff<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22wansave" title="%{repeating_hench2_$X_hench22wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22wantar}]]}} {{color=orange}}"><br>Wand<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22petsave" title="%{repeating_hench2_$X_hench22petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22pettar}]]}} {{color=orange}}"><br>Pet<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22polsave" title="%{repeating_hench2_$X_hench22polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22poltar}]]}} {{color=orange}}"><br>Poly<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22bresave" title="%{repeating_hench2_$X_hench22bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22bretar}]]}} {{color=orange}}"><br>Breath<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench22spesave" title="%{repeating_hench2_$X_hench22spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22spetar}]]}} {{color=orange}}"><br>Spell<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22parsave" title="%{repeating_hench2_$X_hench22parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22partar}]]}}"><br>Para<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22parsave" title="%{repeating_hench2_$X_hench22poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22poitar}]]}}"><br>Poison<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22deasave" title="%{repeating_hench2_$X_hench22deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22deatar}]]}}"><br>Death<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22rodsave" title="%{repeating_hench2_$X_hench22rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22rodtar}]]}}"><br>Rod<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22stasave" title="%{repeating_hench2_$X_hench22stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22statar}]]}}"><br>Staff<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22wansave" title="%{repeating_hench2_$X_hench22wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22wantar}]]}}"><br>Wand<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22petsave" title="%{repeating_hench2_$X_hench22petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22pettar}]]}}"><br>Petri<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22polsave" title="%{repeating_hench2_$X_hench22polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22poltar}]]}}"><br>Poly<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22bresave" title="%{repeating_hench2_$X_hench22bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22bretar}]]}}"><br>Breath<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench22spesave" title="%{repeating_hench2_$X_hench22spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname22}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench22spetar}]]}}"><br>Spell<br>Save</button></td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_hench22partar" title="@{repeating_hench2_$X_hench22partar}" class="sheet-small"></td>
@@ -15235,16 +15235,16 @@
                 <hr>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
-                        <td><button type="roll" name="roll_hench3parsave" title="%{hench3parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3partar}]]}} {{color=orange}}"><br>Para<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3parsave" title="%{hench3poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3poitar}]]}} {{color=orange}}"><br>Pois<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3deasave" title="%{hench3deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3deatar}]]}} {{color=orange}}"><br>Death<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3rodsave" title="%{hench3rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3rodtar}]]}} {{color=orange}}"><br>Rod<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3stasave" title="%{hench3stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3statar}]]}} {{color=orange}}"><br>Staff<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3wansave" title="%{hench3wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3wantar}]]}} {{color=orange}}"><br>Wand<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3petsave" title="%{hench3petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3pettar}]]}} {{color=orange}}"><br>Pet<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3polsave" title="%{hench3polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3poltar}]]}} {{color=orange}}"><br>Poly<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3bresave" title="%{hench3bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3bretar}]]}} {{color=orange}}"><br>Breath<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench3spesave" title="%{hench3spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3spetar}]]}} {{color=orange}}"><br>Spell<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3parsave" title="%{hench3parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3partar}]]}}"><br>Para<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3parsave" title="%{hench3poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3poitar}]]}}"><br>Poison<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3deasave" title="%{hench3deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3deatar}]]}}"><br>Death<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3rodsave" title="%{hench3rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3rodtar}]]}}"><br>Rod<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3stasave" title="%{hench3stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3statar}]]}}"><br>Staff<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3wansave" title="%{hench3wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3wantar}]]}}"><br>Wand<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3petsave" title="%{hench3petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3pettar}]]}}"><br>Petri<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3polsave" title="%{hench3polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3poltar}]]}}"><br>Poly<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3bresave" title="%{hench3bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3bretar}]]}}"><br>Breath<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench3spesave" title="%{hench3spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname3}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench3spetar}]]}}"><br>Spell<br>Save</button></td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_hench3partar" title="@{hench3partar}" class="sheet-small"></td>
@@ -15593,16 +15593,16 @@
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
-                            <td><button type="roll" name="roll_hench33parsave" title="%{repeating_hench3_$X_hench33parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33partar}]]}} {{color=orange}}"><br>Para<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33parsave" title="%{repeating_hench3_$X_hench33poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33poitar}]]}} {{color=orange}}"><br>Pois<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33deasave" title="%{repeating_hench3_$X_hench33deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33deatar}]]}} {{color=orange}}"><br>Death<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33rodsave" title="%{repeating_hench3_$X_hench33rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33rodtar}]]}} {{color=orange}}"><br>Rod<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33stasave" title="%{repeating_hench3_$X_hench33stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33statar}]]}} {{color=orange}}"><br>Staff<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33wansave" title="%{repeating_hench3_$X_hench33wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33wantar}]]}} {{color=orange}}"><br>Wand<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33petsave" title="%{repeating_hench3_$X_hench33petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33pettar}]]}} {{color=orange}}"><br>Pet<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33polsave" title="%{repeating_hench3_$X_hench33polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33poltar}]]}} {{color=orange}}"><br>Poly<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33bresave" title="%{repeating_hench3_$X_hench33bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33bretar}]]}} {{color=orange}}"><br>Breath<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench33spesave" title="%{repeating_hench3_$X_hench33spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33spetar}]]}} {{color=orange}}"><br>Spell<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33parsave" title="%{repeating_hench3_$X_hench33parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33partar}]]}}"><br>Para<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33parsave" title="%{repeating_hench3_$X_hench33poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33poitar}]]}}"><br>Poison<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33deasave" title="%{repeating_hench3_$X_hench33deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33deatar}]]}}"><br>Death<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33rodsave" title="%{repeating_hench3_$X_hench33rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33rodtar}]]}}"><br>Rod<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33stasave" title="%{repeating_hench3_$X_hench33stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33statar}]]}}"><br>Staff<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33wansave" title="%{repeating_hench3_$X_hench33wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33wantar}]]}}"><br>Wand<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33petsave" title="%{repeating_hench3_$X_hench33petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33pettar}]]}}"><br>Petri<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33polsave" title="%{repeating_hench3_$X_hench33polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33poltar}]]}}"><br>Poly<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33bresave" title="%{repeating_hench3_$X_hench33bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33bretar}]]}}"><br>Breath<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench33spesave" title="%{repeating_hench3_$X_hench33spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname33}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench33spetar}]]}}"><br>Spell<br>Save</button></td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_hench33partar" title="@{repeating_hench3_$X_hench33partar}" class="sheet-small"></td>
@@ -15956,16 +15956,16 @@
                 <hr>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
-                        <td><button type="roll" name="roll_hench4parsave" title="%{hench4parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4partar}]]}} {{color=orange}}"><br>Para<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4parsave" title="%{hench4poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4poitar}]]}} {{color=orange}}"><br>Pois<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4deasave" title="%{hench4deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4deatar}]]}} {{color=orange}}"><br>Death<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4rodsave" title="%{hench4rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4rodtar}]]}} {{color=orange}}"><br>Rod<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4stasave" title="%{hench4stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4statar}]]}} {{color=orange}}"><br>Staff<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4wansave" title="%{hench4wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4wantar}]]}} {{color=orange}}"><br>Wand<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4petsave" title="%{hench4petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4pettar}]]}} {{color=orange}}"><br>Pet<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4polsave" title="%{hench4polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4poltar}]]}} {{color=orange}}"><br>Poly<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4bresave" title="%{hench4bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4bretar}]]}} {{color=orange}}"><br>Breath<br>Save</button></td>
-                        <td><button type="roll" name="roll_hench4spesave" title="%{hench4spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4spetar}]]}} {{color=orange}}"><br>Spell<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4parsave" title="%{hench4parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4partar}]]}}"><br>Para<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4parsave" title="%{hench4poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4poitar}]]}}"><br>Poison<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4deasave" title="%{hench4deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4deatar}]]}}"><br>Death<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4rodsave" title="%{hench4rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4rodtar}]]}}"><br>Rod<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4stasave" title="%{hench4stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4statar}]]}}"><br>Staff<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4wansave" title="%{hench4wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4wantar}]]}}"><br>Wand<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4petsave" title="%{hench4petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4pettar}]]}}"><br>Petri<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4polsave" title="%{hench4polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4poltar}]]}}"><br>Poly<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4bresave" title="%{hench4bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4bretar}]]}}"><br>Breath<br>Save</button></td>
+                        <td><button type="roll" name="roll_hench4spesave" title="%{hench4spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname4}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench4spetar}]]}}"><br>Spell<br>Save</button></td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_hench4partar" title="@{hench4partar}" class="sheet-small"></td>
@@ -16407,16 +16407,16 @@
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
-                            <td><button type="roll" name="roll_hench44parsave" title="%{repeating_hench4_$X_hench44parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44partar}]]}} {{color=orange}}"><br>Para<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44parsave" title="%{repeating_hench4_$X_hench44poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44poitar}]]}} {{color=orange}}"><br>Pois<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44deasave" title="%{repeating_hench4_$X_hench44deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44deatar}]]}} {{color=orange}}"><br>Death<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44rodsave" title="%{repeating_hench4_$X_hench44rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44rodtar}]]}} {{color=orange}}"><br>Rod<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44stasave" title="%{repeating_hench4_$X_hench44stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44statar}]]}} {{color=orange}}"><br>Staff<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44wansave" title="%{repeating_hench4_$X_hench44wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44wantar}]]}} {{color=orange}}"><br>Wand<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44petsave" title="%{repeating_hench4_$X_hench44petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44pettar}]]}} {{color=orange}}"><br>Pet<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44polsave" title="%{repeating_hench4_$X_hench44polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44poltar}]]}} {{color=orange}}"><br>Poly<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44bresave" title="%{repeating_hench4_$X_hench44bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44bretar}]]}} {{color=orange}}"><br>Breath<br>Save</button></td>
-                            <td><button type="roll" name="roll_hench44spesave" title="%{repeating_hench4_$X_hench44spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44spetar}]]}} {{color=orange}}"><br>Spell<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44parsave" title="%{repeating_hench4_$X_hench44parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44partar}]]}}"><br>Para<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44parsave" title="%{repeating_hench4_$X_hench44poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44poitar}]]}}"><br>Poison<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44deasave" title="%{repeating_hench4_$X_hench44deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44deatar}]]}}"><br>Death<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44rodsave" title="%{repeating_hench4_$X_hench44rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44rodtar}]]}}"><br>Rod<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44stasave" title="%{repeating_hench4_$X_hench44stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44statar}]]}}"><br>Staff<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44wansave" title="%{repeating_hench4_$X_hench44wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44wantar}]]}}"><br>Wand<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44petsave" title="%{repeating_hench4_$X_hench44petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44pettar}]]}}"><br>Petri<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44polsave" title="%{repeating_hench4_$X_hench44polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44poltar}]]}}"><br>Poly<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44bresave" title="%{repeating_hench4_$X_hench44bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44bretar}]]}}"><br>Breath<br>Save</button></td>
+                            <td><button type="roll" name="roll_hench44spesave" title="%{repeating_hench4_$X_hench44spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{henchname44}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench44spetar}]]}}"><br>Spell<br>Save</button></td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_hench44partar" title="@{repeating_hench4_$X_hench44partar}" class="sheet-small"></td>
@@ -16863,16 +16863,16 @@
                 <hr>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
-                        <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>
+                        <td><button type="roll" name="roll_hench5parsave" title="%{hench5parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname5}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench5partar}]]}}"><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}]]}}"><br>Poison<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}]]}}"><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}]]}}"><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}]]}}"><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}]]}}"><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}]]}}"><br>Petri<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}]]}}"><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}]]}}"><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}]]}}"><br>Spell<br>Save</button></td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_hench5partar" title="@{hench5partar}" class="sheet-small"></td>
@@ -18170,16 +18170,16 @@
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
-                            <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>
+                            <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}]]}}"><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}]]}}"><br>Poison<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}]]}}"><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}]]}}"><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}]]}}"><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}]]}}"><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}]]}}"><br>Petri<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}]]}}"><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}]]}}"><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}]]}}"><br>Spell<br>Save</button></td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_hench55partar" title="@{repeating_hench5_$X_hench55partar}" class="sheet-small"></td>
@@ -19499,16 +19499,16 @@
                 <hr>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
-                        <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>
+                        <td><button type="roll" name="roll_hench6parsave" title="%{hench6parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{henchname6}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{hench6partar}]]}}"><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}]]}}"><br>Poison<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}]]}}"><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}]]}}"><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}]]}}"><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}]]}}"><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}]]}}"><br>Petri<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}]]}}"><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}]]}}"><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}]]}}"><br>Spell<br>Save</button></td>
                     </tr>
                     <tr>
                         <td><input type="text" name="attr_hench6partar" title="@{hench6partar}" class="sheet-small"></td>
@@ -20075,16 +20075,16 @@
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
-                            <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>
+                            <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}]]}}"><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}]]}}"><br>Poison<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}]]}}"><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}]]}}"><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}]]}}"><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}]]}}"><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}]]}}"><br>Petri<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}]]}}"><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}]]}}"><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}]]}}"><br>Spell<br>Save</button></td>
                         </tr>
                         <tr>
                             <td><input type="text" name="attr_hench66partar" title="@{repeating_hench6_$X_hench66partar}" class="sheet-small"></td>
@@ -21141,16 +21141,16 @@
 
         <table class="sheet-centering" style="width: 100%;">
             <tr>
-                <td><button type="roll" name="roll_monparsave" title="%{monparsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monpartar}]]}} {{color=orange}}"><br>Para<br>Save</button></td>
-                <td><button type="roll" name="roll_monparsave" title="%{monpoisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monpoitar}]]}} {{color=orange}}"><br>Pois<br>Save</button></td>
-                <td><button type="roll" name="roll_mondeasave" title="%{mondeasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{mondeatar}]]}} {{color=orange}}"><br>Death<br>Save</button></td>
-                <td><button type="roll" name="roll_monrodsave" title="%{monrodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monrodtar}]]}} {{color=orange}}"><br>Rod<br>Save</button></td>
-                <td><button type="roll" name="roll_monstasave" title="%{monstasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monstatar}]]}} {{color=orange}}"><br>Staff<br>Save</button></td>
-                <td><button type="roll" name="roll_monwansave" title="%{monwansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monwantar}]]}} {{color=orange}}"><br>Wand<br>Save</button></td>
-                <td><button type="roll" name="roll_monpetsave" title="%{monpetsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monpettar}]]}} {{color=orange}}"><br>Pet<br>Save</button></td>
-                <td><button type="roll" name="roll_monpolsave" title="%{monpolsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monpoltar}]]}} {{color=orange}}"><br>Poly<br>Save</button></td>
-                <td><button type="roll" name="roll_monbresave" title="%{monbresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monbretar}]]}} {{color=orange}}"><br>Breath<br>Save</button></td>
-                <td><button type="roll" name="roll_monspesave" title="%{monspesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monspetar}]]}} {{color=orange}}"><br>Spell<br>Save</button></td>
+                <td><button type="roll" name="roll_monparsave" title="%{monparsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monpartar}]]}}"><br>Para<br>Save</button></td>
+                <td><button type="roll" name="roll_monparsave" title="%{monpoisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monpoitar}]]}}"><br>Poison<br>Save</button></td>
+                <td><button type="roll" name="roll_mondeasave" title="%{mondeasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{mondeatar}]]}}"><br>Death<br>Save</button></td>
+                <td><button type="roll" name="roll_monrodsave" title="%{monrodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monrodtar}]]}}"><br>Rod<br>Save</button></td>
+                <td><button type="roll" name="roll_monstasave" title="%{monstasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monstatar}]]}}"><br>Staff<br>Save</button></td>
+                <td><button type="roll" name="roll_monwansave" title="%{monwansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monwantar}]]}}"><br>Wand<br>Save</button></td>
+                <td><button type="roll" name="roll_monpetsave" title="%{monpetsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monpettar}]]}}"><br>Petri<br>Save</button></td>
+                <td><button type="roll" name="roll_monpolsave" title="%{monpolsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monpoltar}]]}}"><br>Poly<br>Save</button></td>
+                <td><button type="roll" name="roll_monbresave" title="%{monbresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monbretar}]]}}"><br>Breath<br>Save</button></td>
+                <td><button type="roll" name="roll_monspesave" title="%{monspesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{monspetar}]]}}"><br>Spell<br>Save</button></td>
             </tr>
             <tr>
                 <td><input type="text" name="attr_monpartar" title="@{monpartar}" class="sheet-small"></td>
diff --git a/ADnD_2E_Revised/html/shared/saving-throws.html b/ADnD_2E_Revised/html/shared/saving-throws.html
index 7f88cf4f41..f30bc58433 100644
--- a/ADnD_2E_Revised/html/shared/saving-throws.html
+++ b/ADnD_2E_Revised/html/shared/saving-throws.html
@@ -1,15 +1,15 @@
 <table class="sheet-centering" style="width: 100%;">
     <tr>
-        <td><button type="roll" name="roll_#REPLACE0#parsave" title="%{#REPLACE2##REPLACE0#parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#partar}]]}} {{color=orange}}"><br>Para<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#parsave" title="%{#REPLACE2##REPLACE0#poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#poitar}]]}} {{color=orange}}"><br>Pois<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#deasave" title="%{#REPLACE2##REPLACE0#deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#deatar}]]}} {{color=orange}}"><br>Death<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#rodsave" title="%{#REPLACE2##REPLACE0#rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#rodtar}]]}} {{color=orange}}"><br>Rod<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#stasave" title="%{#REPLACE2##REPLACE0#stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#statar}]]}} {{color=orange}}"><br>Staff<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#wansave" title="%{#REPLACE2##REPLACE0#wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#wantar}]]}} {{color=orange}}"><br>Wand<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#petsave" title="%{#REPLACE2##REPLACE0#petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#pettar}]]}} {{color=orange}}"><br>Pet<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#polsave" title="%{#REPLACE2##REPLACE0#polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#poltar}]]}} {{color=orange}}"><br>Poly<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#bresave" title="%{#REPLACE2##REPLACE0#bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#bretar}]]}} {{color=orange}}"><br>Breath<br>Save</button></td>
-        <td><button type="roll" name="roll_#REPLACE0#spesave" title="%{#REPLACE2##REPLACE0#spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#spetar}]]}} {{color=orange}}"><br>Spell<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#parsave" title="%{#REPLACE2##REPLACE0#parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#partar}]]}}"><br>Para<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#parsave" title="%{#REPLACE2##REPLACE0#poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#poitar}]]}}"><br>Poison<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#deasave" title="%{#REPLACE2##REPLACE0#deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#deatar}]]}}"><br>Death<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#rodsave" title="%{#REPLACE2##REPLACE0#rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#rodtar}]]}}"><br>Rod<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#stasave" title="%{#REPLACE2##REPLACE0#stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#statar}]]}}"><br>Staff<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#wansave" title="%{#REPLACE2##REPLACE0#wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#wantar}]]}}"><br>Wand<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#petsave" title="%{#REPLACE2##REPLACE0#petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#pettar}]]}}"><br>Petri<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#polsave" title="%{#REPLACE2##REPLACE0#polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#poltar}]]}}"><br>Poly<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#bresave" title="%{#REPLACE2##REPLACE0#bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#bretar}]]}}"><br>Breath<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#spesave" title="%{#REPLACE2##REPLACE0#spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=#REPLACE1#}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#spetar}]]}}"><br>Spell<br>Save</button></td>
     </tr>
     <tr>
         <td><input type="text" name="attr_#REPLACE0#partar" title="@{#REPLACE2##REPLACE0#partar}" class="sheet-small"></td>