diff --git a/GURPS/gurps.css b/GURPS/gurps.css
index d99ac7c3123..6515f87272d 100644
--- a/GURPS/gurps.css
+++ b/GURPS/gurps.css
@@ -522,6 +522,10 @@ input[name="attr_announcements_hide"][value="1"] ~ .sheet-update-alert {
     height: 24px;
 }
 
+.sheet-table-generic-notes .sheet-cell.sheet-full-width {
+    width: 100%;
+}
+
 input.sheet-hidden-generic-notes-toggle ~ div.sheet-wrapper-generic-textarea-notes {
     display: none !important;
 }
@@ -534,8 +538,15 @@ input.sheet-hidden-generic-notes-toggle[value="1"] ~ div.sheet-wrapper-generic-t
     padding-bottom: 3px;
 }
 
+.sheet-wrapper-generic-textarea-notes.sheet-tall-row {
+    height: 163px;
+}
+
+.sheet-wrapper-generic-textarea-notes.sheet-medium-row {
+    height: 80px;
+}
+
 .sheet-wrapper-generic-textarea-notes textarea.sheet-generic-textrea-notes {
-    height: 185px !important;
     width: 98%;
 }
 
diff --git a/GURPS/gurps.html b/GURPS/gurps.html
index bd48dd25b23..7dc5de8d210 100644
--- a/GURPS/gurps.html
+++ b/GURPS/gurps.html
@@ -4369,16 +4369,22 @@ <h4>
 					<input type="text" name="attr_announcement_version" readonly="readonly" value="0" title="GURPS Character Sheet Version" />
 				</h4>
 
-				<!-- current version notes: 2.9.16 -->
+				<!-- current version notes: 2.9.17 -->
 				<ul>
 					<li>
-						Added <b>Reason for Mod</b> to Hit Point and Fatigue Point columns.
+						<b>NEW:</b> Added custom macro text boxes for Skills, Defense, Melee, Ranged, and Spell rolls. To view the custom macros, expand the notes section at the top of each section.
 					</li>
 					<li>
-						Updated tooltip notes for Recover from Physical Stun Check, Knockdown and Stunning Check, Unconsciousness Check, and Death Check.
+						<b>ENHANCEMENT:</b> On the Option Rules tab, added a <b>Reset Spell Notes</b> button. If clicked, the existing notes are replaced with the original notes.
 					</li>
 					<li>
-						<b>Range Calculator Tool:</b> Updated modifier summary to include the number of shots fired. Fix macro help tooltip for the <b>Fired</b> input box.
+						<b>ENHANCEMENT:</b> Under Sheet Options\Rules, added text entries for the Success\Fail\Crit Success\Crit Fail text for Fright Check, Unstun, Knockdown and Stunning, and Unconsciousness.
+					</li>
+					<li>
+						<b>ENHANCEMENT:</b> Under the General Page for HT, updated the ToolTip.
+					</li>
+					<li>
+						<b>FIX:</b> Under Combat\Ranged for the Ranged Calculator Tool, fixed a synchronization issue with the <b>Reset</b> button that wasn't applying the updates to modifier tool.
 					</li>
 				</ul>
 					
@@ -4615,7 +4621,9 @@ <h4>
 							</div>
 							<span class="tooltip">
 								<span data-i18n="attributes-health-tooltip">Health 10pts/level - Unmodified:</span> 
-								<span name="attr_health_base"></span>
+								<span name="attr_health_base"></span><br />
+								<span data-i18n="attributes-health-detailed-tooltip"></span>
+
 							</span>
 						</div>
 						<div class="cell col1">
@@ -4982,7 +4990,7 @@ <h4>
 					<div class="cell col4">
 						<!-- For Fright Check, use "kl1" = Keep Lowest One. [[1d8 ( { 16 , 13 }kl1) ]] = 1d6 + 13 -->
 						<!-- see: https://wiki.roll20.net/Macros_-_Pathfinder_Examples : Calculated Dice Roll -->
-						<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Attribute Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Fright Check}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[ ( {@{fear_check} + @{modifier}, @{fright_check_threshold}}kl1) ]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{useFrightLabel=[[1]]}} {{showNotes=[[1]]}} {{notes= **On a failure**, Roll 3d6, add your margin of failure on the Fright Check, compare result to the Fright Check Table B360.}}  {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}}" name="roll_vsFearCheck" />
+						<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Attribute Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Fright Check}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[ ( {@{fear_check} + @{modifier}, @{fright_check_threshold}}kl1) ]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{useFrightLabel=[[1]]}} {{showNotes=[[1]]}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{fright_check_success_notes}}} {{rawCriticalSuccessNote=@{fright_check_critical_success_notes}}} {{rawFailNote=@{fright_check_fail_notes}}} {{rawCriticalFailNote=@{fright_check_critical_failure_notes}}}" name="roll_vsFearCheck" />
 					</div>
 				</div> <!-- .row -->
 
@@ -5079,7 +5087,7 @@ <h4>
 						&nbsp;
 					</div>
 					<div class="cell col4">
-						<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Condition Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Unstun Check (Recovering from Stun)}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{stun_check} + @{modifier}]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showNotes=[[1]]}} {{notes= **On a failure**, you remain stunned; your next maneuver must also be Do Nothing, but you get another roll at the end of that turn . . . and so on, until you recover from stun. You are also -4 to defenses, no retreat.\n<br /> **On a success**, you recover from stun and can act normally on subsequent turns. B420}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}}"  name="roll_vsUnstun" />
+						<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Condition Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Unstun Check (Recovering from Stun)}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{stun_check} + @{modifier}]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showNotes=[[1]]}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{unstun_check_success_notes}}} {{rawCriticalSuccessNote=@{unstun_check_critical_success_notes}}} {{rawFailNote=@{unstun_check_fail_notes}}} {{rawCriticalFailNote=@{unstun_check_critical_failure_notes}}}"  name="roll_vsUnstun" />
 					</div>	
 				</div> <!-- .row -->
 
@@ -5136,7 +5144,7 @@ <h4>
 						&nbsp;
 					</div>
 					<div class="cell col4">
-						<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Condition Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Knockdown & Stunning Check - B420}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{knockdown_check} + @{modifier}]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showNotes=[[1]]}} {{notes= **On a failure**, you’re **Physically Stunned** (B420). You also fall prone (if you weren’t already), and if you were holding anything, you drop it. \n<br />**On a failure by 5 or more, or any critical failure**, you fall unconscious! B420. For Recovery see B423.}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}}"  name="roll_vsKnockdown" />
+						<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Condition Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Knockdown & Stunning Check - B420}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{knockdown_check} + @{modifier}]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showNotes=[[1]]}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{knockdown_check_success_notes}}} {{rawCriticalSuccessNote=@{knockdown_check_critical_success_notes}}} {{rawFailNote=@{knockdown_check_fail_notes}}} {{rawCriticalFailNote=@{knockdown_check_critical_failure_notes}}}"  name="roll_vsKnockdown" />
 					</div>
 
 				</div> <!-- .row -->
@@ -5187,7 +5195,7 @@ <h4>
 						<input type="number" name="attr_unconscious_check_points" value="0" step="2" title="Macro: @{NAME|unconscious_check_points}" />
 					</div>
 					<div class="cell col4">
-						<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Condition Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Unconscious Check}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{unconscious_check} + @{modifier}]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showNotes=[[1]]}} {{notes=** If you fail:**  you fall unconscious.  See 'Recovering from Unconsciousness' B423 . \n<br />**Success:** means you can act normally, but must roll again at the beginning of every turn to continue functioning (If your HP is 0 or less). Exception: If you choose Do Nothing on your turn, then no roll needed. B419}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}}" name="roll_vsUnconsciousCheck" />
+						<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Condition Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Unconscious Check}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{unconscious_check} + @{modifier}]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showNotes=[[1]]}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{unconscious_check_success_notes}}} {{rawCriticalSuccessNote=@{unconscious_check_critical_success_notes}}} {{rawFailNote=@{unconscious_check_fail_notes}}} {{rawCriticalFailNote=@{unconscious_check_critical_failure_notes}}}" name="roll_vsUnconsciousCheck" />
 					</div>
 				</div> <!-- .row -->
 
@@ -5240,7 +5248,7 @@ <h4>
 						<input type="number" name="attr_death_check_points" value="0" step="2" title="Macro: @{NAME|death_check_points}" />
 					</div>
 					<div class="cell col4">
-						<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Condition Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Death Check}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{unconscious_check} + @{modifier}]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showNotes=[[1]]}} {{notes= **On a failure of 1 or 2**, You receive a Mortal Wound – See Mortal Wounds B423 \n<br /> **On a failure of 3+** ***YOU DIE*** – See Death B423.}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}}" name="roll_vsDeathCheck" />
+						<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Condition Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Death Check}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{unconscious_check} + @{modifier}]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showNotes=[[1]]}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{death_check_success_notes}}} {{rawCriticalSuccessNote=@{death_check_critical_success_notes}}} {{rawFailNote=@{death_check_fail_notes}}} {{rawCriticalFailNote=@{death_check_critical_failure_notes}}}" name="roll_vsDeathCheck" />
 					</div>
 				</div> <!-- .row -->
 
@@ -9149,8 +9157,8 @@ <h4>
 				</div>
 				
 				<input type="hidden" name="attr_toggle_skills_notes" class="hidden-generic-notes-toggle" />
-				<div class="row wrapper-generic-textarea-notes">
-					<div class="cell">
+				<div class="row wrapper-generic-textarea-notes tall-row">
+					<div class="cell full-width">
 						<textarea name="attr_skills_notes" class="generic-textrea-notes"></textarea>
 					</div>
 				</div>
@@ -9158,11 +9166,11 @@ <h4>
 				<div class="row wrapper-generic-textarea-notes">
 
 					<div class="cell">
-						<div class="popup">
-							<span data-i18n="custom-macro-label">Custom Macro</span>
+						<div class="popup label">
+							<span data-i18n="custom-macro-skills-label">Custom Macro for Skills</span>
 						</div>
 						<span class="tooltip">
-							<span data-i18n="skills-custom-macro-tooltip">
+							<span data-i18n="custom-macro-skills-tooltip">
 	Enter a custom macro to apply to all skill rolls.
 							</span>
 						</span>						
@@ -9170,9 +9178,9 @@ <h4>
 					
 				</div>
 
-				<div class="row wrapper-generic-textarea-notes">
+				<div class="row wrapper-generic-textarea-notes medium-row">
 
-					<div class="cell">
+					<div class="cell full-width">
 						<textarea name="attr_skills_custom_macro" class="macro-textrea-notes"></textarea>
 					</div>
 					
@@ -9392,7 +9400,7 @@ <h4>
 							</span>
 						</div>
 						<div class="cell col1">
-							<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Skill Roll}} {{isRepeatingSkill=[[1]]}} {{activeDefense=[[0]]}} {{isSkillRoll=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{skillNameTechLevel=@{tl}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{level} + @{modifier} + @{skill_roll_modifier}, @{skill_roll_max_nine_value} }kl1]]}} {{maxNine=[[@{skill_roll_max_nine}]]}} {{rollModifier=[[@{skill_roll_modifier}]]}} {{rollModifierSummary=@{skill_roll_modifier_summary}}} {{rollTraitSummary=@{skill_roll_trait_summary}}} {{notes=@{notes}}} {{showNotes=[[@{show_notes}]]}} {{bookReference=@{ref}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{customSuccessNote=@{skill_success_note}}} {{customCriticalSuccessNote=@{skill_critical_success_note}}} {{customFailNote=@{skill_fail_note}}} {{customCriticalFailNote=@{skill_critical_fail_note}}} {{noteBoxOneShow=[[@{show_skill_mod_notes}]]}} {{noteBoxOneLabel=Skill Modifiers}} {{noteBoxOneContent=@{skill_mod_description_notes}}} {{noteBoxTwoShow=[[@{show_skill_conditionals}]]}} {{noteBoxTwoLabel=Conditionals}} {{noteBoxTwoContent=@{skill_conditional_notes}}} {{popupModifier=@{popup_modifier}}} {{useModTool=[[1]]}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}}" name="roll_vsSL" />
+							<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Skill Roll}} {{isRepeatingSkill=[[1]]}} {{activeDefense=[[0]]}} {{isSkillRoll=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{skillNameTechLevel=@{tl}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{level} + @{modifier} + @{skill_roll_modifier}, @{skill_roll_max_nine_value} }kl1]]}} {{maxNine=[[@{skill_roll_max_nine}]]}} {{rollModifier=[[@{skill_roll_modifier}]]}} {{rollModifierSummary=@{skill_roll_modifier_summary}}} {{rollTraitSummary=@{skill_roll_trait_summary}}} {{notes=@{notes}}} {{showNotes=[[@{show_notes}]]}} {{bookReference=@{ref}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{customSuccessNote=@{skill_success_note}}} {{customCriticalSuccessNote=@{skill_critical_success_note}}} {{customFailNote=@{skill_fail_note}}} {{customCriticalFailNote=@{skill_critical_fail_note}}} {{noteBoxOneShow=[[@{show_skill_mod_notes}]]}} {{noteBoxOneLabel=Skill Modifiers}} {{noteBoxOneContent=@{skill_mod_description_notes}}} {{noteBoxTwoShow=[[@{show_skill_conditionals}]]}} {{noteBoxTwoLabel=Conditionals}} {{noteBoxTwoContent=@{skill_conditional_notes}}} {{popupModifier=@{popup_modifier}}} {{useModTool=[[1]]}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{customMacro=@{skills_custom_macro}}}" name="roll_vsSL" />
 						</div>
 						<div class="cell col2">
 							<input type="text" name="attr_tl" title="Macro: @{NAME|repeating_skills_$[row #]_tl}" />
@@ -10060,6 +10068,7 @@ <h4>
 
 		<div class="box skills" style="margin-bottom:6px;">
 			<div class="table table-generic-notes">
+				
 				<div class="header">
 					<div class="cell">
 						<div class="item">
@@ -10070,10 +10079,83 @@ <h4>
 						<span data-i18n="notes-label">Notes</span>
 					</div>
 				</div>
+				
 				<input type="hidden" name="attr_toggle_combat_notes" class="hidden-generic-notes-toggle" />
+				<div class="row wrapper-generic-textarea-notes tall-row">
+					<div class="cell full-width">
+						<textarea name="attr_combat_notes" class="generic-textrea-notes"></textarea>
+					</div>
+				</div>
+
+				<div class="row wrapper-generic-textarea-notes">
+
+					<div class="cell">
+						<div class="popup label">
+							<span data-i18n="custom-macro-defense-label">Custom Macro for Defense</span>
+						</div>
+						<span class="tooltip">
+							<span data-i18n="custom-macro-defense-tooltip">
+	Enter a custom macro to apply to all defense rolls.
+							</span>
+						</span>						
+					</div>
+					
+				</div>
+
+				<div class="row wrapper-generic-textarea-notes medium-row">
+
+					<div class="cell full-width">
+						<textarea name="attr_custom_macro_defense" class="macro-textrea-notes"></textarea>
+					</div>
+					
+				</div>
+
+				<div class="row wrapper-generic-textarea-notes">
+
+					<div class="cell">
+						<div class="popup label">
+							<span data-i18n="custom-macro-melee-label">Custom Macro for Melee</span>
+						</div>
+						<span class="tooltip">
+							<span data-i18n="custom-macro-melee-tooltip">
+	Enter a custom macro to apply to all melee rolls.
+							</span>
+						</span>						
+					</div>
+					
+				</div>
+
+				<div class="row wrapper-generic-textarea-notes medium-row">
+
+					<div class="cell full-width">
+						<textarea name="attr_custom_macro_melee" class="macro-textrea-notes"></textarea>
+					</div>
+					
+				</div>
+
 				<div class="row wrapper-generic-textarea-notes">
-					<textarea name="attr_combat_notes" class="generic-textrea-notes"></textarea>
+
+					<div class="cell">
+						<div class="popup label">
+							<span data-i18n="custom-macro-ranged-label">Custom Macro for Ranged</span>
+						</div>
+						<span class="tooltip">
+							<span data-i18n="custom-macro-ranged-tooltip">
+	Enter a custom macro to apply to all ranged rolls.
+							</span>
+						</span>						
+					</div>
+					
+				</div>
+
+				<div class="row wrapper-generic-textarea-notes medium-row">
+
+					<div class="cell full-width">
+						<textarea name="attr_custom_macro_ranged" class="macro-textrea-notes"></textarea>
+					</div>
+					
 				</div>
+
 			</div>
 		</div>
 
@@ -11175,7 +11257,7 @@ <h4 class="spacer">&nbsp;</h4>
 										<input type="hidden" name="attr_raw_dodge_critical_success_notes" />
 										<input type="hidden" name="attr_raw_dodge_fail_notes" />
 										<input type="hidden" name="attr_raw_dodge_critical_fail_notes" />
-										<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Defense Roll}} {{defenseType=[[1]]}} {{activeDefense=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Dodge}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{ad_dodge_skill_final} + @{modifier} + @{defense_roll_modifier}, @{defense_roll_max_nine_value} }kl1]]}} {{isSkillRoll=[[1]]}} {{showDodgeNotes=[[1]]}} {{dodgeReducedNotes=[[@{dodge_reduced_notes}]]}} {{dodgeEncumbrancePenalty=@{encumbrance_level}}} {{useModTool=[[1]]}} {{maxNine=[[@{defense_roll_max_nine}]]}} {{rollModifier=[[@{defense_roll_modifier}]]}} {{rollModifierSummary=@{defense_roll_modifier_summary}}} {{rollTraitSummary=@{defense_roll_trait_summary}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showNotes=[[@{defense_dodge_show_notes}]]}} {{notes=@{defense_dodge_notes}}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{raw_dodge_success_notes}}} {{rawCriticalSuccessNote=@{raw_dodge_critical_success_notes}}} {{rawFailNote=@{raw_dodge_fail_notes}}} {{rawCriticalFailNote=@{raw_dodge_critical_fail_notes}}} {{customSuccessNote=@{defense_dodge_success_note}}} {{customCriticalSuccessNote=@{defense_dodge_critical_success_note}}} {{customFailNote=@{defense_dodge_fail_note}}} {{customCriticalFailNote=@{defense_dodge_critical_fail_note}}} {{showDBNotes=[[@{show_db_notes}]]}} {{DBNotes=@{defense_bonus_notes}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}}" name="roll_vsDodge" />
+										<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Defense Roll}} {{defenseType=[[1]]}} {{activeDefense=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Dodge}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{ad_dodge_skill_final} + @{modifier} + @{defense_roll_modifier}, @{defense_roll_max_nine_value} }kl1]]}} {{isSkillRoll=[[1]]}} {{showDodgeNotes=[[1]]}} {{dodgeReducedNotes=[[@{dodge_reduced_notes}]]}} {{dodgeEncumbrancePenalty=@{encumbrance_level}}} {{useModTool=[[1]]}} {{maxNine=[[@{defense_roll_max_nine}]]}} {{rollModifier=[[@{defense_roll_modifier}]]}} {{rollModifierSummary=@{defense_roll_modifier_summary}}} {{rollTraitSummary=@{defense_roll_trait_summary}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showNotes=[[@{defense_dodge_show_notes}]]}} {{notes=@{defense_dodge_notes}}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{raw_dodge_success_notes}}} {{rawCriticalSuccessNote=@{raw_dodge_critical_success_notes}}} {{rawFailNote=@{raw_dodge_fail_notes}}} {{rawCriticalFailNote=@{raw_dodge_critical_fail_notes}}} {{customSuccessNote=@{defense_dodge_success_note}}} {{customCriticalSuccessNote=@{defense_dodge_critical_success_note}}} {{customFailNote=@{defense_dodge_fail_note}}} {{customCriticalFailNote=@{defense_dodge_critical_fail_note}}} {{showDBNotes=[[@{show_db_notes}]]}} {{DBNotes=@{defense_bonus_notes}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{customMacro=@{custom_macro_defense}}}" name="roll_vsDodge" />
 									</div>
 								</div> <!-- .row -->
 
@@ -11342,7 +11424,7 @@ <h4 class="spacer">&nbsp;</h4>
 										<input type="hidden" name="attr_raw_dodge_retreat_critical_success_notes" />
 										<input type="hidden" name="attr_raw_dodge_retreat_fail_notes" />
 										<input type="hidden" name="attr_raw_dodge_retreat_critical_fail_notes" />
-										<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Defense Roll}} {{defenseType=[[1]]}} {{activeDefense=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Dodge and Retreat}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{ad_dodge_retreat_skill_final} + @{modifier} + @{defense_roll_modifier}, @{defense_roll_max_nine_value} }kl1]]}} {{isSkillRoll=[[1]]}} {{showDodgeNotes=[[1]]}} {{dodgeReducedNotes=[[@{dodge_reduced_notes}]]}} {{dodgeEncumbrancePenalty=@{encumbrance_level}}} {{useModTool=[[1]]}} {{maxNine=[[@{defense_roll_max_nine}]]}} {{rollModifier=[[@{defense_roll_modifier}]]}} {{rollModifierSummary=@{defense_roll_modifier_summary}}} {{rollTraitSummary=@{defense_roll_trait_summary}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showNotes=[[@{defense_dodge_retreat_show_notes}]]}} {{notes=@{defense_dodge_retreat_notes}}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{raw_dodge_retreat_success_notes}}} {{rawCriticalSuccessNote=@{raw_dodge_retreat_critical_success_notes}}} {{rawFailNote=@{raw_dodge_retreat_fail_notes}}} {{rawCriticalFailNote=@{raw_dodge_retreat_critical_fail_notes}}} {{customSuccessNote=@{defense_dodge_retreat_success_note}}} {{customCriticalSuccessNote=@{defense_dodge_retreat_critical_success_note}}} {{customFailNote=@{defense_dodge_retreat_fail_note}}} {{customCriticalFailNote=@{defense_dodge_retreat_critical_fail_note}}} {{showDBNotes=[[@{show_db_notes}]]}} {{DBNotes=@{defense_bonus_notes}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}}" name="roll_vsDodgeRetreat" />
+										<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Defense Roll}} {{defenseType=[[1]]}} {{activeDefense=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Dodge and Retreat}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{ad_dodge_retreat_skill_final} + @{modifier} + @{defense_roll_modifier}, @{defense_roll_max_nine_value} }kl1]]}} {{isSkillRoll=[[1]]}} {{showDodgeNotes=[[1]]}} {{dodgeReducedNotes=[[@{dodge_reduced_notes}]]}} {{dodgeEncumbrancePenalty=@{encumbrance_level}}} {{useModTool=[[1]]}} {{maxNine=[[@{defense_roll_max_nine}]]}} {{rollModifier=[[@{defense_roll_modifier}]]}} {{rollModifierSummary=@{defense_roll_modifier_summary}}} {{rollTraitSummary=@{defense_roll_trait_summary}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showNotes=[[@{defense_dodge_retreat_show_notes}]]}} {{notes=@{defense_dodge_retreat_notes}}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{raw_dodge_retreat_success_notes}}} {{rawCriticalSuccessNote=@{raw_dodge_retreat_critical_success_notes}}} {{rawFailNote=@{raw_dodge_retreat_fail_notes}}} {{rawCriticalFailNote=@{raw_dodge_retreat_critical_fail_notes}}} {{customSuccessNote=@{defense_dodge_retreat_success_note}}} {{customCriticalSuccessNote=@{defense_dodge_retreat_critical_success_note}}} {{customFailNote=@{defense_dodge_retreat_fail_note}}} {{customCriticalFailNote=@{defense_dodge_retreat_critical_fail_note}}} {{showDBNotes=[[@{show_db_notes}]]}} {{DBNotes=@{defense_bonus_notes}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{customMacro=@{custom_macro_defense}}}" name="roll_vsDodgeRetreat" />
 									</div>
 								</div> <!-- .row -->
 
@@ -11507,7 +11589,7 @@ <h4 class="spacer">&nbsp;</h4>
 										<input type="hidden" name="attr_raw_dodge_drop_critical_success_notes" />
 										<input type="hidden" name="attr_raw_dodge_drop_fail_notes" />
 										<input type="hidden" name="attr_raw_dodge_drop_critical_fail_notes" />
-										<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Defense Roll}} {{defenseType=[[1]]}} {{activeDefense=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Dodge and Drop}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{ad_dodge_drop_skill_final} + @{modifier} + @{defense_roll_modifier}, @{defense_roll_max_nine_value} }kl1]]}} {{isSkillRoll=[[1]]}}{{showDodgeNotes=[[1]]}} {{dodgeReducedNotes=[[@{dodge_reduced_notes}]]}} {{dodgeEncumbrancePenalty=@{encumbrance_level}}} {{useModTool=[[1]]}} {{maxNine=[[@{defense_roll_max_nine}]]}} {{rollModifier=[[@{defense_roll_modifier}]]}} {{rollModifierSummary=@{defense_roll_modifier_summary}}} {{rollTraitSummary=@{defense_roll_trait_summary}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showNotes=[[@{defense_dodge_drop_show_notes}]]}} {{notes=@{defense_dodge_drop_notes}}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{raw_dodge_drop_success_notes}}} {{rawCriticalSuccessNote=@{raw_dodge_drop_critical_success_notes}}} {{rawFailNote=@{raw_dodge_drop_fail_notes}}} {{rawCriticalFailNote=@{raw_dodge_drop_critical_fail_notes}}} {{customSuccessNote=@{defense_dodge_drop_success_note}}} {{customCriticalSuccessNote=@{defense_dodge_drop_critical_success_note}}} {{customFailNote=@{defense_dodge_drop_fail_note}}} {{customCriticalFailNote=@{defense_dodge_drop_critical_fail_note}}} {{showDBNotes=[[@{show_db_notes}]]}} {{DBNotes=@{defense_bonus_notes}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}}" name="roll_vsDodgeDrop" />
+										<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Defense Roll}} {{defenseType=[[1]]}} {{activeDefense=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Dodge and Drop}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{ad_dodge_drop_skill_final} + @{modifier} + @{defense_roll_modifier}, @{defense_roll_max_nine_value} }kl1]]}} {{isSkillRoll=[[1]]}}{{showDodgeNotes=[[1]]}} {{dodgeReducedNotes=[[@{dodge_reduced_notes}]]}} {{dodgeEncumbrancePenalty=@{encumbrance_level}}} {{useModTool=[[1]]}} {{maxNine=[[@{defense_roll_max_nine}]]}} {{rollModifier=[[@{defense_roll_modifier}]]}} {{rollModifierSummary=@{defense_roll_modifier_summary}}} {{rollTraitSummary=@{defense_roll_trait_summary}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showNotes=[[@{defense_dodge_drop_show_notes}]]}} {{notes=@{defense_dodge_drop_notes}}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{raw_dodge_drop_success_notes}}} {{rawCriticalSuccessNote=@{raw_dodge_drop_critical_success_notes}}} {{rawFailNote=@{raw_dodge_drop_fail_notes}}} {{rawCriticalFailNote=@{raw_dodge_drop_critical_fail_notes}}} {{customSuccessNote=@{defense_dodge_drop_success_note}}} {{customCriticalSuccessNote=@{defense_dodge_drop_critical_success_note}}} {{customFailNote=@{defense_dodge_drop_fail_note}}} {{customCriticalFailNote=@{defense_dodge_drop_critical_fail_note}}} {{showDBNotes=[[@{show_db_notes}]]}} {{DBNotes=@{defense_bonus_notes}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{customMacro=@{custom_macro_defense}}}" name="roll_vsDodgeDrop" />
 									</div>
 								</div> <!-- .row -->
 
@@ -11653,7 +11735,7 @@ <h4 class="spacer">&nbsp;</h4>
 										<input type="hidden" name="attr_raw_knockback_critical_success_notes" value="Avoided falling prone, but check for collision." />
 										<input type="hidden" name="attr_raw_knockback_fail_notes" value="Fall prone, but check for collision." />
 										<input type="hidden" name="attr_raw_knockback_critical_fail_notes" value="Fall prone, but check for collision." />
-										<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Defense Roll}} {{defenseType=[[1]]}} {{activeDefense=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Avoid Knockback}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{ad_knockback_skill_final} + @{modifier} + @{defense_roll_modifier}, @{defense_roll_max_nine_value} }kl1]]}} {{isSkillRoll=[[1]]}} {{useModTool=[[1]]}} {{maxNine=[[@{defense_roll_max_nine}]]}} {{rollModifier=[[@{defense_roll_modifier}]]}} {{rollModifierSummary=@{defense_roll_modifier_summary}}} {{rollTraitSummary=@{defense_roll_trait_summary}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showNotes=[[@{defense_knockback_show_notes}]]}} {{notes=@{defense_knockback_notes}}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{raw_knockback_success_notes}}} {{rawCriticalSuccessNote=@{raw_knockback_critical_success_notes}}} {{rawFailNote=@{raw_knockback_fail_notes}}} {{rawCriticalFailNote=@{raw_knockback_critical_fail_notes}}} {{customSuccessNote=@{defense_knockback_success_note}}} {{customCriticalSuccessNote=@{defense_knockback_critical_success_note}}} {{customFailNote=@{defense_knockback_fail_note}}} {{customCriticalFailNote=@{defense_knockback_critical_fail_note}}} {{showDBNotes=[[@{show_db_notes}]]}} {{DBNotes=@{defense_bonus_notes}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}}" name="roll_vsKnockback" />
+										<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Defense Roll}} {{defenseType=[[1]]}} {{activeDefense=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Avoid Knockback}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{ad_knockback_skill_final} + @{modifier} + @{defense_roll_modifier}, @{defense_roll_max_nine_value} }kl1]]}} {{isSkillRoll=[[1]]}} {{useModTool=[[1]]}} {{maxNine=[[@{defense_roll_max_nine}]]}} {{rollModifier=[[@{defense_roll_modifier}]]}} {{rollModifierSummary=@{defense_roll_modifier_summary}}} {{rollTraitSummary=@{defense_roll_trait_summary}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showNotes=[[@{defense_knockback_show_notes}]]}} {{notes=@{defense_knockback_notes}}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{raw_knockback_success_notes}}} {{rawCriticalSuccessNote=@{raw_knockback_critical_success_notes}}} {{rawFailNote=@{raw_knockback_fail_notes}}} {{rawCriticalFailNote=@{raw_knockback_critical_fail_notes}}} {{customSuccessNote=@{defense_knockback_success_note}}} {{customCriticalSuccessNote=@{defense_knockback_critical_success_note}}} {{customFailNote=@{defense_knockback_fail_note}}} {{customCriticalFailNote=@{defense_knockback_critical_fail_note}}} {{showDBNotes=[[@{show_db_notes}]]}} {{DBNotes=@{defense_bonus_notes}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{customMacro=@{custom_macro_defense}}}" name="roll_vsKnockback" />
 									</div>
 								</div> <!-- .row -->
 
@@ -11871,7 +11953,7 @@ <h4 class="spacer">&nbsp;</h4>
 										<input type="text" name="attr_skill_final" value="@{skill} + @{skill_mod} + @{defense_combat_reflexes_bonus}" disabled="disabled" title="Macro: @{NAME|repeating_defense_$[row #]_skill_final}" />
 									</div>
 									<div class="cell col4">
-										<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Defense Roll (@{type})}} {{defenseType=[[@{defense_type}]]}} {{activeDefense=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{type}}} {{subSkillName=using @{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{skill_final} + @{modifier} + @{defense_roll_modifier}, @{defense_roll_max_nine_value} }kl1]]}} {{isSkillRoll=[[1]]}} {{useModTool=[[1]]}} {{maxNine=[[@{defense_roll_max_nine}]]}} {{rollModifier=[[@{defense_roll_modifier}]]}} {{rollModifierSummary=@{defense_roll_modifier_summary}}} {{rollTraitSummary=@{defense_roll_trait_summary}}} {{showNotes=[[@{show_notes}]]}} {{notes=@{info_description} @{notes} }} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{raw_success_note}}} {{rawCriticalSuccessNote=@{raw_critical_success_note}}} {{rawFailNote=@{raw_fail_note}}} {{rawCriticalFailNote=@{raw_critical_fail_note}}} {{customSuccessNote=@{defense_success_note}}} {{customCriticalSuccessNote=@{defense_critical_success_note}}} {{customFailNote=@{defense_fail_note}}} {{customCriticalFailNote=@{defense_critical_fail_note}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{showDBNotes=[[@{show_db_notes}]]}} {{DBNotes=@{defense_bonus_notes}}} " name="roll_vsSL" />
+										<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Defense Roll (@{type})}} {{defenseType=[[@{defense_type}]]}} {{activeDefense=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{type}}} {{subSkillName=using @{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{skill_final} + @{modifier} + @{defense_roll_modifier}, @{defense_roll_max_nine_value} }kl1]]}} {{isSkillRoll=[[1]]}} {{useModTool=[[1]]}} {{maxNine=[[@{defense_roll_max_nine}]]}} {{rollModifier=[[@{defense_roll_modifier}]]}} {{rollModifierSummary=@{defense_roll_modifier_summary}}} {{rollTraitSummary=@{defense_roll_trait_summary}}} {{showNotes=[[@{show_notes}]]}} {{notes=@{info_description} @{notes} }} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{raw_success_note}}} {{rawCriticalSuccessNote=@{raw_critical_success_note}}} {{rawFailNote=@{raw_fail_note}}} {{rawCriticalFailNote=@{raw_critical_fail_note}}} {{customSuccessNote=@{defense_success_note}}} {{customCriticalSuccessNote=@{defense_critical_success_note}}} {{customFailNote=@{defense_fail_note}}} {{customCriticalFailNote=@{defense_critical_fail_note}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{showDBNotes=[[@{show_db_notes}]]}} {{DBNotes=@{defense_bonus_notes}}} {{customMacro=@{custom_macro_defense}}}" name="roll_vsSL" />
 									</div>
 								</div> <!-- .row -->
 								
@@ -12491,7 +12573,7 @@ <h4 class="spacer">&nbsp;</h4>
 										<input type="text" name="attr_skill" title="Macro: @{NAME|repeating_melee_$[row #]_skill}" />
 									</div>
 									<div class="cell col6">
-										<button type="roll" class="template-attack-roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Melee Attack}} {{bookReference=@{ref}}} {{selected=@{selected_token_macro}}} {{target1=@{target_token_macro}}} {{activeDefense=[[0]]}} {{isSkillRoll=[[1]]}} {{showHitLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{skill} + @{modifier} + @{melee_roll_modifier}, @{melee_roll_max_nine_value} }kl1]]}} {{useModTool=[[1]]}} {{maxNine=[[@{melee_roll_max_nine}]]}} {{rollModifier=[[@{melee_roll_modifier}]]}} {{rollModifierSummary=@{melee_roll_modifier_summary}}} {{rollTraitSummary=@{melee_roll_trait_summary}}} {{hitLocation=@{melee_roll_hit_location}}} {{maneuver=@{melee_roll_maneuver}}} {{allOutAttack=@{melee_roll_allout_attack}}} {{reach=@{reach}}} {{notes=@{notes}}} {{showNotes=[[1]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{customSuccessNote=@{success_notes}}} {{customCriticalSuccessNote=@{critical_success_notes}}} {{customFailNote=@{fail_notes}}} {{customCriticalFailNote=@{critical_fail_notes}}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{raw_hit_notes}}} {{rawCriticalSuccessNote=@{raw_critical_hit_notes}}} {{rawFailNote=@{raw_miss_notes}}} {{rawCriticalFailNote=@{raw_critical_miss_notes}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}}" name="roll_vsSL" />
+										<button type="roll" class="template-attack-roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Melee Attack}} {{bookReference=@{ref}}} {{selected=@{selected_token_macro}}} {{target1=@{target_token_macro}}} {{activeDefense=[[0]]}} {{isSkillRoll=[[1]]}} {{showHitLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{skill} + @{modifier} + @{melee_roll_modifier}, @{melee_roll_max_nine_value} }kl1]]}} {{useModTool=[[1]]}} {{maxNine=[[@{melee_roll_max_nine}]]}} {{rollModifier=[[@{melee_roll_modifier}]]}} {{rollModifierSummary=@{melee_roll_modifier_summary}}} {{rollTraitSummary=@{melee_roll_trait_summary}}} {{hitLocation=@{melee_roll_hit_location}}} {{maneuver=@{melee_roll_maneuver}}} {{allOutAttack=@{melee_roll_allout_attack}}} {{reach=@{reach}}} {{notes=@{notes}}} {{showNotes=[[1]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{customSuccessNote=@{success_notes}}} {{customCriticalSuccessNote=@{critical_success_notes}}} {{customFailNote=@{fail_notes}}} {{customCriticalFailNote=@{critical_fail_notes}}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{raw_hit_notes}}} {{rawCriticalSuccessNote=@{raw_critical_hit_notes}}} {{rawFailNote=@{raw_miss_notes}}} {{rawCriticalFailNote=@{raw_critical_miss_notes}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{customMacro=@{custom_macro_melee}}}" name="roll_vsSL" />
 									</div>
 								</div> <!-- .row -->
 
@@ -13101,7 +13183,7 @@ <h4 class="spacer">&nbsp;</h4>
 										<input type="text" name="attr_skill" title="Macro: @{NAME|repeating_ranged_$[row #]_skill}" />
 									</div>
 									<div class="cell col11">
-										<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Ranged Attack}} {{bookReference=@{ref}}} {{rangedAttack=[[1]]}} {{selected=@{selected_token_macro}}} {{target1=@{target_token_macro}}} {{activeDefense=[[0]]}} {{isSkillRoll=[[1]]}} {{showHitLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{skill} + @{modifier} + @{ranged_roll_modifier}, @{ranged_roll_max_nine_value} }kl1]]}} {{useModTool=[[1]]}} {{maxNine=[[@{ranged_roll_max_nine}]]}} {{rollModifier=[[@{ranged_roll_modifier}]]}} {{rollModifierSummary=@{ranged_roll_modifier_summary}}} {{rollTraitSummary=@{ranged_roll_trait_summary}}} {{hitLocation=@{ranged_roll_hit_location}}} {{maneuver=@{ranged_roll_maneuver}}} {{allOutAttack=@{ranged_roll_allout_attack}}} {{notes=@{notes}}} {{showNotes=[[1]]}} {{rof=@{rof}}} {{recoil=@{recoil}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{useMalfunction=[[@{use_malfunction}]]}} {{malfunction=[[@{malfunction}]]}} {{verifyMalfunction=[[ @{malfunction_verify} ]]}} {{veryReliable=[[ @{malfunction_very_reliable} ]]}} {{customSuccessNote=@{success_notes}}} {{customCriticalSuccessNote=@{critical_success_notes}}} {{customFailNote=@{fail_notes}}} {{customCriticalFailNote=@{critical_fail_notes}}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{raw_hit_notes}}} {{rawCriticalSuccessNote=@{raw_critical_hit_notes}}} {{rawFailNote=@{raw_miss_notes}}} {{rawCriticalFailNote=@{raw_critical_miss_notes}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}}" name="roll_vsSL" />
+										<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Ranged Attack}} {{bookReference=@{ref}}} {{rangedAttack=[[1]]}} {{selected=@{selected_token_macro}}} {{target1=@{target_token_macro}}} {{activeDefense=[[0]]}} {{isSkillRoll=[[1]]}} {{showHitLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{skill} + @{modifier} + @{ranged_roll_modifier}, @{ranged_roll_max_nine_value} }kl1]]}} {{useModTool=[[1]]}} {{maxNine=[[@{ranged_roll_max_nine}]]}} {{rollModifier=[[@{ranged_roll_modifier}]]}} {{rollModifierSummary=@{ranged_roll_modifier_summary}}} {{rollTraitSummary=@{ranged_roll_trait_summary}}} {{hitLocation=@{ranged_roll_hit_location}}} {{maneuver=@{ranged_roll_maneuver}}} {{allOutAttack=@{ranged_roll_allout_attack}}} {{notes=@{notes}}} {{showNotes=[[1]]}} {{rof=@{rof}}} {{recoil=@{recoil}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{useMalfunction=[[@{use_malfunction}]]}} {{malfunction=[[@{malfunction}]]}} {{verifyMalfunction=[[ @{malfunction_verify} ]]}} {{veryReliable=[[ @{malfunction_very_reliable} ]]}} {{customSuccessNote=@{success_notes}}} {{customCriticalSuccessNote=@{critical_success_notes}}} {{customFailNote=@{fail_notes}}} {{customCriticalFailNote=@{critical_fail_notes}}} {{showRawDefenseNotes=[[@{show_raw_defensive_notes}]]}} {{rawSuccessNote=@{raw_hit_notes}}} {{rawCriticalSuccessNote=@{raw_critical_hit_notes}}} {{rawFailNote=@{raw_miss_notes}}} {{rawCriticalFailNote=@{raw_critical_miss_notes}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{customMacro=@{custom_macro_ranged}}}" name="roll_vsSL" />
 									</div>
 								</div> <!-- .row -->
 								
@@ -15057,6 +15139,7 @@ <h4 class="spacer">&nbsp;</h4>
 
 		<div class="box skills" style="margin-bottom:6px;">
 			<div class="table table-generic-notes">
+				
 				<div class="header">
 					<div class="cell">
 						<div class="item">
@@ -15067,10 +15150,37 @@ <h4 class="spacer">&nbsp;</h4>
 						<span data-i18n="notes-label">Notes</span>
 					</div>
 				</div>
+				
 				<input type="hidden" name="attr_toggle_grimoire_notes" class="hidden-generic-notes-toggle" />
+				<div class="row wrapper-generic-textarea-notes tall-row">
+					<div class="cell full-width">
+						<textarea name="attr_grimoire_notes" class="generic-textrea-notes"></textarea>
+					</div>
+				</div>
+
 				<div class="row wrapper-generic-textarea-notes">
-					<textarea name="attr_grimoire_notes" class="generic-textrea-notes"></textarea>
+
+					<div class="cell">
+						<div class="popup label">
+							<span data-i18n="custom-macro-label">Custom Macro</span>
+						</div>
+						<span class="tooltip">
+							<span data-i18n="skills-custom-macro-tooltip">
+	Enter a custom macro to apply to all skill rolls.
+							</span>
+						</span>						
+					</div>
+					
 				</div>
+
+				<div class="row wrapper-generic-textarea-notes medium-row">
+
+					<div class="cell full-width">
+						<textarea name="attr_spell_custom_macro" class="macro-textrea-notes"></textarea>
+					</div>
+					
+				</div>
+
 			</div>
 		</div>
 
@@ -15367,7 +15477,7 @@ <h4 class="spacer">&nbsp;</h4>
 							<input type="hidden" name="attr_idkey" />
 						</div>
 						<div class="cell col1">
-							<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Spell Skill Roll}} {{activeDefense=[[0]]}} {{isSkillRoll=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{level} + @{modifier} + @{spell_roll_modifier}, @{spell_roll_max_nine_value} }kl1]]}} {{useModTool=[[1]]}} {{maxNine=[[@{spell_roll_max_nine}]]}} {{rollModifier=[[@{spell_roll_modifier}]]}} {{rollModifierSummary=@{spell_roll_modifier_summary}}} {{rollTraitSummary=@{spell_roll_trait_summary}}} {{notes=@{notes}}} {{showNotes=[[@{show_notes}]]}} {{castingTime=@{casttime}}} {{castingDuration=@{duration}}} {{castingCost=@{cost}}} {{castingMaintain=@{maintain}}} {{castingResist=@{spell_resisted_by}}} {{castingClass=@{spell_class}}} {{bookReference=@{ref}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{customSuccessNote=@{spell_success_note}}} {{customCriticalSuccessNote=@{spell_critical_success_note}}} {{customFailNote=@{spell_fail_note}}} {{customCriticalFailNote=@{spell_critical_fail_note}}} {{spellRoll=true}} {{spellCriticalSuccessNote=@{spell_critical_success_notes}}} {{spellFailNote=@{spell_fail_notes}}} {{spellCriticalFailureNote=@{spell_critical_failure_notes}}} {{showCastingDetails=[[@{show_casting_details}]]}} {{showSpellNotes=[[@{show_spell_notes}]]}} {{spellNotes=@{spell_notes}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}}" name="roll_vsSL" />
+							<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Spell Skill Roll}} {{activeDefense=[[0]]}} {{isSkillRoll=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{level} + @{modifier} + @{spell_roll_modifier}, @{spell_roll_max_nine_value} }kl1]]}} {{useModTool=[[1]]}} {{maxNine=[[@{spell_roll_max_nine}]]}} {{rollModifier=[[@{spell_roll_modifier}]]}} {{rollModifierSummary=@{spell_roll_modifier_summary}}} {{rollTraitSummary=@{spell_roll_trait_summary}}} {{notes=@{notes}}} {{showNotes=[[@{show_notes}]]}} {{castingTime=@{casttime}}} {{castingDuration=@{duration}}} {{castingCost=@{cost}}} {{castingMaintain=@{maintain}}} {{castingResist=@{spell_resisted_by}}} {{castingClass=@{spell_class}}} {{bookReference=@{ref}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{customSuccessNote=@{spell_success_note}}} {{customCriticalSuccessNote=@{spell_critical_success_note}}} {{customFailNote=@{spell_fail_note}}} {{customCriticalFailNote=@{spell_critical_fail_note}}} {{spellRoll=true}} {{spellCriticalSuccessNote=@{spell_critical_success_notes}}} {{spellFailNote=@{spell_fail_notes}}} {{spellCriticalFailureNote=@{spell_critical_failure_notes}}} {{showCastingDetails=[[@{show_casting_details}]]}} {{showSpellNotes=[[@{show_spell_notes}]]}} {{spellNotes=@{spell_notes}}} {{popupModifier=@{popup_modifier}}} {{displayRollModifierSummary=[[@{display_roll_modifier_summary}]]}} {{customMacro=@{spell_custom_macro}}}" name="roll_vsSL" />
 						</div>
 						<div class="cell col2">
 							<input type="text" name="attr_level" title="Macro: @{NAME|repeating_spells_$[row #]_level}" readonly="readonly" value="10"/>
@@ -15600,7 +15710,28 @@ <h4>Version: <span name="attr_announcement_version"></span></h4>
 
 			<p>Pull Request: <span name="attr_latest_changes"></span></p>
 
-			<!-- current version notes: 2.9.16 -->
+			<!-- current version notes: 2.9.17 -->
+			<ul>
+				<li>
+					<b>NEW:</b> Added custom macro text boxes for Skills, Defense, Melee, Ranged, and Spell rolls. To view the custom macros, expand the notes section at the top of each section.
+				</li>
+				<li>
+					<b>ENHANCEMENT:</b> On the Option Rules tab, added a <b>Reset Spell Notes</b> button. If clicked, the existing notes are replaced with the original notes.
+				</li>
+				<li>
+					<b>ENHANCEMENT:</b> Under Sheet Options\Rules, added text entries for the Success\Fail\Crit Success\Crit Fail text for Fright Check, Unstun, Knockdown and Stunning, and Unconsciousness.
+				</li>
+				<li>
+					<b>ENHANCEMENT:</b> Under the General Page for HT, updated the ToolTip.
+				</li>
+				<li>
+					<b>FIX:</b> Under Combat\Ranged for the Ranged Calculator Tool, fixed a synchronization issue with the <b>Reset</b> button that wasn't applying the updates to modifier tool.
+				</li>
+			</ul>
+			
+			<h4>Version: 2.9.16</h4>
+			<p>Pull Request: 9/18/2023</p>
+
 			<ul>
 				<li>
 					Added <b>Reason for Mod</b> to Hit Point and Fatigue Point columns.
@@ -17539,36 +17670,212 @@ <h4>
 						</table>
 						
 					</div><!-- end option-container -->
+
+					<div class="option-container">
+
+						<!-- knockdown and stunning check -->
+						<div class="option-container collision-falling-options">
+						
+							<div>
+								<button type="action" name="act_knockdown_check_notes_reset" class="sheet-btn">
+									<span data-i18n="reset-knockdown-check-button-label">Reset Knockdown Check Notes</span>
+								</button>
+								<br />
+								<span data-i18n="knockdown-check-notes-button-description">If you modified a note, you will not see the most recent rule updates. Press the button to get the recent rules. <b>NOTE:</b> this will replace any notes you made.</span>
+							</div>
+						
+							<h4>
+								<span data-i18n="knockdown-check-success-notes-label">Knockdown Check Success Notes</span>
+							</h4>
+							<textarea name="attr_knockdown_check_success_notes">You suffer no penalty beyond ordinary shock. (B420)</textarea>
+						
+							<h4>
+								<span data-i18n="knockdown-check-critical-success-notes-label">Knockdown Check Critical Success Notes</span>
+							</h4>
+							<textarea name="attr_knockdown_check_critical_success_notes">You suffer no penalty beyond ordinary shock.</textarea>
+						
+							<h4>
+								<span data-i18n="knockdown-check-fail-notes-label">Knockdown Check Fail Notes</span>
+							</h4>
+							<textarea name="attr_knockdown_check_fail_notes">You're stunned; see Effects of Stun, B420. You fall prone (if you weren't already), and if you were holding anything, you drop it.
+
+**On a Failure by 5 or more:** You fall unconscious! See Recovering from Unconsciousness (B423). Obviously, you fall prone (if you weren't already), and if you were holding anything, you drop it. (B420)</textarea>
+		
+							<h4>
+								<span data-i18n="knockdown-check-critical-failure-notes-label">Unstun Check Critical Failure Notes</span>
+							</h4>
+							<textarea name="attr_knockdown_check_critical_failure_notes">You fall unconscious! See Recovering from Unconsciousness (B423). Obviously, you fall prone (if you weren't already), and if you were holding anything, you drop it. (B420)</textarea>
+		
+						</div><!-- end option-container -->
+
+						<!-- unconscious check -->
+						<div class="option-container collision-falling-options">
+						
+							<div>
+								<button type="action" name="act_unconscious_check_notes_reset" class="sheet-btn">
+									<span data-i18n="reset-unconscious-check-button-label">Reset Unconscious Check Notes</span>
+								</button>
+								<br />
+								<span data-i18n="unconscious-check-notes-button-description">If you modified a note, you will not see the most recent rule updates. Press the button to get the recent rules. <b>NOTE:</b> this will replace any notes you made.</span>
+							</div>
+						
+							<h4>
+								<span data-i18n="unconscious-check-success-notes-label">Unconscious Check Success Notes</span>
+							</h4>
+							<textarea name="attr_unconscious_check_success_notes">You are able to remain conscious.</textarea>
+						
+							<h4>
+								<span data-i18n="unconscious-check-critical-success-notes-label">Unconscious Check Critical Success Notes</span>
+							</h4>
+							<textarea name="attr_unconscious_check_critical_success_notes">You are able to remain conscious. The GM decides if there is some unusual benefit because of the Critical Success.</textarea>
+						
+							<h4>
+								<span data-i18n="unconscious-check-fail-notes-label">Unconscious Check Fail Notes</span>
+							</h4>
+							<textarea name="attr_unconscious_check_fail_notes">The GM to decide whether you are truly unconscious or just totally incapacitated by pain and injury - but either way, you can't do anything. If you fall unconscious, see Recovering from Unconsciousness (B423).</textarea>
+		
+							<h4>
+								<span data-i18n="unconscious-check-critical-failure-notes-label">Unconscious Check Critical Failure Notes</span>
+							</h4>
+							<textarea name="attr_unconscious_check_critical_failure_notes">The GM to decide whether you are truly unconscious or just totally incapacitated by pain and injury - but either way, you can't do anything. If you fall unconscious, see Recovering from Unconsciousness (B423). The GM decides if there is some unusual disaster because of the Critical Failure.</textarea>
+		
+						</div><!-- end option-container -->
+
+					</div>
 					
 				</div><!-- end option-column -->
 				
 				<div class="option-column">
 					
+					<!-- Spell Roll Result Notes -->
 					<div class="option-container collision-falling-options">
+						<div>
+							<button type="action" name="act_spell_notes_reset" class="sheet-btn">
+								<span data-i18n="reset-spell-notes-button-label">Reset Spell Notes</span>
+							</button>
+							<br />
+							<span data-i18n="spell-notes-button-description">If you modified a note, you will not see the most recent rule updates. Press the button to get the recent rules. <b>NOTE:</b> this will replace any notes you made.</span>
+						</div>
+
 						<h4>
 							<span data-i18n="spell-critical-success-notes-label">Spell Critical Success Notes</span>
 						</h4>
 						<textarea name="attr_spell_critical_success_notes">The spell works especially well. **Details are up to the GM**, who should be both generous and creative. Whatever else occurs, there is never an energy cost if you get a critical success when you cast a spell. B235, M7</textarea>
-					</div><!-- end option-container -->
 					
-					<div class="option-container collision-falling-options">
 						<h4>
 							<span data-i18n="spell-fail-notes-label">Spell Fail Notes</span>
 						</h4>
 						<textarea name="attr_spell_fail_notes">The spell does not work. If success would have cost energy, you lose one energy point; otherwise, you lose nothing. (Exception: You must pay the full energy cost even on a failure for an Information spell; see Information Spells. B235, M7.
 						
 	**In Very High Mana Areas**, all Failures are treated as Critical Failures. M6.</textarea>
+
+						<h4>
+							<span data-i18n="spell-critical-failure-notes-label">Spell Critical Failure Notes</span>
+						</h4>
+						<textarea name="attr_spell_critical_failure_notes">You must spend the full energy cost and the spell fails . . . badly! **The GM may** use the Critical Spell Failure Table on B236 or, M7, or improvise some other “backfire” he finds amusing. (B235, M7.)
+	
+**In Very High Mana Areas**, all actual Critical Failures produce spectacular disasters! (M6)
+
+**In Low Mana Areas**, Critical Failures have mild effects or no effect at all. (M6)</textarea>
+
 					</div><!-- end option-container -->
 					
+					<!-- fright check roll result notes -->
 					<div class="option-container collision-falling-options">
+						<div>
+							<button type="action" name="act_fright_check_notes_reset" class="sheet-btn">
+								<span data-i18n="reset-fright-check-button-label">Reset Fright Check Notes</span>
+							</button>
+							<br />
+							<span data-i18n="fright-check-notes-button-description">If you modified a note, you will not see the most recent rule updates. Press the button to get the recent rules. <b>NOTE:</b> this will replace any notes you made.</span>
+						</div>
+					
 						<h4>
-							<span data-i18n="spell-critical-failure-notes-label">Spell Critical Failure Notes</span>
+							<span data-i18n="fright-check-success-notes-label">Fright Check Success Notes</span>
 						</h4>
-						<textarea name="attr_spell_critical_failure_notes">You must spend the full energy cost and the spell fails . . . badly! **The GM may** use the Critical Spell Failure Table on B236 or, M7, or improvise some other “backfire” he finds amusing. (B235, M7.)
+						<textarea name="attr_fright_check_success_notes">You suffer no ill effects. (B360)</textarea>
+					
+						<h4>
+							<span data-i18n="fright-check-critical-success-notes-label">Fright Check Critical Success Notes</span>
+						</h4>
+						<textarea name="attr_fright_check_critical_success_notes">You suffer no ill effects. (B360)  The GM decides if there is some unusual benefit because of the Critical Success.</textarea>
+					
+						<h4>
+							<span data-i18n="fright-check-fail-notes-label">Fright Check Fail Notes</span>
+						</h4>
+						<textarea name="attr_fright_check_fail_notes">Roll 3d6, add your margin of failure on the Fright Check, and consult the Fright Check Table B360-361. (B360). Also, if using GURPS Horror, add -1 to the Stress or Derangement value as appropriate (H141).</textarea>
+	
+						<h4>
+							<span data-i18n="fright-check-critical-failure-notes-label">Fright Check Critical Failure Notes</span>
+						</h4>
+						<textarea name="attr_fright_check_critical_failure_notes">Roll 3d6, add your margin of failure on the Fright Check, and consult the Fright Check Table B360-361. (B360). Also, if using GURPS Horror, add -3 to the Stress or Derangement value as appropriate (H141). The GM decides if there is some unusual disaster because of the Critical Failure.</textarea>
+	
+					</div><!-- end option-container -->
+					
+					<div class="option-container collision-falling-options">
 						
-	**In Very High Mana Areas**, all actual Critical Failures produce spectacular disasters! (M6)
+						<div>
+							<button type="action" name="act_unstun_check_notes_reset" class="sheet-btn">
+								<span data-i18n="reset-unstun-check-button-label">Reset Unstun Check Notes</span>
+							</button>
+							<br />
+							<span data-i18n="unstun-check-notes-button-description">If you modified a note, you will not see the most recent rule updates. Press the button to get the recent rules. <b>NOTE:</b> this will replace any notes you made.</span>
+						</div>
+					
+						<h4>
+							<span data-i18n="unstun-check-success-notes-label">Unstun Check Success Notes</span>
+						</h4>
+						<textarea name="attr_unstun_check_success_notes">You recover from stun and can act normally on subsequent turns. (B420)</textarea>
+					
+						<h4>
+							<span data-i18n="unstun-check-critical-success-notes-label">Fright Check Critical Success Notes</span>
+						</h4>
+						<textarea name="attr_unstun_check_critical_success_notes">You recover from stun and can act normally on subsequent turns. (B420) The GM decides if there is some unusual benefit because of the Critical Success.</textarea>
+					
+						<h4>
+							<span data-i18n="unstun-check-fail-notes-label">Unstun Check Fail Notes</span>
+						</h4>
+						<textarea name="attr_unstun_check_fail_notes">You remain stunned; your next maneuver must also be Do Nothing, but you get another roll at the end of that turn... and so on, until you recover from stun. (B420)</textarea>
+	
+						<h4>
+							<span data-i18n="unstun-check-critical-failure-notes-label">Unstun Check Critical Failure Notes</span>
+						</h4>
+						<textarea name="attr_unstun_check_critical_failure_notes">You remain stunned; your next maneuver must also be Do Nothing, but you get another roll at the end of that turn... and so on, until you recover from stun. (B420) The GM decides if there is some unusual disaster because of the Critical Failure.</textarea>
+	
+					</div><!-- end option-container -->
 
-	**In Low Mana Areas**, Critical Failures have mild effects or no effect at all. (M6)</textarea>
+					<!-- death check -->
+					<div class="option-container collision-falling-options">
+						
+						<div>
+							<button type="action" name="act_death_check_notes_reset" class="sheet-btn">
+								<span data-i18n="reset-death-check-button-label">Reset Death Check Notes</span>
+							</button>
+							<br />
+							<span data-i18n="death-check-notes-button-description">If you modified a note, you will not see the most recent rule updates. Press the button to get the recent rules. <b>NOTE:</b> this will replace any notes you made.</span>
+						</div>
+					
+						<h4>
+							<span data-i18n="death-check-success-notes-label">Death Check Success Notes</span>
+						</h4>
+						<textarea name="attr_death_check_success_notes">You don't die.</textarea>
+					
+						<h4>
+							<span data-i18n="death-check-critical-success-notes-label">Death Check Critical Success Notes</span>
+						</h4>
+						<textarea name="attr_death_check_critical_success_notes">You don't die. The GM decides if there is some unusual benefit because of the Critical Success.</textarea>
+					
+						<h4>
+							<span data-i18n="death-check-fail-notes-label">Death Check Fail Notes</span>
+						</h4>
+						<textarea name="attr_death_check_fail_notes">You died! When a PC or important NPC is killed in any but the most sudden and thorough fashion, the GM should allow a "dying action." If this is a final blow to the enemy, it should take no more than a turn. (B423)
+**On a Failure of only 1 or 2:** you don't drop dead, but suffer a "mortal wound."" This is a wound so severe that your internal injuries might kill you even after you stop bleeding. (See Mortal Wounds B423)</textarea>
+	
+						<h4>
+							<span data-i18n="death-check-critical-failure-notes-label">Death Check Critical Failure Notes</span>
+						</h4>
+						<textarea name="attr_death_check_critical_failure_notes">You died! When a PC or important NPC is killed in any but the most sudden and thorough fashion, the GM should allow a "dying action." If this is a final blow to the enemy, it should take no more than a turn. The GM decides if there is some unusual disaster because of the Critical Failure.</textarea>
+	
 					</div><!-- end option-container -->
 						
 				</div><!-- end option-column -->
@@ -17604,7 +17911,9 @@ <h4>
 						</div>
 
 						<div style="margin-bottom: 15px;">
-							<button type="action" name="act_wound_notes_reset" class="btn">Reset</button><br />
+							<button type="action" name="act_wound_notes_reset" class="btn">
+								<span data-i18n="reset-button-label">Reset</span>
+							</button><br />
 							<span data-i18n="wound-notes-button-description">If you modified a note, you will not see the most recent rule updates. Press the button to get the recent rules. <b>NOTE:</b> this will replace any notes you made.</span>
 						</div>
 					
@@ -19502,6 +19811,17 @@ <h3> Your feedback is most welcomed! See link below.</h3>
 				</tr>
 				{{/rollTotal() maxNine 1}}
 
+				{{#customMacro}}
+				<tr>
+					<td colspan="2">
+						<div>
+							{{customMacro}}
+						</div>
+					</td>
+				</tr>
+				{{/customMacro}}
+
+
 				{{#rollTotal() displayRollModifierSummary 1}}
 					
 					{{#rollTraitSummary}}
@@ -19868,9 +20188,9 @@ <h3> Your feedback is most welcomed! See link below.</h3>
 	
 	const noop = function () { }; // do nothing callback function.
 	
-	const version = "2.9.16";
+	const version = "2.9.17";
 	
-	const latestChangesDate = "10/2/2023";
+	const latestChangesDate = "10/9/2023";
 	
 	let modCascade = true;
 	
@@ -20732,7 +21052,7 @@ <h3> Your feedback is most welcomed! See link below.</h3>
 		]],
 	]);
 	
-	let rawDefenseNotes = {};
+	let rawRollNotes = {};
 
 	
 	/* -------- async functions -------- */
@@ -20875,7 +21195,7 @@ <h3> Your feedback is most welcomed! See link below.</h3>
 	
 		console.log('********* Sheet Opened *********');
 	
-		rawDefenseNotes = getRawNotes();
+		rawRollNotes = getRawNotes();
 
 		syncRollOptions();
 	
@@ -25131,19 +25451,20 @@ <h3> Your feedback is most welcomed! See link below.</h3>
 	
 	}
 	
-	on("clicked:range_calc_reset", function () {
+	on("clicked:range_calc_reset", async () => {
+
+		await resetRangeCalculator();
+
+		await setAttrsAsync({roll_modifier_types: "ranged"});
+
+		resetRollModifiersToolBox(applyRollModifiers);
 
-		resetRangeCalculator(() => {
-			setAttrs({roll_modifier_types: "range"}, {select: false}, resetRollModifiersToolBox(applyRollModifiers));
-		});
 	
 	});
 	
-	function resetRangeCalculator(callback) {
+	resetRangeCalculator = async () => {
 	
-		callback = callback || noop;
-	
-		setAttrs(
+		await setAttrsAsync(
 			{
 				"firing_distance": 0,
 				"firing_speed_difference": 0,
@@ -25153,7 +25474,7 @@ <h3> Your feedback is most welcomed! See link below.</h3>
 				"firing_braced": 0,
 				"firing_aiming_bonus": 0,
 				"firing_rof": 0,
-			}, null, callback);
+			});
 	
 	}
 	
@@ -29146,6 +29467,53 @@ <h3> Your feedback is most welcomed! See link below.</h3>
 **Diffuse:** Max 2HP Knockback (Exception: Area-effect, cone, and explosion attacks cause normal injury.)
 (Additional Ref: B380)`;
 
+		/* Spell Roll Result Notes */
+		const spellCriticalSuccessNotes = `The spell works especially well. **Details are up to the GM**, who should be both generous and creative. Whatever else occurs, there is never an energy cost if you get a critical success when you cast a spell. B235, M7`;
+
+		const spellFailNotes = `The spell does not work. If success would have cost energy, you lose one energy point; otherwise, you lose nothing. (Exception: You must pay the full energy cost even on a failure for an Information spell; see Information Spells. B235, M7.
+						
+**In Very High Mana Areas**, all Failures are treated as Critical Failures. M6.`;
+
+		const spellCriticalFailureNotes = `You must spend the full energy cost and the spell fails . . . badly! **The GM may** use the Critical Spell Failure Table on B236 or, M7, or improvise some other “backfire” he finds amusing. (B235, M7.)
+					
+**In Very High Mana Areas**, all actual Critical Failures produce spectacular disasters! (M6)
+
+**In Low Mana Areas**, Critical Failures have mild effects or no effect at all. (M6)`;
+
+		/* Fright Check Success/Fail Notes */
+		const frightCheckSuccessNotes = `You suffer no ill effects. (B360)`;
+		const frightCheckCriticalSuccessNotes = `You suffer no ill effects. (B360)  The GM decides if there is some unusual benefit because of the Critical Success.`;
+		const frightCheckFailNotes = `Roll 3d6, add your margin of failure on the Fright Check, and consult the Fright Check Table B360-361. (B360). Also, if using GURPS Horror, add -1 to the Stress or Derangement value as appropriate (H141).`;
+		const frightCheckCriticalFailureNotes = `Roll 3d6, add your margin of failure on the Fright Check, and consult the Fright Check Table B360-361. (B360). Also, if using GURPS Horror, add -3 to the Stress or Derangement value as appropriate (H141). The GM decides if there is some unusual disaster because of the Critical Failure.`;
+
+	    /* Unstun Check Success/Fail Notes */
+		const unstunCheckSuccessNotes = `You recover from stun and can act normally on subsequent turns. (B420)`;
+		const unstunCheckCriticalSuccessNotes = `You recover from stun and can act normally on subsequent turns. (B420) The GM decides if there is some unusual benefit because of the Critical Success.`;
+		const unstunCheckFailNotes = `You remain stunned; your next maneuver must also be Do Nothing, but you get another roll at the end of that turn... and so on, until you recover from stun. (B420)`;
+		const unstunCheckCriticalFailureNotes = `You remain stunned; your next maneuver must also be Do Nothing, but you get another roll at the end of that turn... and so on, until you recover from stun. (B420) The GM decides if there is some unusual disaster because of the Critical Failure.`;
+
+	    /* Knockdown Check Success/Fail Notes */
+		const knockdownCheckSuccessNotes = `You suffer no penalty beyond ordinary shock. (B420)`;
+		const knockdownCheckCriticalSuccessNotes = `You suffer no penalty beyond ordinary shock.`;
+		const knockdownCheckFailNotes = `You're stunned; see Effects of Stun, B420. You fall prone (if you weren't already), and if you were holding anything, you drop it.
+
+**On a Failure by 5 or more:** You fall unconscious! See Recovering from Unconsciousness (B423). Obviously, you fall prone (if you weren't already), and if you were holding anything, you drop it. (B420)`;
+		const knockdownCheckCriticalFailureNotes = `You fall unconscious! See Recovering from Unconsciousness (B423). Obviously, you fall prone (if you weren't already), and if you were holding anything, you drop it. (B420)`;
+
+	    /* Unconscious Check Success/Fail Notes */
+		const unconsciousCheckSuccessNotes = `You are able to remain conscious.`;
+		const unconsciousCheckCriticalSuccessNotes = `You are able to remain conscious. The GM decides if there is some unusual benefit because of the Critical Success.`;
+		const unconsciousCheckFailNotes = `The GM to decide whether you are truly unconscious or just totally incapacitated by pain and injury - but either way, you can't do anything. If you fall unconscious, see Recovering from Unconsciousness (B423).`;
+		const unconsciousCheckCriticalFailureNotes = `The GM to decide whether you are truly unconscious or just totally incapacitated by pain and injury - but either way, you can't do anything. If you fall unconscious, see Recovering from Unconsciousness (B423). The GM decides if there is some unusual disaster because of the Critical Failure.`;
+
+	    /* Death Check Success/Fail Notes */
+		const deathCheckSuccessNotes = `You don't die.`;
+		const deathCheckCriticalSuccessNotes = `You don't die. The GM decides if there is some unusual benefit because of the Critical Success.`;
+		const deathCheckFailNotes = `You died! When a PC or important NPC is killed in any but the most sudden and thorough fashion, the GM should allow a "dying action." If this is a final blow to the enemy, it should take no more than a turn. (B423)
+**On a Failure of only 1 or 2:** you don't drop dead, but suffer a “mortal wound.” This is a wound so severe that your internal injuries might kill you even after you stop bleeding. (See Mortal Wounds B423)`;
+		const deathCheckCriticalFailureNotes = `You died! When a PC or important NPC is killed in any but the most sudden and thorough fashion, the GM should allow a "dying action." If this is a final blow to the enemy, it should take no more than a turn. (B423)
+		**On a Failure of only 1 or 2:** you don't drop dead, but suffer a "mortal wound."" This is a wound so severe that your internal injuries might kill you even after you stop bleeding. (See Mortal Wounds B423)`;
+
 	    const notes = [
 			{ code: "dodge_success_notes", value: dodgeSuccessNotes },
 			{ code: "dodge_critical_success_notes", value: dodgeCriticalSuccessNotes },
@@ -29182,7 +29550,26 @@ <h3> Your feedback is most welcomed! See link below.</h3>
 			{ code: "wound_notes_fatigue", value: woundNotesFatigue },
 			{ code: "wound_notes_toxic", value: woundNotesToxic },
 			{ code: "wound_notes_special", value: woundNotesSpecial }, 
-			{ code: "wound_notes_knockback", value: woundNotesKnockback }
+			{ code: "wound_notes_knockback", value: woundNotesKnockback }, 
+			{ code: "spell_critical_success_notes", value: spellCriticalSuccessNotes }, 
+			{ code: "spell_fail_notes", value: spellFailNotes }, 
+			{ code: "spell_critical_failure_notes", value: spellCriticalFailureNotes },
+			{ code: "fright_check_success_notes", value: frightCheckSuccessNotes },
+			{ code: "fright_check_fail_notes", value: frightCheckFailNotes },
+			{ code: "fright_check_critical_success_notes", value: frightCheckCriticalSuccessNotes }, 
+			{ code: "fright_check_critical_failure_notes", value: frightCheckCriticalFailureNotes },
+			{ code: "unstun_check_success_notes", value: unstunCheckSuccessNotes },
+			{ code: "unstun_check_fail_notes", value: unstunCheckFailNotes },
+			{ code: "unstun_check_critical_success_notes", value: unstunCheckCriticalSuccessNotes }, 
+			{ code: "unstun_check_critical_failure_notes", value: unstunCheckCriticalFailureNotes },
+			{ code: "knockdown_check_success_notes", value: knockdownCheckSuccessNotes },
+			{ code: "knockdown_check_fail_notes", value: knockdownCheckFailNotes },
+			{ code: "knockdown_check_critical_success_notes", value: knockdownCheckCriticalSuccessNotes }, 
+			{ code: "knockdown_check_critical_failure_notes", value: knockdownCheckCriticalFailureNotes },
+			{ code: "unconscious_check_success_notes", value: unconsciousCheckSuccessNotes },
+			{ code: "unconscious_check_fail_notes", value: unconsciousCheckFailNotes },
+			{ code: "unconscious_check_critical_success_notes", value: unconsciousCheckCriticalSuccessNotes }, 
+			{ code: "unconscious_check_critical_failure_notes", value: unconsciousCheckCriticalFailureNotes }
 		];
 	
 		return notes;
@@ -29201,7 +29588,7 @@ <h3> Your feedback is most welcomed! See link below.</h3>
 	 */
 	const getNotesByCode = (code) => {
 	
-		let entry = rawDefenseNotes.find((notes) => notes.code === code);
+		let entry = rawRollNotes.find((notes) => notes.code === code);
 	
 		// if no matches, return no string
 		return (entry != undefined ? entry.value : "");
@@ -29670,7 +30057,7 @@ <h3> Your feedback is most welcomed! See link below.</h3>
 
 		["melee", "ranged", "spell", "skill", "technique", "defense"].forEach(section => {
 	
-			setAttrs({roll_modifier_types: section}, {select: false}, resetRollModifiersToolBox(applyRollModifiers));
+			setAttrs({roll_modifier_types: section}, null, resetRollModifiersToolBox(applyRollModifiers));
 			
 		});
 
@@ -37308,6 +37695,172 @@ <h3> Your feedback is most welcomed! See link below.</h3>
 
 	}
 
+	// reset success/fail notes for spells
+	// when button is clicked, show the updates tab
+	on("clicked:spell_notes_reset", event => {
+
+		resetSpellRollNotes();
+
+	});
+
+	const resetSpellRollNotes = () => {
+
+		const spellCriticalSuccessNotes = getNotesByCode("spell_critical_success_notes");
+
+		const spellFailNotes = getNotesByCode("spell_fail_notes");
+
+		const spellCriticalFailureNotes = getNotesByCode("spell_critical_failure_notes");
+
+		const notesToUpdate = {
+			spell_critical_success_notes: spellCriticalSuccessNotes,
+			spell_fail_notes: spellFailNotes,
+			spell_critical_failure_notes: spellCriticalFailureNotes
+		}
+
+		setAttrs(notesToUpdate);
+		
+	}
+
+	// reset fright check notes
+	on("clicked:fright_check_notes_reset", event => {
+
+		resetFrightCheckRollNotes();
+
+	});
+
+	const resetFrightCheckRollNotes = () => {
+
+		const frightCheckSuccessNotes = getNotesByCode("fright_check_success_notes");
+
+		const frightCheckFailNotes = getNotesByCode("fright_check_fail_notes");
+
+		const frightCheckCriticalSuccessNotes = getNotesByCode("fright_check_critical_success_notes");
+
+		const frightCheckCriticalFailureNotes = getNotesByCode("fright_check_critical_failure_notes");
+
+		const notesToUpdate = {
+			fright_check_success_notes: frightCheckSuccessNotes,
+			fright_check_fail_notes: frightCheckFailNotes,
+			fright_check_critical_success_notes: frightCheckCriticalSuccessNotes,
+			fright_check_critical_failure_notes: frightCheckCriticalFailureNotes
+		}
+
+		setAttrs(notesToUpdate);
+
+	}
+
+	// reset unstun/recover from physical stun check notes
+	on("clicked:unstun_check_notes_reset", event => {
+
+		resetUnstunCheckRollNotes();
+
+	});
+
+	const resetUnstunCheckRollNotes = () => {
+
+		const unstunCheckSuccessNotes = getNotesByCode("unstun_check_success_notes");
+
+		const unstunCheckFailNotes = getNotesByCode("unstun_check_fail_notes");
+
+		const unstunCheckCriticalSuccessNotes = getNotesByCode("unstun_check_critical_success_notes");
+
+		const unstunCheckCriticalFailureNotes = getNotesByCode("unstun_check_critical_failure_notes");
+
+		const notesToUpdate = {
+			unstun_check_success_notes: unstunCheckSuccessNotes,
+			unstun_check_fail_notes: unstunCheckFailNotes,
+			unstun_check_critical_success_notes: unstunCheckCriticalSuccessNotes,
+			unstun_check_critical_failure_notes: unstunCheckCriticalFailureNotes
+		}
+
+		setAttrs(notesToUpdate);
+
+	}
+
+	// reset knockdown/stun check notes
+	on("clicked:knockdown_check_notes_reset", event => {
+
+		resetKnockdownCheckRollNotes();
+
+	});
+
+	const resetKnockdownCheckRollNotes = () => {
+
+		const knockdownCheckSuccessNotes = getNotesByCode("knockdown_check_success_notes");
+
+		const knockdownCheckFailNotes = getNotesByCode("knockdown_check_fail_notes");
+
+		const knockdownCheckCriticalSuccessNotes = getNotesByCode("knockdown_check_critical_success_notes");
+
+		const knockdownCheckCriticalFailureNotes = getNotesByCode("knockdown_check_critical_failure_notes");
+
+		const notesToUpdate = {
+			knockdown_check_success_notes: knockdownCheckSuccessNotes,
+			knockdown_check_fail_notes: knockdownCheckFailNotes,
+			knockdown_check_critical_success_notes: knockdownCheckCriticalSuccessNotes,
+			knockdown_check_critical_failure_notes: knockdownCheckCriticalFailureNotes
+		}
+
+		setAttrs(notesToUpdate);
+
+	}
+
+	// reset unconscious check notes
+	on("clicked:unconscious_check_notes_reset", event => {
+
+		resetUnconsciousCheckRollNotes();
+
+	});
+
+	const resetUnconsciousCheckRollNotes = () => {
+
+		const unconsciousCheckSuccessNotes = getNotesByCode("unconscious_check_success_notes");
+
+		const unconsciousCheckFailNotes = getNotesByCode("unconscious_check_fail_notes");
+
+		const unconsciousCheckCriticalSuccessNotes = getNotesByCode("unconscious_check_critical_success_notes");
+
+		const unconsciousCheckCriticalFailureNotes = getNotesByCode("unconscious_check_critical_failure_notes");
+
+		const notesToUpdate = {
+			unconscious_check_success_notes: unconsciousCheckSuccessNotes,
+			unconscious_check_fail_notes: unconsciousCheckFailNotes,
+			unconscious_check_critical_success_notes: unconsciousCheckCriticalSuccessNotes,
+			unconscious_check_critical_failure_notes: unconsciousCheckCriticalFailureNotes
+		}
+
+		setAttrs(notesToUpdate);
+
+	}
+
+	// reset death check notes
+	on("clicked:death_check_notes_reset", event => {
+
+		resetDeathCheckRollNotes();
+
+	});
+
+	const resetDeathCheckRollNotes = () => {
+
+		const deathCheckSuccessNotes = getNotesByCode("death_check_success_notes");
+
+		const deathCheckFailNotes = getNotesByCode("death_check_fail_notes");
+
+		const deathCheckCriticalSuccessNotes = getNotesByCode("death_check_critical_success_notes");
+
+		const deathCheckCriticalFailureNotes = getNotesByCode("death_check_critical_failure_notes");
+
+		const notesToUpdate = {
+			death_check_success_notes: deathCheckSuccessNotes,
+			death_check_fail_notes: deathCheckFailNotes,
+			death_check_critical_success_notes: deathCheckCriticalSuccessNotes,
+			death_check_critical_failure_notes: deathCheckCriticalFailureNotes
+		}
+
+		setAttrs(notesToUpdate);
+
+	}
+
 	// resync character sheet
 	on("clicked:resync", event => {
 	
diff --git a/GURPS/translation.json b/GURPS/translation.json
index f0412745f1c..36eb2e93755 100644
--- a/GURPS/translation.json
+++ b/GURPS/translation.json
@@ -445,6 +445,7 @@
   "attributes-intelligence-tooltip": "Intelligence 20pts/level -Unmodified:",
   "abbreviation-health": "HT",
   "attributes-health-tooltip": "Health 10pts/level - Unmodified:",
+  "attributes-health-detailed-tooltip": "With the advent of the new Success/Fail results for the sections of <b>Unstun</b>, (Roll to check if recovering from a Stun result from the previous tun), <b>K Down</b> (Knockdown and Stunning), <b>Unconsciousness</b>, and <b>Death</b>, the HT roll should not be used for these. Instead, you should be using those specific sections as these rolls will have specific Success/Fail results associated with said topics.",
   "abbreviation-perception": "Per",
   "attributes-perception-tooltip": "Perception: Based on Intelligence<br>5pts/level.<br>Unmodified: <span name=\"attr_perception_base\"></span>",
   "attribute-vision": "Vision",
@@ -465,9 +466,9 @@
   "attribute-unstun": "Unstun",
   "attribute-unstun-tooltip": "Recover from Physical Stun (B380), based on HT (Health)<br />Roll at the end of your turn after you Do Nothing.<br /><i>Notes:</i> (These should be entered as a MOD)<br />● Fit +1 to Unstun, Very Fit +3 to Unstun.",
   "abbreviation-knock-down": "K Down",
-  "attribute-knock-down-tooltip": "Knockdown and Stunning check (B420), based on HT (Health).<br />Roll <span style=\"font-style: italic; font-weight: bold; text-decoration: underline;\">immediately</span> whenever the following happens:<br /><ul><li>You suffer a Major Wound (B420) - This is any <span style=\"font-style: italic; font-weight: bold; text-decoration: underline;\">single injury</span> that inflicts a wound in excess of ½ your HP.</li><li>You suffer any Crippling Injury (B420-421).</li><li>Whenever you are struck in the Head (Skull, Face, or Eye) or Vitals for enough injury to cause a Shock (B419) penalty.</li></ul><span style=\"font-style: italic;\">Modifiers:</span><br /><ul><li>- 5 for a Major Wound (B420) to the Face or Vitals (or to the Groin on a humanoid male).</li><li>- 10 for a Major Wound (B420) to the Skull or Eye.</li><li><i>Notes:</i> (These should be entered as a MOD)</li><li>High Pain Threshold adds +3 to Knockdown (Enter as a MOD with a value of 3)</li><li>Low Pain Threshold as -4 for Knockdown.</li><li>Fit +1 to Knockdown and Stunning, Very Fit +3 to Knockdown and Stunning.</li></ul>",
+  "attribute-knock-down-tooltip": "Knockdown and Stunning check (B420), based on HT (Health).<br />Roll <span style=\"font-style: italic; font-weight: bold; text-decoration: underline;\">immediately</span> whenever the following happens:<br /><ul><li>You suffer a Major Wound (B420) - This is any <span style=\"font-style: italic; font-weight: bold; text-decoration: underline;\">single injury</span> that inflicts a wound in excess of ½ your HP.</li><li>You suffer any Crippling Injury (B420-421).</li><li>Whenever you are struck in the Head (Skull, Face, or Eye) or Vitals for enough injury to cause a Shock (B419) penalty.</li></ul><span style=\"font-style: italic;\">Modifiers:</span><br /><ul><li>- 5 for a Major Wound (B420) to the Face or Vitals (or to the Groin on a humanoid male).</li><li>- 10 for a Major Wound (B420) to the Skull or Eye.</li><li><i>Notes:</i> (These should be entered as a MOD)</li><li>High Pain Threshold adds +3 to Knockdown (Enter as a MOD with a value of 3)</li><li>Low Pain Threshold as -4 for Knockdown.</li><li>Fit +1 to Knockdown and Stunning, Very Fit +3 to Knockdown and Stunning.</li><li>Those with Injury Tolerance (B60) may suffer reduced effects. (B420)</li></ul>",
   "abbreviation-unconscious": "Unc.",
-  "attribute-unconscious-check-tooltip": "Unconscious Check, based on Health<br />Roll <span style=\"font-style: italic; font-weight: bold; text-decoration: underline;\">immediately</span> when HP first reaches zero or less. (Per Kromm).<br />At the beginning of your turn and when HP is zero or less, roll per turn to take an Active Action.<br>-1 per full multiple of HP below zero.<br /><i>Notes:</i> (These should be entered as a MOD)<br />Hard/Easy to Subdue: Gives +/- per level to Unconscious Check<br>Fit +1 to Unc. Check . Very Fit +2 to Unc. Check",
+  "attribute-unconscious-check-tooltip": "Unconscious Check, based on Health<br />Roll to stay conscious.<br />Roll <span style=\"font-style: italic; font-weight: bold; text-decoration: underline;\">immediately</span> when HP first reaches zero or less. (Per Kromm).<br />At the beginning of your turn and when HP is zero or less, roll per turn to take an Active Action.<br>-1 per full multiple of HP below zero.<br /><i>Notes:</i> (These should be entered as a MOD)<br />Hard/Easy to Subdue: Gives +/- per level to Unconscious Check<br>Fit +1 to Unc. Check . Very Fit +2 to Unc. Check",
   "abbreviation-death-check": "Death",
   "attribute-death-check-tooltip": "Death Check (B423), based on HT (Health).<br>On damage taken: <span style=\"font-style: italic; font-weight: bold; text-decoration: underline;\">Immediately Roll</span> a Death Check if you are<br>at-1xHP or more.<br>Roll again each time you suffer injury equal to a further<br>multiple of your HP. (-2xHP, -3xHP, -4xHP) <br>Immediate Death at -5xHP<br /><i>Notes:</i> (These should be entered as a MOD)<br />Hard/Easy to Kill: Gives +/- per level to a Death Check<br>Fit +1 to Death Check . Very Fit +2 to Death Check",
   "speed-label": "Speed",
@@ -545,8 +546,14 @@
   "shift-slightly-tooltip": "The weight of an object that the character<br>can shift slightly on a floor.",
   "notes-label": "Notes",
   "notes-custom-macro-label": "Notes & Custom Macro",
-  "custom-macro-label": "Custom Macro",
-  "skills-custom-macro-tooltip": "Enter a custom macro to apply to all skill rolls.",
+  "custom-macro-skills-label": "Custom Macro for Skills",
+  "custom-macro-skills-tooltip": "Enter a custom macro to apply to all skill rolls.",
+  "custom-macro-defense-label": "Custom Macro for Defense",
+  "custom-macro-defense-tooltip": "Enter a custom macro to apply to all defense rolls.",
+  "custom-macro-melee-label": "Custom Macro for Melee",
+  "custom-macro-melee-tooltip": "Enter a custom macro to apply to all melee rolls.",
+  "custom-macro-ranged-label": "Custom Macro for Ranged",
+  "custom-macro-ranged-tooltip": "Enter a custom macro to apply to all ranged rolls.",
   "encumbrance-label": "Encumbrance",
   "load-label": "Load",
   "encumbrance-move-score-tooltip": "Note: The Move score automatically adjusts for Encumbrance<br>and for HP and/or FP loss below 1/3. (B419, B426).<br><b>STEP:</b> The number in parentheses is the step distance.",
@@ -1235,7 +1242,40 @@
   "show-notes-in-roll-template-label": "Show notes in roll template",
   "editable-wound-modifier-notes-label": "Editable Wound Modifier Notes",
   "editable-wound-modifier-notes-description": "Initial wound modifier notes based on GURPS 4th Edition - Campaigns",
+  "reset-button-label": "Reset",
   "wound-notes-button-description": "If you modified a note, you will not see the most recent rule updates. Press the button to get the recent rules. <b>NOTE:</b> this will replace any notes you made.",
+  "reset-spell-notes-button-label": "Reset Spell Notes",
+  "spell-notes-button-description": "If you modified a note, you will not see the most recent rule updates. Press the button to get the recent rules. <b>NOTE:</b> this will replace any notes you made.",
+  "reset-fright-check-button-label": "Reset Fright Check Notes",
+  "fright-check-notes-button-description": "If you modified a note, you will not see the most recent rule updates. Press the button to get the recent rules. <b>NOTE:</b> this will replace any notes you made.",
+  "fright-check-success-notes-label": "Fright Check Success Notes",
+  "fright-check-critical-success-notes-label": "Fright Check Critical Success Notes",
+  "fright-check-fail-notes-label": "Fright Check Fail Notes",
+  "fright-check-critical-failure-notes-label": "Fright Check Critical Failure Notes",
+  "reset-unstun-check-button-label": "Reset Unstun Check Notes",
+  "unstun-check-notes-button-description": "If you modified a note, you will not see the most recent rule updates. Press the button to get the recent rules. <b>NOTE:</b> this will replace any notes you made.",
+  "unstun-check-success-notes-label": "Unstun Check Success Notes",
+  "unstun-check-critical-success-notes-label": "Unstun Check Critical Success Notes",
+  "unstun-check-fail-notes-label": "Unstun Check Fail Notes",
+  "unstun-check-critical-failure-notes-label": "Unstun Check Critical Failure Notes",
+  "reset-knockdown-check-button-label": "Reset Knockdown Check Notes",
+  "knockdown-check-notes-button-description": "If you modified a note, you will not see the most recent rule updates. Press the button to get the recent rules. <b>NOTE:</b> this will replace any notes you made.",
+  "knockdown-check-success-notes-label": "Knockdown Check Success Notes",
+  "knockdown-check-critical-success-notes-label": "Knockdown Check Critical Success Notes",
+  "knockdown-check-fail-notes-label": "Knockdown Check Fail Notes",
+  "knockdown-check-critical-failure-notes-label": "Knockdown Check Critical Failure Notes",
+  "reset-unconscious-check-button-label": "Reset Unconscious Check Notes",
+  "unconscious-check-notes-button-description": "If you modified a note, you will not see the most recent rule updates. Press the button to get the recent rules. <b>NOTE:</b> this will replace any notes you made.",
+  "unconscious-check-success-notes-label": "Unconscious Check Success Notes",
+  "unconscious-check-critical-success-notes-label": "Unconscious Check Critical Success Notes",
+  "unconscious-check-fail-notes-label": "Unconscious Check Fail Notes",
+  "unconscious-check-critical-failure-notes-label": "Unconscious Check Critical Failure Notes",
+  "reset-death-check-button-label": "Reset Death Check Notes",
+  "death-check-notes-button-description": "If you modified a note, you will not see the most recent rule updates. Press the button to get the recent rules. <b>NOTE:</b> this will replace any notes you made.",
+  "death-check-success-notes-label": "Death Check Success Notes",
+  "death-check-critical-success-notes-label": "Death Check Critical Success Notes",
+  "death-check-fail-notes-label": "Death Check Fail Notes",
+  "death-check-critical-failure-notes-label": "Death Check Critical Failure Notes",
   "cutting-label": "Cutting",
   "impaling-label": "Impaling",
   "crushing-label": "Crushing",