diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html
index f5e230110448..8abbf2daac02 100644
--- a/ADnD_2E_Revised/2ESheet.html
+++ b/ADnD_2E_Revised/2ESheet.html
@@ -776,7 +776,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_partar" title="@{partar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_parmod" title="@{parmod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_parnotes" title="@{parnotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_parsave" title="%{parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{parmod})+(@{misc-mod})]])-([[@{partar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_parsave" title="%{parsave}" value="/w gm &{template:2Esave} {{savevs=Paralyzation}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{parmod} [Modifier])+(@{misc-mod})]])-([[@{partar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -784,7 +784,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_poitar" title="@{poitar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_poimod" title="@{poimod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_poinotes" title="@{poinotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_poisave" title="%{poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{poimod})+(@{misc-mod})]])-([[@{poitar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_poisave" title="%{poisave}" value="/w gm &{template:2Esave} {{savevs=Poison}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{poimod} [Modifier])+(@{misc-mod})]])-([[@{poitar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -792,7 +792,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_deatar" title="@{deatar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_deamod" title="@{deamod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_deanotes" title="@{deanotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_deasave" title="%{deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{deamod})+(@{misc-mod})]])-([[@{deatar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_deasave" title="%{deasave}" value="/w gm &{template:2Esave} {{savevs=Death}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{deamod} [Modifier])+(@{misc-mod})]])-([[@{deatar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -800,7 +800,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_rodtar" title="@{rodtar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_rodmod" title="@{rodmod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_rodnotes" title="@{rodnotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_rodsave" title="%{rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{rodmod})+(@{misc-mod})]])-([[@{rodtar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_rodsave" title="%{rodsave}" value="/w gm &{template:2Esave} {{savevs=Rod}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{rodmod} [Modifier])+(@{misc-mod})]])-([[@{rodtar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -808,7 +808,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_statar" title="@{statar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_stamod" title="@{stamod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_stanotes" title="@{stanotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_stasave" title="%{stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{stamod})+(@{misc-mod})]])-([[@{statar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_stasave" title="%{stasave}" value="/w gm &{template:2Esave} {{savevs=Staff}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{stamod} [Modifier])+(@{misc-mod})]])-([[@{statar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -816,7 +816,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_wantar" title="@{wantar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_wanmod" title="@{wanmod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_wannotes" title="@{wannotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_wansave" title="%{wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{wanmod})+(@{misc-mod})]])-([[@{wantar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_wansave" title="%{wansave}" value="/w gm &{template:2Esave} {{savevs=Wand}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{wanmod} [Modifier])+(@{misc-mod})]])-([[@{wantar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -824,7 +824,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_pettar" title="@{pettar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_petmod" title="@{petmod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_petnotes" title="@{petnotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_petsave" title="%{petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{petmod})+(@{misc-mod})]])-([[@{pettar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_petsave" title="%{petsave}" value="/w gm &{template:2Esave} {{savevs=Petrification}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{petmod} [Modifier])+(@{misc-mod})]])-([[@{pettar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -832,7 +832,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_poltar" title="@{poltar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_polmod" title="@{polmod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_polnotes" title="@{polnotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_polsave" title="%{polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{polmod})+(@{misc-mod})]])-([[@{poltar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_polsave" title="%{polsave}" value="/w gm &{template:2Esave} {{savevs=Polymorph}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{polmod} [Modifier])+(@{misc-mod})]])-([[@{poltar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -840,7 +840,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_breathtar" title="@{breathtar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_breathmod" title="@{breathmod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_breathnotes" title="@{breathnotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_breathsave" title="%{breathsave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{breathmod})+(@{misc-mod})]])-([[@{breathtar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_breathsave" title="%{breathsave}" value="/w gm &{template:2Esave} {{savevs=Breath}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{breathmod} [Modifier])+(@{misc-mod})]])-([[@{breathtar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                             <tr>
@@ -848,7 +848,7 @@ <h4>Saving Throws</h4>
                                 <td><input type="text" name="attr_sptar" title="@{sptar}" class="sheet-short" placeholder="Target"/></td>
                                 <td><input type="text" name="attr_spmod" title="@{spmod}" class="sheet-table-dynamic" value="0"/></td>
                                 <td><input type="text" name="attr_spnotes" title="@{spnotes}" placeholder="Situational Modifiers"/>
-                                    <button type="roll" name="roll_spsave" title="%{spsave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{spmod})+(@{misc-mod})]])-([[@{sptar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                    <button type="roll" name="roll_spsave" title="%{spsave}" value="/w gm &{template:2Esave} {{savevs=Spell}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{spmod} [Modifier])+(@{misc-mod})]])-([[@{sptar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                 </td>
                             </tr>
                         </table>
@@ -865,7 +865,7 @@ <h4>Saving Throws</h4>
                                     <td><input type="text" name="attr_ftar" title="@{ftar}" class="sheet-short" placeholder="Target"/></td>
                                     <td><input type="text" name="attr_fmod" title="@{fmod}" class="sheet-table-dynamic" value="0"/></td>
                                     <td><input type="text" name="attr_fnotes" title="@{fnotes}" placeholder="Situational Modifiers"/>
-                                        <button type="roll" name="roll_fsave" title="%{fsave}" value="/w gm &{template:2Esave} {{savevs=Fear}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{fmod})+(@{misc-mod})]])-([[@{ftar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                        <button type="roll" name="roll_fsave" title="%{fsave}" value="/w gm &{template:2Esave} {{savevs=Fear}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{fmod} [Modifier])+(@{misc-mod})]])-([[@{ftar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                     </td>
                                 </tr>
                                 <tr>
@@ -873,7 +873,7 @@ <h4>Saving Throws</h4>
                                     <td><input type="text" name="attr_horrtar" title="@{horrtar}" class="sheet-short" placeholder="Target"/></td>
                                     <td><input type="text" name="attr_horrmod" title="@{horrmod}" class="sheet-table-dynamic" value="0"/></td>
                                     <td><input type="text" name="attr_horrnotes" title="@{horrnotes}" placeholder="Situational Modifiers"/>
-                                        <button type="roll" name="roll_horrsave" title="%{horrsave}" value="/w gm &{template:2Esave} {{savevs=Horror}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{horrmod})+(@{misc-mod})]])-([[@{horrtar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                        <button type="roll" name="roll_horrsave" title="%{horrsave}" value="/w gm &{template:2Esave} {{savevs=Horror}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{horrmod} [Modifier])+(@{misc-mod})]])-([[@{horrtar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                     </td>
                                 </tr>
                                 <tr>
@@ -881,7 +881,7 @@ <h4>Saving Throws</h4>
                                     <td><input type="text" name="attr_madtar" title="@{madtar}" class="sheet-short" placeholder="Target"/></td>
                                     <td><input type="text" name="attr_madmod" title="@{madmod}" class="sheet-table-dynamic" value="0"/></td>
                                     <td><input type="text" name="attr_madnotes" title="@{madnotes}" placeholder="Situational Modifiers"/>
-                                        <button type="roll" name="roll_madsave" title="%{madsave}" value="/w gm &{template:2Esave} {{savevs=Madness}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{madmod})+(@{misc-mod})]])-([[@{madtar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
+                                        <button type="roll" name="roll_madsave" title="%{madsave}" value="/w gm &{template:2Esave} {{savevs=Madness}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{madmod} [Modifier])+(@{misc-mod})]])-([[@{madtar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
                                     </td>
                                 </tr>
                             </table>
@@ -902,7 +902,7 @@ <h4>Magic Resistance</h4>
                                     <td><input type="text" name="attr_magrestar" title="@{repeating_magicres_$X_magrestar}" class="sheet-short" placeholder="Target"/></td>
                                     <td><input type="text" name="attr_magresmod" title="@{repeating_magicres_$X_magresmod}" class="sheet-table-dynamic" value="0"/></td>
                                     <td><input type="text" name="attr_magresnotes" title="@{repeating_magicres_$X_magresnotes}" placeholder="Situational Modifiers"/></td>
-                                    <td><button type="roll" name="roll_magressave" title="%{repeating_magicres_$X_magressave}" value="/w gm &{template:2Echeck} {{checkvs=Save with @{magresname}}} {{character=@{character_name}}} {{checkroll=[[1d100cs1cf100-(@{magresmod})-(@{misc-mod})]]%}} {{checktarget=[[@{magrestar}]]%}} {{color=orange}}"></button></td>
+                                    <td><button type="roll" name="roll_magressave" title="%{repeating_magicres_$X_magressave}" value="/w gm &{template:2Echeck} {{checkvs=Save with @{magresname}}} {{character=@{character_name}}} {{checkroll=[[1d100cs1cf100-(@{magresmod} [Modifier])-(@{misc-mod})]]%}} {{checktarget=[[@{magrestar}]]%}} {{color=orange}}"></button></td>
                                 </tr>
                             </table>
                         </fieldset>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker-tab.html
index b98ebb06d661..facd71c8a916 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker-tab.html
@@ -628,7 +628,7 @@ <h4>Magic Resistance</h4>
                             <td><input type="text" name="attr_magrestar" title="@{repeating_magicres_$X_magrestar}" class="sheet-short" placeholder="Target"/></td>
                             <td><input type="text" name="attr_magresmod" title="@{repeating_magicres_$X_magresmod}" class="sheet-table-dynamic" value="0"/></td>
                             <td><input type="text" name="attr_magresnotes" title="@{repeating_magicres_$X_magresnotes}" placeholder="Situational Modifiers"/></td>
-                            <td><button type="roll" name="roll_magressave" title="%{repeating_magicres_$X_magressave}" value="/w gm &{template:2Echeck} {{checkvs=Save with @{magresname}}} {{character=@{character_name}}} {{checkroll=[[1d100cs1cf100-(@{magresmod})-(@{misc-mod})]]%}} {{checktarget=[[@{magrestar}]]%}} {{color=orange}}"></button></td>
+                            <td><button type="roll" name="roll_magressave" title="%{repeating_magicres_$X_magressave}" value="/w gm &{template:2Echeck} {{checkvs=Save with @{magresname}}} {{character=@{character_name}}} {{checkroll=[[1d100cs1cf100-(@{magresmod} [Modifier])-(@{misc-mod})]]%}} {{checktarget=[[@{magrestar}]]%}} {{color=orange}}"></button></td>
                         </tr>
                     </table>
                 </fieldset>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker-tab/saving-throw-button.html b/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker-tab/saving-throw-button.html
index 8cc3a10ee97a..51788254b8d8 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker-tab/saving-throw-button.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker-tab/saving-throw-button.html
@@ -1 +1 @@
-<button type="roll" name="roll_#REPLACE0#save" title="%{#REPLACE0#save}" value="/w gm &{template:2Esave} {{savevs=#REPLACE1#}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{#REPLACE0#mod})+(@{misc-mod})]])-([[@{#REPLACE0#tar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
\ No newline at end of file
+<button type="roll" name="roll_#REPLACE0#save" title="%{#REPLACE0#save}" value="/w gm &{template:2Esave} {{savevs=#REPLACE1#}} {{character=@{character_name}}} {{success=You made your check by [[ abs( ([[1d20+(@{#REPLACE0#mod} [Modifier])+(@{misc-mod})]])-([[@{#REPLACE0#tar}]]) ) ]]}} {{fail=You missed your check by $[[2]]}} {{fumble=You missed your check against all odds}} {{saveroll=$[[0]]}} {{savetarget=$[[1]]}}"></button>
\ No newline at end of file