diff --git a/DnD_5e/DnD_5e.html b/DnD_5e/DnD_5e.html
index d1b572243c..3521422619 100644
--- a/DnD_5e/DnD_5e.html
+++ b/DnD_5e/DnD_5e.html
@@ -12075,7 +12075,7 @@
 					<div class="sheet-col-1-6"><input type="number" name="attr_npc_strength_mod" value="(floor((@{npc_strength}-10)/2))" disabled="disabled"/></div>
 					<div class="sheet-col-1-6"><input class="sheet-center" type="number" name="attr_npc_strength_save_bonus" value ="0" step="1"></div>
 					<div class="sheet-col-1-6"><input type="number" name="attr_npc_strength_save_mod" value="@{npc_strength_mod} + @{npc_strength_save_bonus}" disabled="disabled"></div>
-					<div class="sheet-col-1-6 sheet-center"><button type="roll" class="sheet-core-save" name="roll_NPC_Strength_Save" value="@{npc_output_option} STR save :[[1d20 + @{npc_strength_save_mod}]] | [[1d20 + @{npc_strength_save_mod}]]">Save</button></div>
+					<div class="sheet-col-1-6 sheet-center"><button type="roll" class="sheet-core-save" name="roll_NPC_Strength_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=STR saving throw}} {{subheader=@{character_name}}} {{rollname=STR save}} {{roll=[[ 1d20 + @{npc_strength_save_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_strength_save_mod}]]}}">Save</button></div>
 				</div>
 				
 				<div class="sheet-row">
@@ -12084,7 +12084,7 @@
 					<div class="sheet-col-1-6"><input type="number" name="attr_npc_dexterity_mod" value="(floor((@{npc_dexterity}-10)/2))" disabled="disabled"/></div>
 					<div class="sheet-col-1-6"><input class="sheet-center" type="number" name="attr_npc_dexterity_save_bonus" value ="0" step="1"></div>
 					<div class="sheet-col-1-6"><input type="number" name="attr_npc_dexterity_save_mod" value="@{npc_dexterity_mod} + @{npc_dexterity_save_bonus}" disabled="disabled"></div>
-					<div class="sheet-col-1-6 sheet-center"><button type="roll" class="sheet-core-save" name="roll_NPC_Dexterity_Save" value="@{npc_output_option} DEX save :[[1d20 + @{npc_dexterity_save_mod}]] | [[1d20 + @{npc_dexterity_save_mod}]]">Save</button></div>
+					<div class="sheet-col-1-6 sheet-center"><button type="roll" class="sheet-core-save" name="roll_NPC_Dexterity_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=DEX saving throw}} {{subheader=@{character_name}}} {{rollname=DEX save}} {{roll=[[ 1d20 + @{npc_dexterity_save_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_dexterity_save_mod}]]}}">Save</button></div>
 				</div>
 				
 				<div class="sheet-row">
@@ -12093,7 +12093,7 @@
 					<div class="sheet-col-1-6"><input type="number" name="attr_npc_constitution_mod" value="(floor((@{npc_constitution}-10)/2))" disabled="disabled"/></div>
 					<div class="sheet-col-1-6"><input class="sheet-center" type="number" name="attr_npc_constitution_save_bonus" value ="0" step="1"></div>
 					<div class="sheet-col-1-6"><input type="number" name="attr_npc_constitution_save_mod" value="@{npc_constitution_mod} + @{npc_constitution_save_bonus}" disabled="disabled"></div>
-					<div class="sheet-col-1-6 sheet-center"><button type="roll" class="sheet-core-save" name="roll_NPC_Constitution_Save" value="@{npc_output_option} CON save :[[1d20 + @{npc_constitution_save_mod}]] | [[1d20 + @{npc_constitution_save_mod}]]">Save</button></div>
+					<div class="sheet-col-1-6 sheet-center"><button type="roll" class="sheet-core-save" name="roll_NPC_Constitution_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=CON saving throw}} {{subheader=@{character_name}}} {{rollname=CON save}} {{roll=[[ 1d20 + @{npc_constitution_save_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_constitution_save_mod}]]}}">Save</button></div>
 				</div>
 				
 				<div class="sheet-row">
@@ -12102,7 +12102,7 @@
 					<div class="sheet-col-1-6"><input type="number" name="attr_npc_intelligence_mod" value="(floor((@{npc_intelligence}-10)/2))" disabled="disabled"/></div>
 					<div class="sheet-col-1-6"><input class="sheet-center" type="number" name="attr_npc_intelligence_save_bonus" value ="0" step="1"></div>
 					<div class="sheet-col-1-6"><input type="number" name="attr_npc_intelligence_save_mod" value="@{npc_intelligence_mod} + @{npc_intelligence_save_bonus}" disabled="disabled"></div>
-					<div class="sheet-col-1-6 sheet-center"><button type="roll" class="sheet-core-save" name="roll_NPC_Intelligence_Save" value="@{npc_output_option} INT save :[[1d20 + @{npc_intelligence_save_mod}]] | [[1d20 + @{npc_intelligence_save_mod}]]">Save</button></div>
+					<div class="sheet-col-1-6 sheet-center"><button type="roll" class="sheet-core-save" name="roll_NPC_Intelligence_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=INT saving throw}} {{subheader=@{character_name}}} {{rollname=INT save}} {{roll=[[ 1d20 + @{npc_intelligence_save_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_intelligence_save_mod}]]}}">Save</button></div>
 				</div>
 				
 				<div class="sheet-row">
@@ -12111,7 +12111,7 @@
 					<div class="sheet-col-1-6"><input type="number" name="attr_npc_wisdom_mod" value="(floor((@{npc_wisdom}-10)/2))" disabled="disabled"/></div>
 					<div class="sheet-col-1-6"><input class="sheet-center" type="number" name="attr_npc_wisdom_save_bonus" value ="0" step="1"></div>
 					<div class="sheet-col-1-6"><input type="number" name="attr_npc_wisdom_save_mod" value="@{npc_wisdom_mod} + @{npc_wisdom_save_bonus}" disabled="disabled"></div>
-					<div class="sheet-col-1-6 sheet-center"><button type="roll" class="sheet-core-save" name="roll_NPC_Wisdom_Save" value="@{npc_output_option} WIS save :[[1d20 + @{npc_wisdom_save_mod}]] | [[1d20 + @{npc_wisdom_save_mod}]]">Save</button></div>
+					<div class="sheet-col-1-6 sheet-center"><button type="roll" class="sheet-core-save" name="roll_NPC_Wisdom_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=WIS saving throw}} {{subheader=@{character_name}}} {{rollname=WIS save}} {{roll=[[ 1d20 + @{npc_wisdom_save_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_wisdom_save_mod}]]}}">Save</button></div>
 				</div>
 				
 				<div class="sheet-row sheet-padb">
@@ -12120,7 +12120,7 @@
 					<div class="sheet-col-1-6"><input type="number" name="attr_npc_charisma_mod" value="(floor((@{npc_charisma}-10)/2))" disabled="disabled"/></div>
 					<div class="sheet-col-1-6"><input class="sheet-center" type="number" name="attr_npc_charisma_save_bonus" value ="0" step="1"></div>
 					<div class="sheet-col-1-6"><input type="number" name="attr_npc_charisma_save_mod" value="@{npc_charisma_mod} + @{npc_charisma_save_bonus}" disabled="disabled"></div>
-					<div class="sheet-col-1-6 sheet-center"><button type="roll" class="sheet-core-save" name="roll_NPC_Charisma_Save" value="@{npc_output_option} CHA save :[[1d20 + @{npc_charisma_save_mod}]] | [[1d20 + @{npc_charisma_save_mod}]]">Save</button></div>
+					<div class="sheet-col-1-6 sheet-center"><button type="roll" class="sheet-core-save" name="roll_NPC_Charisma_Save" value="@{npc_output_option} &{template:5eDefault} {{character_name=@{character_name}}} {{save=1}} {{title=CHA saving throw}} {{subheader=@{character_name}}} {{rollname=CHA save}} {{roll=[[ 1d20 + @{npc_charisma_save_mod} ]]}} {{rolladv=[[ 1d20 + @{npc_charisma_save_mod}]]}}">Save</button></div>
 				</div>
 			
 			</div>