diff --git a/5eShaped/precompiled/components/actionComponents/attack.html b/5eShaped/precompiled/components/actionComponents/attack.html
index a9605827d4..8c58dc8527 100644
--- a/5eShaped/precompiled/components/actionComponents/attack.html
+++ b/5eShaped/precompiled/components/actionComponents/attack.html
@@ -1,7 +1,7 @@
 <input type="hidden" name="attr_attack_formula">
 
 <div class="shaped-row vert-top mar-t-sm">
-  <input type="checkbox" name="attr_roll_toggle" value="{{vs_ac=1}} @{roll_info} {{roll1=[[@{shaped_d20}cs>@{crit_range} + @{attack_formula}]]}} @{roll_setting}@{d20_mod}cs>@{crit_range} + @{attack_formula}]]}} {{targetAC=@{attacks_vs_target_ac}}} {{targetName=@{attacks_vs_target_name}}}" class="attack-toggle" checked>
+  <input type="checkbox" name="attr_roll_toggle" value="{{vs_ac=1}} @{roll_info} {{roll1=[[@{shaped_d20}cs>@{crit_range} + @{attack_formula}]]}} @{roll_setting}cs>@{crit_range} + @{attack_formula}]]}} {{targetAC=@{attacks_vs_target_ac}}} {{targetName=@{attacks_vs_target_name}}}" class="attack-toggle" checked>
 
   <div class="bold italic mar-r-sm"><span data-i18n="ATTACK"></span>.</div>
   <div class="attack-toggle col-08 center pad-r-sm">
diff --git a/5eShaped/precompiled/components/actionComponents/attackSpell.html b/5eShaped/precompiled/components/actionComponents/attackSpell.html
index 19c7afcff6..24e475d88a 100644
--- a/5eShaped/precompiled/components/actionComponents/attackSpell.html
+++ b/5eShaped/precompiled/components/actionComponents/attackSpell.html
@@ -1,7 +1,7 @@
 <input type="hidden" name="attr_attack_formula">
 
 <div class="shaped-row vert-top mar-t-sm">
-  <input type="checkbox" name="attr_roll_toggle" value="{{vs_ac=1}} @{roll_info} {{roll1=[[@{shaped_d20}cs>@{crit_range} + @{attack_formula}]]}} @{roll_setting}@{d20_mod}cs>@{crit_range} + @{attack_formula}]]}} {{targetAC=@{attacks_vs_target_ac}}} {{targetName=@{attacks_vs_target_name}}}" class="attack-toggle">
+  <input type="checkbox" name="attr_roll_toggle" value="{{vs_ac=1}} @{roll_info} {{roll1=[[@{shaped_d20}cs>@{crit_range} + @{attack_formula}]]}} @{roll_setting}cs>@{crit_range} + @{attack_formula}]]}} {{targetAC=@{attacks_vs_target_ac}}} {{targetName=@{attacks_vs_target_name}}}" class="attack-toggle">
   <div class="bold italic mar-r-sm"><span data-i18n="ATTACK"></span>.</div>
   <div class="attack-toggle col-08 center pad-r-sm">
     <input type="checkbox" name="attr_proficiency" checked>
diff --git a/5eShaped/precompiled/components/core/abilities.html b/5eShaped/precompiled/components/core/abilities.html
index 4aa0757f6d..768d08fbdb 100644
--- a/5eShaped/precompiled/components/core/abilities.html
+++ b/5eShaped/precompiled/components/core/abilities.html
@@ -3,7 +3,7 @@
 <div class="ability-wrapper wrap-box center">
   <input type="hidden" name="attr_strength_check_mod_formula">
 
-  <button type="roll" name="roll_shaped_strength_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=STRENGTH>Strength</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{strength_check_mod_formula}]]}} @{roll_setting}@{d20_mod} + @{strength_check_mod_formula}]]}} @{attacher_strength_check}" tabindex="-1">
+  <button type="roll" name="roll_shaped_strength_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=STRENGTH>Strength</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{strength_check_mod_formula}]]}} @{roll_setting} + @{strength_check_mod_formula}]]}} @{attacher_strength_check}" tabindex="-1">
     <div>
       <span class="ability-name" data-i18n="STRENGTH"></span>
       <input type="hidden" name="attr_strength_mod">
@@ -35,7 +35,7 @@
 <div class="ability-wrapper wrap-box center">
   <input type="hidden" name="attr_dexterity_check_mod_formula">
 
-  <button type="roll" name="roll_shaped_dexterity_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=DEXTERITY>Dexterity</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{dexterity_check_mod_formula}]]}} @{roll_setting}@{d20_mod} + @{dexterity_check_mod_formula}]]}} @{attacher_dexterity_check}" tabindex="-1">
+  <button type="roll" name="roll_shaped_dexterity_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=DEXTERITY>Dexterity</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{dexterity_check_mod_formula}]]}} @{roll_setting} + @{dexterity_check_mod_formula}]]}} @{attacher_dexterity_check}" tabindex="-1">
     <div>
       <span class="ability-name" data-i18n="DEXTERITY"></span>
       <input type="hidden" name="attr_dexterity_mod">
@@ -67,7 +67,7 @@
 <div class="ability-wrapper wrap-box center">
   <input type="hidden" name="attr_constitution_check_mod_formula">
 
-  <button type="roll" name="roll_shaped_constitution_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=CONSTITUTION>Constitution</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{constitution_check_mod_formula}]]}} @{roll_setting}@{d20_mod} + @{constitution_check_mod_formula}]]}} @{attacher_constitution_check}" tabindex="-1">
+  <button type="roll" name="roll_shaped_constitution_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=CONSTITUTION>Constitution</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{constitution_check_mod_formula}]]}} @{roll_setting} + @{constitution_check_mod_formula}]]}} @{attacher_constitution_check}" tabindex="-1">
     <div>
       <span class="ability-name" data-i18n="CONSTITUTION"></span>
       <input type="hidden" name="attr_constitution_mod">
@@ -99,7 +99,7 @@
 <div class="ability-wrapper wrap-box center">
   <input type="hidden" name="attr_intelligence_check_mod_formula">
 
-  <button type="roll" name="roll_shaped_intelligence_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=INTELLIGENCE>Intelligence</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{intelligence_check_mod_formula}]]}} @{roll_setting}@{d20_mod} + @{intelligence_check_mod_formula}]]}} @{attacher_intelligence_check}" tabindex="-1">
+  <button type="roll" name="roll_shaped_intelligence_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=INTELLIGENCE>Intelligence</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{intelligence_check_mod_formula}]]}} @{roll_setting} + @{intelligence_check_mod_formula}]]}} @{attacher_intelligence_check}" tabindex="-1">
     <div>
       <span class="ability-name" data-i18n="INTELLIGENCE"></span>
       <input type="hidden" name="attr_intelligence_mod">
@@ -131,7 +131,7 @@
 <div class="ability-wrapper wrap-box center">
   <input type="hidden" name="attr_wisdom_check_mod_formula">
 
-  <button type="roll" name="roll_shaped_wisdom_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=WISDOM>Wisdom</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{wisdom_check_mod_formula}]]}} @{roll_setting}@{d20_mod} + @{wisdom_check_mod_formula}]]}} @{attacher_wisdom_check}" tabindex="-1">
+  <button type="roll" name="roll_shaped_wisdom_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=WISDOM>Wisdom</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{wisdom_check_mod_formula}]]}} @{roll_setting} + @{wisdom_check_mod_formula}]]}} @{attacher_wisdom_check}" tabindex="-1">
     <div>
       <span class="ability-name" data-i18n="WISDOM"></span>
       <input type="hidden" name="attr_wisdom_mod">
@@ -163,7 +163,7 @@
 <div class="ability-wrapper wrap-box center">
   <input type="hidden" name="attr_charisma_check_mod_formula">
 
-  <button type="roll" name="roll_shaped_charisma_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=CHARISMA>Charisma</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{charisma_check_mod_formula}]]}} @{roll_setting}@{d20_mod} + @{charisma_check_mod_formula}]]}} @{attacher_charisma_check}" tabindex="-1">
+  <button type="roll" name="roll_shaped_charisma_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=CHARISMA>Charisma</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{charisma_check_mod_formula}]]}} @{roll_setting} + @{charisma_check_mod_formula}]]}} @{attacher_charisma_check}" tabindex="-1">
     <div>
       <span class="ability-name" data-i18n="CHARISMA"></span>
       <input type="hidden" name="attr_charisma_mod">
diff --git a/5eShaped/precompiled/components/core/deathSaves.html b/5eShaped/precompiled/components/core/deathSaves.html
index 007428815f..cce568ec98 100644
--- a/5eShaped/precompiled/components/core/deathSaves.html
+++ b/5eShaped/precompiled/components/core/deathSaves.html
@@ -26,7 +26,7 @@
     </div>
   </div>
   <button type="roll" name="roll_shaped_death_saving_throw"
-          value="@{death_save_output_option} &{template:5e-shaped} {{death_saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} @{show_character_name} {{title=<span data-i18n=DEATH_SAVING_THROW>Death saving throw</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{death_saving_throw_prof}[proficient] + (@{global_saving_throw_bonus})[global saving throw bonus]]]}} @{roll_setting}@{d20_mod} + (@{global_saving_throw_bonus})[global saving throw bonus]]]}} {{death_saving_throw_successes=@{death_saving_throw_successes}}} {{death_saving_throw_failures=@{death_saving_throw_failures}}} @{attacher_death_saving_throw}">
+          value="@{death_save_output_option} &{template:5e-shaped} {{death_saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} @{show_character_name} {{title=<span data-i18n=DEATH_SAVING_THROW>Death saving throw</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{death_saving_throw_prof}[proficient] + (@{global_saving_throw_bonus})[global saving throw bonus]]]}} @{roll_setting} + (@{global_saving_throw_bonus})[global saving throw bonus]]]}} {{death_saving_throw_successes=@{death_saving_throw_successes}}} {{death_saving_throw_failures=@{death_saving_throw_failures}}} @{attacher_death_saving_throw}">
     <div class="wrap-box-title center" data-i18n="DEATH_SAVES"></div>
   </button>
 </div>
\ No newline at end of file
diff --git a/5eShaped/precompiled/components/core/savingThrows.html b/5eShaped/precompiled/components/core/savingThrows.html
index a05b6189d9..591f119d4f 100644
--- a/5eShaped/precompiled/components/core/savingThrows.html
+++ b/5eShaped/precompiled/components/core/savingThrows.html
@@ -7,7 +7,7 @@
       <input type="number" name="attr_strength_save_bonus" class="no-spin small-label" value="0" step="1">
     </div>
     <input type="hidden" name="attr_strength_saving_throw_mod">
-    <button type="roll" name="roll_shaped_strength_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=STRENGTH>Strength</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{strength_saving_throw_mod}]]}} @{roll_setting}@{d20_mod} + @{strength_saving_throw_mod}]]}} @{attacher_strength_saving_throw}" tabindex="-1">
+    <button type="roll" name="roll_shaped_strength_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=STRENGTH>Strength</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{strength_saving_throw_mod}]]}} @{roll_setting} + @{strength_saving_throw_mod}]]}} @{attacher_strength_saving_throw}" tabindex="-1">
       <span name="attr_strength_saving_throw_mod_with_sign" class="col-2-em input-like center bold border-bottom"></span>
       <span class="ability-saving-throw-name" data-i18n="STRENGTH"></span>
     </button>
@@ -20,7 +20,7 @@
       <input type="number" name="attr_dexterity_save_bonus" class="no-spin small-label" value="0" step="1">
     </div>
     <input type="hidden" name="attr_dexterity_saving_throw_mod">
-    <button type="roll" name="roll_shaped_dexterity_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=DEXTERITY>Dexterity</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{dexterity_saving_throw_mod}]]}} @{roll_setting}@{d20_mod} + @{dexterity_saving_throw_mod}]]}} @{attacher_dexterity_saving_throw}" tabindex="-1">
+    <button type="roll" name="roll_shaped_dexterity_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=DEXTERITY>Dexterity</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{dexterity_saving_throw_mod}]]}} @{roll_setting} + @{dexterity_saving_throw_mod}]]}} @{attacher_dexterity_saving_throw}" tabindex="-1">
       <span name="attr_dexterity_saving_throw_mod_with_sign" class="col-2-em input-like center bold border-bottom"></span>
       <span class="ability-saving-throw-name" data-i18n="DEXTERITY"></span>
     </button>
@@ -33,7 +33,7 @@
       <input type="number" name="attr_constitution_save_bonus" class="no-spin small-label" value="0" step="1">
     </div>
     <input type="hidden" name="attr_constitution_saving_throw_mod">
-    <button type="roll" name="roll_shaped_constitution_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=CONSTITUTION>Constitution</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{constitution_saving_throw_mod}]]}} @{roll_setting}@{d20_mod} + @{constitution_saving_throw_mod}]]}} @{attacher_constitution_saving_throw}" tabindex="-1">
+    <button type="roll" name="roll_shaped_constitution_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=CONSTITUTION>Constitution</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{constitution_saving_throw_mod}]]}} @{roll_setting} + @{constitution_saving_throw_mod}]]}} @{attacher_constitution_saving_throw}" tabindex="-1">
       <span name="attr_constitution_saving_throw_mod_with_sign" class="col-2-em input-like center bold border-bottom"></span>
       <span class="ability-saving-throw-name" data-i18n="CONSTITUTION"></span>
     </button>
@@ -46,7 +46,7 @@
       <input type="number" name="attr_intelligence_save_bonus" class="no-spin small-label" value="0" step="1">
     </div>
     <input type="hidden" name="attr_intelligence_saving_throw_mod">
-    <button type="roll" name="roll_shaped_intelligence_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=INTELLIGENCE>Intelligence</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{intelligence_saving_throw_mod}]]}} @{roll_setting}@{d20_mod} + @{intelligence_saving_throw_mod}]]}} @{attacher_intelligence_saving_throw}" tabindex="-1">
+    <button type="roll" name="roll_shaped_intelligence_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=INTELLIGENCE>Intelligence</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{intelligence_saving_throw_mod}]]}} @{roll_setting} + @{intelligence_saving_throw_mod}]]}} @{attacher_intelligence_saving_throw}" tabindex="-1">
       <span name="attr_intelligence_saving_throw_mod_with_sign" class="col-2-em input-like center bold border-bottom"></span>
       <span class="ability-saving-throw-name" data-i18n="INTELLIGENCE"></span>
     </button>
@@ -59,7 +59,7 @@
       <input type="number" name="attr_wisdom_save_bonus" class="no-spin small-label" value="0" step="1">
     </div>
     <input type="hidden" name="attr_wisdom_saving_throw_mod">
-    <button type="roll" name="roll_shaped_wisdom_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=WISDOM>Wisdom</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{wisdom_saving_throw_mod}]]}} @{roll_setting}@{d20_mod} + @{wisdom_saving_throw_mod}]]}} @{attacher_wisdom_saving_throw}" tabindex="-1">
+    <button type="roll" name="roll_shaped_wisdom_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=WISDOM>Wisdom</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{wisdom_saving_throw_mod}]]}} @{roll_setting} + @{wisdom_saving_throw_mod}]]}} @{attacher_wisdom_saving_throw}" tabindex="-1">
       <span name="attr_wisdom_saving_throw_mod_with_sign" class="col-2-em input-like center bold border-bottom"></span>
       <span class="ability-saving-throw-name" data-i18n="WISDOM"></span>
     </button>
@@ -72,7 +72,7 @@
       <input type="number" name="attr_charisma_save_bonus" class="no-spin small-label" value="0" step="1">
     </div>
     <input type="hidden" name="attr_charisma_saving_throw_mod">
-    <button type="roll" name="roll_shaped_charisma_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=CHARISMA>Charisma</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{charisma_saving_throw_mod}]]}} @{roll_setting}@{d20_mod} + @{charisma_saving_throw_mod}]]}} @{attacher_charisma_saving_throw}" tabindex="-1">
+    <button type="roll" name="roll_shaped_charisma_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=CHARISMA>Charisma</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{charisma_saving_throw_mod}]]}} @{roll_setting} + @{charisma_saving_throw_mod}]]}} @{attacher_charisma_saving_throw}" tabindex="-1">
       <span name="attr_charisma_saving_throw_mod_with_sign" class="col-2-em input-like center bold border-bottom"></span>
       <span class="ability-saving-throw-name" data-i18n="CHARISMA"></span>
     </button>
diff --git a/5eShaped/precompiled/components/macros/savingThrows.html b/5eShaped/precompiled/components/macros/savingThrows.html
index 235a7ef42c..a0190f789e 100644
--- a/5eShaped/precompiled/components/macros/savingThrows.html
+++ b/5eShaped/precompiled/components/macros/savingThrows.html
@@ -15,5 +15,5 @@
 <div class="mar-t-sm"></div>
 <button type="roll" name="roll_shaped_saving_throw_small" class="hidden" value="/w @{character_name} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=SAVING_THROWS>Saving throws</span>}} {{text=@{saving_throw_macro_var}}}" data-i18n="SAVING_THROWS"></button>
 <input type="hidden" name="attr_saving_throw_query_var"
-       value="?{Saving Throw|Strength, {{title=Strength&amp;#125;&amp;#125; {{roll1=[[@{shaped_d20} + @{strength_saving_throw_mod}]]&amp;#125;&amp;#125; @{roll_setting}@{d20_mod} + @{strength_saving_throw_mod}]]&amp;#125;&amp;#125;|Dexterity, {{title=Dexterity&amp;#125;&amp;#125; {{roll1=[[@{shaped_d20} + @{dexterity_saving_throw_mod}]]&amp;#125;&amp;#125; @{roll_setting}@{d20_mod} + @{dexterity_saving_throw_mod}]]&amp;#125;&amp;#125;|Constitution, {{title=Constitution&amp;#125;&amp;#125; {{roll1=[[@{shaped_d20} + @{constitution_saving_throw_mod}]]&amp;#125;&amp;#125; @{roll_setting}@{d20_mod} + @{constitution_saving_throw_mod}]]&amp;#125;&amp;#125;|Intelligence, {{title=Intelligence&amp;#125;&amp;#125; {{roll1=[[@{shaped_d20} + @{intelligence_saving_throw_mod}]]&amp;#125;&amp;#125; @{roll_setting}@{d20_mod} + @{intelligence_saving_throw_mod}]]&amp;#125;&amp;#125;|Wisdom, {{title=Wisdom&amp;#125;&amp;#125; {{roll1=[[@{shaped_d20} + @{wisdom_saving_throw_mod}]]&amp;#125;&amp;#125; @{roll_setting}@{d20_mod} + @{wisdom_saving_throw_mod}]]&amp;#125;&amp;#125;|Charisma, {{title=Charisma&amp;#125;&amp;#125; {{roll1=[[@{shaped_d20} + @{charisma_saving_throw_mod}]]&amp;#125;&amp;#125; @{roll_setting}@{d20_mod} + @{charisma_saving_throw_mod}]]&amp;#125;&amp;#125;}">
+       value="?{Saving Throw|Strength, {{title=Strength&amp;#125;&amp;#125; {{roll1=[[@{shaped_d20} + @{strength_saving_throw_mod}]]&amp;#125;&amp;#125; @{roll_setting} + @{strength_saving_throw_mod}]]&amp;#125;&amp;#125;|Dexterity, {{title=Dexterity&amp;#125;&amp;#125; {{roll1=[[@{shaped_d20} + @{dexterity_saving_throw_mod}]]&amp;#125;&amp;#125; @{roll_setting} + @{dexterity_saving_throw_mod}]]&amp;#125;&amp;#125;|Constitution, {{title=Constitution&amp;#125;&amp;#125; {{roll1=[[@{shaped_d20} + @{constitution_saving_throw_mod}]]&amp;#125;&amp;#125; @{roll_setting} + @{constitution_saving_throw_mod}]]&amp;#125;&amp;#125;|Intelligence, {{title=Intelligence&amp;#125;&amp;#125; {{roll1=[[@{shaped_d20} + @{intelligence_saving_throw_mod}]]&amp;#125;&amp;#125; @{roll_setting} + @{intelligence_saving_throw_mod}]]&amp;#125;&amp;#125;|Wisdom, {{title=Wisdom&amp;#125;&amp;#125; {{roll1=[[@{shaped_d20} + @{wisdom_saving_throw_mod}]]&amp;#125;&amp;#125; @{roll_setting} + @{wisdom_saving_throw_mod}]]&amp;#125;&amp;#125;|Charisma, {{title=Charisma&amp;#125;&amp;#125; {{roll1=[[@{shaped_d20} + @{charisma_saving_throw_mod}]]&amp;#125;&amp;#125; @{roll_setting} + @{charisma_saving_throw_mod}]]&amp;#125;&amp;#125;}">
 <button type="roll" name="roll_shaped_saving_throw_query" class="hidden" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} @{roll_info} @{saving_throw_query_var}" data-i18n="SAVING_THROWS_QUERY"></button>
\ No newline at end of file
diff --git a/5eShaped/precompiled/components/npc/abilities.html b/5eShaped/precompiled/components/npc/abilities.html
index 2e5c2b09ec..872f36bf56 100644
--- a/5eShaped/precompiled/components/npc/abilities.html
+++ b/5eShaped/precompiled/components/npc/abilities.html
@@ -1,6 +1,6 @@
 <div class="shaped-row">
   <div class="col-16 center pad-r-sm">
-    <button type="roll" name="roll_shaped_strength_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=STRENGTH>Strength</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{strength_check_mod}]]}} @{roll_setting}@{d20_mod} + @{strength_check_mod}]]}} @{attacher_strength_check}" tabindex="-1">
+    <button type="roll" name="roll_shaped_strength_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=STRENGTH>Strength</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{strength_check_mod}]]}} @{roll_setting} + @{strength_check_mod}]]}} @{attacher_strength_check}" tabindex="-1">
       <div class="heading uppercase center" data-i18n="STR"></div>
       <div class="presentation mar-t-sm">
         <span name="attr_strength" class="center"></span>
@@ -31,7 +31,7 @@
     </div>
   </div>
   <div class="col-16 center pad-l-sm pad-r-sm">
-    <button type="roll" name="roll_shaped_dexterity_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=DEXTERITY>Dexterity</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{dexterity_check_mod}]]}} @{roll_setting}@{d20_mod} + @{dexterity_check_mod}]]}} @{attacher_dexterity_check}" tabindex="-1">
+    <button type="roll" name="roll_shaped_dexterity_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=DEXTERITY>Dexterity</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{dexterity_check_mod}]]}} @{roll_setting} + @{dexterity_check_mod}]]}} @{attacher_dexterity_check}" tabindex="-1">
       <div class="heading uppercase center" data-i18n="DEX"></div>
       <div class="presentation mar-t-sm">
         <span name="attr_dexterity" class="center"></span>
@@ -62,7 +62,7 @@
     </div>
   </div>
   <div class="col-16 center pad-l-sm pad-r-sm">
-    <button type="roll" name="roll_shaped_constitution_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=CONSTITUTION>Constitution</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{constitution_check_mod}]]}} @{roll_setting}@{d20_mod} + @{constitution_check_mod}]]}} @{attacher_constitution_check}" tabindex="-1">
+    <button type="roll" name="roll_shaped_constitution_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=CONSTITUTION>Constitution</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{constitution_check_mod}]]}} @{roll_setting} + @{constitution_check_mod}]]}} @{attacher_constitution_check}" tabindex="-1">
       <div class="heading uppercase center" data-i18n="CON"></div>
       <div class="presentation mar-t-sm">
         <span name="attr_constitution" class="center"></span>
@@ -93,7 +93,7 @@
     </div>
   </div>
   <div class="col-16 center pad-l-sm pad-r-sm">
-    <button type="roll" name="roll_shaped_intelligence_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=INTELLIGENCE>Intelligence</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{intelligence_check_mod}]]}} @{roll_setting}@{d20_mod} + @{intelligence_check_mod}]]}} @{attacher_intelligence_check}" tabindex="-1">
+    <button type="roll" name="roll_shaped_intelligence_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=INTELLIGENCE>Intelligence</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{intelligence_check_mod}]]}} @{roll_setting} + @{intelligence_check_mod}]]}} @{attacher_intelligence_check}" tabindex="-1">
       <div class="heading uppercase center" data-i18n="INT"></div>
       <div class="presentation mar-t-sm">
         <span name="attr_intelligence" class="center"></span>
@@ -124,7 +124,7 @@
     </div>
   </div>
   <div class="col-16 center pad-l-sm pad-r-sm">
-    <button type="roll" name="roll_shaped_wisdom_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=WISDOM>Wisdom</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{wisdom_check_mod}]]}} @{roll_setting}@{d20_mod} + @{wisdom_check_mod}]]}} @{attacher_wisdom_check}" tabindex="-1">
+    <button type="roll" name="roll_shaped_wisdom_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=WISDOM>Wisdom</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{wisdom_check_mod}]]}} @{roll_setting} + @{wisdom_check_mod}]]}} @{attacher_wisdom_check}" tabindex="-1">
       <div class="heading uppercase center" data-i18n="WIS"></div>
       <div class="presentation mar-t-sm">
         <span name="attr_wisdom" class="center"></span>
@@ -155,7 +155,7 @@
     </div>
   </div>
   <div class="col-16 center pad-l-sm">
-    <button type="roll" name="roll_shaped_charisma_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=CHARISMA>Charisma</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{charisma_check_mod}]]}} @{roll_setting}@{d20_mod} + @{charisma_check_mod}]]}} @{attacher_charisma_check}" tabindex="-1">
+    <button type="roll" name="roll_shaped_charisma_check" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=CHARISMA>Charisma</span> <span data-i18n=CHECK class=lowercase>Check</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{charisma_check_mod}]]}} @{roll_setting} + @{charisma_check_mod}]]}} @{attacher_charisma_check}" tabindex="-1">
       <div class="heading uppercase center" data-i18n="CHA"></div>
       <div class="presentation mar-t-sm">
         <span name="attr_charisma" class="center"></span>
diff --git a/5eShaped/precompiled/components/npc/savingThrows.html b/5eShaped/precompiled/components/npc/savingThrows.html
index d1d0c6720a..aeb4692bb7 100644
--- a/5eShaped/precompiled/components/npc/savingThrows.html
+++ b/5eShaped/precompiled/components/npc/savingThrows.html
@@ -9,7 +9,7 @@
   <div class="col-1-3-em edit">
     <input type="number" name="attr_strength_save_bonus" class="no-spin small-label" value="0" step="1">
   </div>
-  <button type="roll" name="roll_shaped_strength_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=STRENGTH>Strength</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{strength_saving_throw_mod}]]}} @{roll_setting}@{d20_mod} + @{strength_saving_throw_mod}]]}} @{attacher_strength_saving_throw}" tabindex="-1">
+  <button type="roll" name="roll_shaped_strength_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=STRENGTH>Strength</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{strength_saving_throw_mod}]]}} @{roll_setting} + @{strength_saving_throw_mod}]]}} @{attacher_strength_saving_throw}" tabindex="-1">
     <span data-i18n="STR"></span>
     <span name="attr_strength_saving_throw_mod_with_sign" class="inline-block center"></span>
   </button>
@@ -20,7 +20,7 @@
   <div class="col-1-3-em edit">
     <input type="number" name="attr_dexterity_save_bonus" class="no-spin small-label" value="0" step="1">
   </div>
-  <button type="roll" name="roll_shaped_dexterity_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=DEXTERITY>Dexterity</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{dexterity_saving_throw_mod}]]}} @{roll_setting}@{d20_mod} + @{dexterity_saving_throw_mod}]]}} @{attacher_dexterity_saving_throw}" tabindex="-1">
+  <button type="roll" name="roll_shaped_dexterity_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=DEXTERITY>Dexterity</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{dexterity_saving_throw_mod}]]}} @{roll_setting} + @{dexterity_saving_throw_mod}]]}} @{attacher_dexterity_saving_throw}" tabindex="-1">
     <span data-i18n="DEX"></span>
     <span name="attr_dexterity_saving_throw_mod_with_sign" class="inline-block center"></span>
   </button>
@@ -31,7 +31,7 @@
   <div class="col-1-3-em edit">
     <input type="number" name="attr_constitution_save_bonus" class="no-spin small-label" value="0" step="1">
   </div>
-  <button type="roll" name="roll_shaped_constitution_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=CONSTITUTION>Constitution</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{constitution_saving_throw_mod}]]}} @{roll_setting}@{d20_mod} + @{constitution_saving_throw_mod}]]}} @{attacher_constitution_saving_throw}" tabindex="-1">
+  <button type="roll" name="roll_shaped_constitution_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=CONSTITUTION>Constitution</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{constitution_saving_throw_mod}]]}} @{roll_setting} + @{constitution_saving_throw_mod}]]}} @{attacher_constitution_saving_throw}" tabindex="-1">
     <span data-i18n="CON"></span>
     <span name="attr_constitution_saving_throw_mod_with_sign" class="inline-block center"></span>
   </button>
@@ -42,7 +42,7 @@
   <div class="col-1-3-em edit">
     <input type="number" name="attr_intelligence_save_bonus" class="no-spin small-label" value="0" step="1">
   </div>
-  <button type="roll" name="roll_shaped_intelligence_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=INTELLIGENCE>Intelligence</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{intelligence_saving_throw_mod}]]}} @{roll_setting}@{d20_mod} + @{intelligence_saving_throw_mod}]]}} @{attacher_intelligence_saving_throw}" tabindex="-1">
+  <button type="roll" name="roll_shaped_intelligence_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=INTELLIGENCE>Intelligence</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{intelligence_saving_throw_mod}]]}} @{roll_setting} + @{intelligence_saving_throw_mod}]]}} @{attacher_intelligence_saving_throw}" tabindex="-1">
     <span data-i18n="INT"></span>
     <span name="attr_intelligence_saving_throw_mod_with_sign" class="inline-block center"></span>
   </button>
@@ -53,7 +53,7 @@
   <div class="col-1-3-em edit">
     <input type="number" name="attr_wisdom_save_bonus" class="no-spin small-label" value="0" step="1">
   </div>
-  <button type="roll" name="roll_shaped_wisdom_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=WISDOM>Wisdom</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{wisdom_saving_throw_mod}]]}} @{roll_setting}@{d20_mod} + @{wisdom_saving_throw_mod}]]}} @{attacher_wisdom_saving_throw}" tabindex="-1">
+  <button type="roll" name="roll_shaped_wisdom_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=WISDOM>Wisdom</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{wisdom_saving_throw_mod}]]}} @{roll_setting} + @{wisdom_saving_throw_mod}]]}} @{attacher_wisdom_saving_throw}" tabindex="-1">
     <span data-i18n="WIS"></span>
     <span name="attr_wisdom_saving_throw_mod_with_sign" class="inline-block center"></span>
   </button>
@@ -64,7 +64,7 @@
   <div class="col-1-3-em edit">
     <input type="number" name="attr_charisma_save_bonus" class="no-spin small-label" value="0" step="1">
   </div>
-  <button type="roll" name="roll_shaped_charisma_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=CHARISMA>Charisma</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{charisma_saving_throw_mod}]]}} @{roll_setting}@{d20_mod} + @{charisma_saving_throw_mod}]]}} @{attacher_charisma_saving_throw}" tabindex="-1">
+  <button type="roll" name="roll_shaped_charisma_saving_throw" value="@{output_option} &{template:5e-shaped} {{saving_throw=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=<span data-i18n=CHARISMA>Charisma</span> <span data-i18n=SAVE class=lowercase>Save</span>}} @{roll_info} {{roll1=[[@{shaped_d20} + @{charisma_saving_throw_mod}]]}} @{roll_setting} + @{charisma_saving_throw_mod}]]}} @{attacher_charisma_saving_throw}" tabindex="-1">
     <span data-i18n="CHA"></span>
     <span name="attr_charisma_saving_throw_mod_with_sign" class="inline-block center"></span>
   </button>
diff --git a/5eShaped/precompiled/components/settings/settings.html b/5eShaped/precompiled/components/settings/settings.html
index fa18f1ec15..d4a0a8f454 100644
--- a/5eShaped/precompiled/components/settings/settings.html
+++ b/5eShaped/precompiled/components/settings/settings.html
@@ -63,7 +63,7 @@
     </div>
     <div  class="pad-l-md">
       <div class="center pad-l-sm">
-        <input type="radio" name="attr_roll_setting" class="toggle-roll-two" value="{{roll2=[[d20"><span class="toggle-roll-two button" data-i18n="ROLL_2"></span>
+        <input type="radio" name="attr_roll_setting" class="toggle-roll-two" value="{{roll2=[[d20@{d20_mod}"><span class="toggle-roll-two button" data-i18n="ROLL_2"></span>
         <div class="small-label" data-i18n="ROLL_OPTIONS"></div>
       </div>
     </div>