diff --git a/ADnD_2E_Revised/html/shared/saving-throws.html b/ADnD_2E_Revised/html/shared/saving-throws.html
index e7f2b65279..b57a874e03 100644
--- a/ADnD_2E_Revised/html/shared/saving-throws.html
+++ b/ADnD_2E_Revised/html/shared/saving-throws.html
@@ -1,26 +1,26 @@
 <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_#REPLACE0#parsave" title="%{#REPLACE0#parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#partar}]]}} {{color=orange}}"><br>Para<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#parsave" title="%{#REPLACE0#poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#poitar}]]}} {{color=orange}}"><br>Pois<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#deasave" title="%{#REPLACE0#deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#deatar}]]}} {{color=orange}}"><br>Death<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#rodsave" title="%{#REPLACE0#rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#rodtar}]]}} {{color=orange}}"><br>Rod<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#stasave" title="%{#REPLACE0#stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#statar}]]}} {{color=orange}}"><br>Staff<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#wansave" title="%{#REPLACE0#wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#wantar}]]}} {{color=orange}}"><br>Wand<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#petsave" title="%{#REPLACE0#petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#pettar}]]}} {{color=orange}}"><br>Pet<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#polsave" title="%{#REPLACE0#polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#poltar}]]}} {{color=orange}}"><br>Poly<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#bresave" title="%{#REPLACE0#bresave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#bretar}]]}} {{color=orange}}"><br>Breath<br>Save</button></td>
+        <td><button type="roll" name="roll_#REPLACE0#spesave" title="%{#REPLACE0#spesave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{character_name}}} {{saveroll=[[1d20+(@{misc-mod})]]}} {{savetarget=[[@{#REPLACE0#spetar}]]}} {{color=orange}}"><br>Spell<br>Save</button></td>
     </tr>
     <tr>
-        <td><input type="text" name="attr_monpartar" title="@{monpartar}" class="sheet-small"></td>
-        <td><input type="text" name="attr_monpoitar" title="@{monpoitar}" class="sheet-small"></td>
-        <td><input type="text" name="attr_mondeatar" title="@{mondeatar}" class="sheet-small"></td>
-        <td><input type="text" name="attr_monrodtar" title="@{monrodtar}" class="sheet-small"></td>
-        <td><input type="text" name="attr_monstatar" title="@{monstatar}" class="sheet-small"></td>
-        <td><input type="text" name="attr_monwantar" title="@{monwantar}" class="sheet-small"></td>
-        <td><input type="text" name="attr_monpettar" title="@{monpettar}" class="sheet-small"></td>
-        <td><input type="text" name="attr_monpoltar" title="@{monpoltar}" class="sheet-small"></td>
-        <td><input type="text" name="attr_monbretar" title="@{monbretar}" class="sheet-small"></td>
-        <td><input type="text" name="attr_monspetar" title="@{monspetar}" class="sheet-small"></td>
+        <td><input type="text" name="attr_#REPLACE0#partar" title="@{#REPLACE0#partar}" class="sheet-small"></td>
+        <td><input type="text" name="attr_#REPLACE0#poitar" title="@{#REPLACE0#poitar}" class="sheet-small"></td>
+        <td><input type="text" name="attr_#REPLACE0#deatar" title="@{#REPLACE0#deatar}" class="sheet-small"></td>
+        <td><input type="text" name="attr_#REPLACE0#rodtar" title="@{#REPLACE0#rodtar}" class="sheet-small"></td>
+        <td><input type="text" name="attr_#REPLACE0#statar" title="@{#REPLACE0#statar}" class="sheet-small"></td>
+        <td><input type="text" name="attr_#REPLACE0#wantar" title="@{#REPLACE0#wantar}" class="sheet-small"></td>
+        <td><input type="text" name="attr_#REPLACE0#pettar" title="@{#REPLACE0#pettar}" class="sheet-small"></td>
+        <td><input type="text" name="attr_#REPLACE0#poltar" title="@{#REPLACE0#poltar}" class="sheet-small"></td>
+        <td><input type="text" name="attr_#REPLACE0#bretar" title="@{#REPLACE0#bretar}" class="sheet-small"></td>
+        <td><input type="text" name="attr_#REPLACE0#spetar" title="@{#REPLACE0#spetar}" class="sheet-small"></td>
     </tr>
 </table>
\ No newline at end of file
diff --git a/ADnD_2E_Revised/html/tabs/monster-tab.html b/ADnD_2E_Revised/html/tabs/monster-tab.html
index 4434abf55b..6583ee41c2 100644
--- a/ADnD_2E_Revised/html/tabs/monster-tab.html
+++ b/ADnD_2E_Revised/html/tabs/monster-tab.html
@@ -210,7 +210,7 @@
         </details>
         <br>
 
-        insert_saving-throws.html_()
+        insert_saving-throws.html_(mon)
         <br>
         <h4>Description</h4>
         <textarea name="attr_monsterdesc" title="@{monsterdesc}" placeholder="Description"></textarea>