diff --git a/GURPS/gurps.html b/GURPS/gurps.html
index 94d13030b3..63924f9701 100644
--- a/GURPS/gurps.html
+++ b/GURPS/gurps.html
@@ -83,14 +83,14 @@
 						<div class="item item1">
 
 							<div class="block add-min-height">
-								<input type="number" readonly="readonly" value="0" name="attr_roll_modifier" title="macro name: @{roll_modifier}" />
+								<input type="number" readonly="readonly" value="0" name="attr_roll_modifier" title="Macro: @{NAME|roll_modifier}" />
 								<span data-i18n="total-roll-modifier-label">Total Modifier</span>
 							</div>
 
 							<div class="block">
 								<div class="item item1">
 									<label>
-										<select name="attr_shock_penalty" class="number-only-width" title="macro name: @{shock_penalty}">
+										<select name="attr_shock_penalty" class="number-only-width" title="Macro: @{NAME|shock_penalty}">
 											<option>0</option>
 											<option>-1</option>
 											<option>-2</option>
@@ -124,7 +124,7 @@
 
 							<div class="block">
 								<label>
-									<input type="number" value="0" step="1" name="attr_dialog_custom_roll_modifier" title="macro name: @{dialog_custom_roll_modifier}" />
+									<input type="number" value="0" step="1" name="attr_dialog_custom_roll_modifier" title="Macro: @{NAME|dialog_custom_roll_modifier}" />
 									<span data-i18n="custom-modifier-label">Custom Modifier.</span>
 								</label>
 							</div>
@@ -157,7 +157,7 @@
 						<div class="item item1">
 							<label>
 								<div>
-									<select name="attr_night_vision" class="number-only-width" title="macro name: @{night_vision}">
+									<select name="attr_night_vision" class="number-only-width" title="Macro: @{NAME|night_vision}">
 										<option>0</option>
 										<option>1</option>
 										<option>2</option>
@@ -184,7 +184,7 @@
 						<div class="item item2">
 							<label>
 								<div>
-									<input type="checkbox" name="attr_has_dark_vision" value="1" title="macro name: @{has_dark_vision}" />
+									<input type="checkbox" name="attr_has_dark_vision" value="1" title="Macro: @{NAME|has_dark_vision}" />
 								</div>
 								<div>
 									<div class="tooltip">
@@ -200,7 +200,7 @@
 						<div class="item item3">
 							<label>
 								<div>
-									<input type="checkbox" name="attr_is_used_to_blindness" value="1" title="macro name: @{is_used_to_blindness}" />
+									<input type="checkbox" name="attr_is_used_to_blindness" value="1" title="Macro: @{NAME|is_used_to_blindness}" />
 								</div>
 								<div>
 									<div class="tooltip">
@@ -216,7 +216,7 @@
 						<div class="item item4">
 							<label>
 								<div>
-									<input type="checkbox" name="attr_has_high_pain_threshold" value="1" title="macro name: @{has_high_pain_threshold}" />
+									<input type="checkbox" name="attr_has_high_pain_threshold" value="1" title="Macro: @{NAME|has_high_pain_threshold}" />
 								</div>
 								<div>
 									<div class="tooltip">
@@ -232,7 +232,7 @@
 						<div class="item item5">
 							<label>
 								<div>
-									<input type="checkbox" name="attr_has_low_pain_threshold" value="1" title="macro name: @{has_low_pain_threshold}" />
+									<input type="checkbox" name="attr_has_low_pain_threshold" value="1" title="Macro: @{NAME|has_low_pain_threshold}" />
 								</div>
 								<div>
 									<div class="tooltip">
@@ -280,7 +280,7 @@
 									</div>
 								</div>
 								<div>
-									<input type="number" name="attr_ranged_accuracy_bonus" value="0" min="0" step="1" title="macro name: @{ranged_accuracy_bonus}" />
+									<input type="number" name="attr_ranged_accuracy_bonus" value="0" min="0" step="1" title="Macro: @{NAME|ranged_accuracy_bonus}" />
 								</div>
 							</div>
 
@@ -294,7 +294,7 @@
 									</div>
 								</div>
 								<div>
-									<input type="number" name="attr_ranged_elevation" value="0" step="1" title="macro name: @{ranged_elevation}" />
+									<input type="number" name="attr_ranged_elevation" value="0" step="1" title="Macro: @{NAME|ranged_elevation}" />
 								</div>
 							</div>
 							
@@ -308,7 +308,7 @@
 									</div>
 								</div>
 								<div>
-									<input type="number" name="attr_ranged_range_speed" value="0" min="0" step="1" title="macro name: @{ranged_range_speed}" />
+									<input type="number" name="attr_ranged_range_speed" value="0" min="0" step="1" title="Macro: @{NAME|ranged_range_speed}" />
 									<input type="hidden" name="attr_ranged_range_speed_modifier" value="0" />
 									<span name="attr_ranged_range_speed_modifier"></span>
 								</div>
@@ -325,7 +325,7 @@
 									</div>
 								</div>
 								<div>
-									<select name="attr_ranged_aiming_bonus" title="macro name: @{ranged_aiming_bonus}">
+									<select name="attr_ranged_aiming_bonus" title="Macro: @{NAME|ranged_aiming_bonus}">
 										<option value="0" selected="selected">+0</option>
 										<option value="1">2 turns: +1</option>
 										<option value="2">3+ turns: +2</option>
@@ -353,7 +353,7 @@
 									</div>
 								</div>
 								<div>
-									<input type="number" name="attr_ranged_rof" value="1" min="1" step="1" title="macro name: @{ranged_rof}" />
+									<input type="number" name="attr_ranged_rof" value="1" min="1" step="1" title="Macro: @{NAME|ranged_rof}" />
 									<input type="hidden" name="attr_ranged_rof_modifier" value="0" />
 									<span name="attr_ranged_rof_modifier"></span>
 								</div>
@@ -369,7 +369,7 @@
 									</div>
 								</div>
 								<div>
-									<select name="attr_ranged_scope_bonus" title="macro name: @{ranged_scope_bonus}">
+									<select name="attr_ranged_scope_bonus" title="Macro: @{NAME|ranged_scope_bonus}">
 										<option value="0">+0</option>
 										<option value="1">+1</option>
 										<option value="2">+2</option>
@@ -389,7 +389,7 @@
 									</div>
 								</div>
 								<div>
-									<select name="attr_ranged_vehicle_targeting_bonus" title="macro name: @{ranged_vehicle_targeting_bonus}">
+									<select name="attr_ranged_vehicle_targeting_bonus" title="Macro: @{NAME|ranged_vehicle_targeting_bonus}">
 										<option value="0">+0</option>
 										<option value="1">+1</option>
 										<option value="2">+2</option>
@@ -408,7 +408,7 @@
 									</div>
 								</div>
 								<div>
-									<input type="checkbox" name="attr_ranged_laser_sight" value="1" title="macro name: @{ranged_laser_sight}" />
+									<input type="checkbox" name="attr_ranged_laser_sight" value="1" title="Macro: @{NAME|ranged_laser_sight}" />
 								</div>
 							</div>
 
@@ -422,7 +422,7 @@
 									</div>
 								</div>
 								<div>
-									<input type="hidden" name="attr_ranged_targeting_system_modifier" value="0" title="macro name: @{ranged_targeting_system_modifier}" />
+									<input type="hidden" name="attr_ranged_targeting_system_modifier" value="0" title="Macro: @{NAME|ranged_targeting_system_modifier}" />
 									<span name="attr_ranged_targeting_system_modifier"></span>
 								</div>
 							</div>
@@ -834,7 +834,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_has_shield" value="1" title="macro name: @{has_shield}" />
+											<input type="checkbox" name="attr_has_shield" value="1" title="Macro: @{NAME|has_shield}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -850,7 +850,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_target_chink_in_armor" value="1" title="macro name: @{target_chink_in_armor}" />
+											<input type="checkbox" name="attr_target_chink_in_armor" value="1" title="Macro: @{NAME|target_chink_in_armor}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -880,7 +880,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_target_light_cover" value="1" title="macro name: @{target_light_cover}" />
+											<input type="checkbox" name="attr_target_light_cover" value="1" title="Macro: @{NAME|target_light_cover}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -902,7 +902,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_target_down" value="1" title="macro name: @{target_down}" />
+											<input type="checkbox" name="attr_target_down" value="1" title="Macro: @{NAME|target_down}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -924,7 +924,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_target_partly_exposed" value="1" title="macro name: @{target_partly_exposed}" />
+											<input type="checkbox" name="attr_target_partly_exposed" value="1" title="Macro: @{NAME|target_partly_exposed}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -946,7 +946,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="number" name="attr_target_intervening_figures" value="0" min="0" step="1" title="macro name: @{target_intervening_figures}" />
+											<input type="number" name="attr_target_intervening_figures" value="0" min="0" step="1" title="Macro: @{NAME|target_intervening_figures}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1007,7 +1007,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_melee_maneuver" value="step-attack" checked="checked" title="macro name: @{melee_maneuver}" />
+											<input type="radio" name="attr_melee_maneuver" value="step-attack" checked="checked" title="Macro: @{NAME|melee_maneuver}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1023,7 +1023,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_melee_maneuver" value="step-feint" title="macro name: @{melee_maneuver}" />
+											<input type="radio" name="attr_melee_maneuver" value="step-feint" title="Macro: @{NAME|melee_maneuver}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1039,7 +1039,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_melee_maneuver" value="move-attack" title="macro name: @{melee_maneuver}" />
+											<input type="radio" name="attr_melee_maneuver" value="move-attack" title="Macro: @{NAME|melee_maneuver}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1055,7 +1055,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_melee_maneuver" value="move-wild-swing" title="macro name: @{melee_maneuver}" />
+											<input type="radio" name="attr_melee_maneuver" value="move-wild-swing" title="Macro: @{NAME|melee_maneuver}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1071,7 +1071,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_melee_maneuver" value="move-slam" title="macro name: @{melee_maneuver}" />
+											<input type="radio" name="attr_melee_maneuver" value="move-slam" title="Macro: @{NAME|melee_maneuver}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1087,7 +1087,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_melee_maneuver" value="flying-tackle" title="macro name: @{melee_maneuver}" />
+											<input type="radio" name="attr_melee_maneuver" value="flying-tackle" title="Macro: @{NAME|melee_maneuver}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1103,7 +1103,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_melee_maneuver" value="pounce" title="macro name: @{melee_maneuver}" />
+											<input type="radio" name="attr_melee_maneuver" value="pounce" title="Macro: @{NAME|melee_maneuver}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1127,7 +1127,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_melee_all_out_attack" value="0" checked="checked" title="macro name: @{melee_all_out_attack}" />
+											<input type="radio" name="attr_melee_all_out_attack" value="0" checked="checked" title="Macro: @{NAME|melee_all_out_attack}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1143,7 +1143,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_melee_all_out_attack" value="determined" title="macro name: @{melee_all_out_attack}" />
+											<input type="radio" name="attr_melee_all_out_attack" value="determined" title="Macro: @{NAME|melee_all_out_attack}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1159,7 +1159,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_melee_all_out_attack" value="double" title="macro name: @{melee_all_out_attack}" />
+											<input type="radio" name="attr_melee_all_out_attack" value="double" title="Macro: @{NAME|melee_all_out_attack}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1175,7 +1175,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_melee_all_out_attack" value="feint" title="macro name: @{melee_all_out_attack}" />
+											<input type="radio" name="attr_melee_all_out_attack" value="feint" title="Macro: @{NAME|melee_all_out_attack}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1191,7 +1191,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_melee_all_out_attack" value="strong" title="macro name: @{melee_all_out_attack}" />
+											<input type="radio" name="attr_melee_all_out_attack" value="strong" title="Macro: @{NAME|melee_all_out_attack}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1219,7 +1219,7 @@
 									</div>
 									
 									<div>
-										<select name="attr_deceptive_strike" title="macro name: @{deceptive_strike}">
+										<select name="attr_deceptive_strike" title="Macro: @{NAME|deceptive_strike}">
 											<option value="0" selected="selected">None</option>
 											<option value="-2">-2 hit, -1 defense</option>
 											<option value="-4">-4 hit, -2 defense</option>
@@ -1239,7 +1239,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_evaluate" title="macro name: @{evaluate}">
+											<select name="attr_evaluate" title="Macro: @{NAME|evaluate}">
 												<option value="0" selected="selected">0</option>
 												<option value="1">+1</option>
 												<option value="2">+2</option>
@@ -1261,7 +1261,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_wild_swing" value="1" title="macro name: @{wild_swing}" />
+											<input type="checkbox" name="attr_wild_swing" value="1" title="Macro: @{NAME|wild_swing}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1279,7 +1279,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_rapid_strike" value="1" title="macro name: @{rapid_strike}" />
+											<input type="checkbox" name="attr_rapid_strike" value="1" title="Macro: @{NAME|rapid_strike}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1297,7 +1297,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_flurry_of_blows" value="1" title="macro name: @{flurry_of_blows}" />
+											<input type="checkbox" name="attr_flurry_of_blows" value="1" title="Macro: @{NAME|flurry_of_blows}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1315,7 +1315,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_rapid_strike_master" value="1" title="macro name: @{rapid_strike_master}" />
+											<input type="checkbox" name="attr_rapid_strike_master" value="1" title="Macro: @{NAME|rapid_strike_master}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1333,7 +1333,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_attack_from_above" value="1" title="macro name: @{attack_from_above}" />
+											<input type="checkbox" name="attr_attack_from_above" value="1" title="Macro: @{NAME|attack_from_above}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1351,7 +1351,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_mighty_blow" value="1" title="macro name: @{might_blow}" />
+											<input type="checkbox" name="attr_mighty_blow" value="1" title="Macro: @{NAME|might_blow}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1379,7 +1379,7 @@
 										</div>
 									</div>
 									<div>
-										<select name="attr_posture" title="macro name: @{posture}">
+										<select name="attr_posture" title="Macro: @{NAME|posture}">
 											<option value="0" selected="selected">Upright: +0</option>
 											<option value="crawling">Crawling: -4</option>
 											<option value="prone">Prone: -4</option>
@@ -1401,7 +1401,7 @@
 									</div>
 								
 									<div>
-										<select name="attr_melee_height_difference" title="macro name: @{melee_height_difference}">
+										<select name="attr_melee_height_difference" title="Macro: @{NAME|melee_height_difference}">
 											<option value="0" selected="selected">0-1 feet: +0</option>
 											<option value="2-higher-legs-feet">Higher, 1-2 feet, Legs/feet: -2</option>
 											<option value="2-higher-head-neck">Higher, 1-2 feet, Head/Neck: +2</option>
@@ -1431,7 +1431,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_improvised_weapon" title="macro name: @{improvised_weapon}">
+											<select name="attr_improvised_weapon" title="Macro: @{NAME|improvised_weapon}">
 												<option value="0" selected="selected">0</option>
 												<option>-1</option>
 												<option>-2</option>
@@ -1452,7 +1452,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_tactics" title="macro name: @{tactics}">
+											<select name="attr_tactics" title="Macro: @{NAME|tactics}">
 												<option value="0" selected="selected">0</option>
 												<option>+1</option>
 												<option>+2</option>
@@ -1474,7 +1474,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_backstab" value="1" title="macro name: @{backstab}" />
+											<input type="checkbox" name="attr_backstab" value="1" title="Macro: @{NAME|backstab}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1511,7 +1511,7 @@
 										</div>
 									</div>
 									<div>
-										<select name="attr_weapon_hand" title="macro name: @{weapon_hand}">
+										<select name="attr_weapon_hand" title="Macro: @{NAME|weapon_hand}">
 											<option value="0" selected="selected">Primary hand: +0</option>
 											<option value="off-hand">Off-hand: -4</option>
 											<option value="dual-weapon-primary-hand">Dual-Weapon Primary Hand: -4</option>
@@ -1523,7 +1523,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_off_hand_training" title="macro name: @{off_hand_training}">
+											<select name="attr_off_hand_training" title="Macro: @{NAME|off_hand_training}">
 												<option value="0" selected="selected">0</option>
 												<option>+1</option>
 												<option>+2</option>
@@ -1545,7 +1545,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_dual_weapon_training" title="macro name: @{dual_weapon_training}">
+											<select name="attr_dual_weapon_training" title="Macro: @{NAME|dual_weapon_training}">
 												<option value="0" selected="selected">0</option>
 												<option>+1</option>
 												<option>+2</option>
@@ -1581,7 +1581,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_mounted_skill_difference" title="macro name: @{mounted_skill_difference}">
+											<select name="attr_mounted_skill_difference" title="Macro: @{NAME|mounted_skill_difference}">
 												<option value="0" selected="selected">0</option>
 												<option>-1</option>
 												<option>-2</option>
@@ -1609,7 +1609,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_mount_attacked" value="1" title="macro name: @{mount_attacked}" />
+											<input type="checkbox" name="attr_mount_attacked" value="1" title="Macro: @{NAME|mount_attacked}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1625,7 +1625,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_mount_has_velocity" value="1" title="macro name: @{mount_has_velocity" />
+											<input type="checkbox" name="attr_mount_has_velocity" value="1" title="Macro: @{NAME|mount_has_velocity" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1666,7 +1666,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_ranged_maneuver" value="step-attack" checked="checked" title="macro name: @{ranged_maneuver}" />
+											<input type="radio" name="attr_ranged_maneuver" value="step-attack" checked="checked" title="Macro: @{NAME|ranged_maneuver}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1682,7 +1682,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_ranged_maneuver" value="move-attack-ranged" title="macro name: @{ranged_maneuver}" />
+											<input type="radio" name="attr_ranged_maneuver" value="move-attack-ranged" title="Macro: @{NAME|ranged_maneuver}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1703,7 +1703,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_ranged_maneuver" value="all-out-determined" title="macro name: @{ranged_maneuver}" />
+											<input type="radio" name="attr_ranged_maneuver" value="all-out-determined" title="Macro: @{NAME|ranged_maneuver}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1719,7 +1719,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_ranged_maneuver" value="all-out-suppression" title="macro name: @{ranged_maneuver}" />
+											<input type="radio" name="attr_ranged_maneuver" value="all-out-suppression" title="Macro: @{NAME|ranged_maneuver}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1743,7 +1743,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_ranged_braced" value="1" title="macro name: @{ranged_braced}" />
+											<input type="checkbox" name="attr_ranged_braced" value="1" title="Macro: @{NAME|ranged_braced}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1759,7 +1759,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_ranged_popup" value="1" title="macro name: @{ranged_popup}" />
+											<input type="checkbox" name="attr_ranged_popup" value="1" title="Macro: @{NAME|ranged_popup}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1872,7 +1872,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_ranged_opportunity_fire_target" value="1" title="macro name: @{ranged_opportunity_fire_target}" />
+											<input type="checkbox" name="attr_ranged_opportunity_fire_target" value="1" title="Macro: @{NAME|ranged_opportunity_fire_target}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -1903,7 +1903,7 @@
 										</div>
 									</div>
 									<div>
-										<select name="attr_ranged_weapon_hand" title="macro name: @{ranged_weapon_hand}">
+										<select name="attr_ranged_weapon_hand" title="Macro: @{NAME|ranged_weapon_hand}">
 											<option value="0" selected="selected">Primary hand: +0</option>
 											<option value="off-hand">Off-hand: -4</option>
 											<option value="dual-weapon-primary-hand">Dual-Weapon Primary Hand: -4</option>
@@ -1915,7 +1915,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_ranged_off_hand_training" title="macro name: @{ranged_off_hand_training}">
+											<select name="attr_ranged_off_hand_training" title="Macro: @{NAME|ranged_off_hand_training}">
 												<option value="0" selected="selected">0</option>
 												<option>+1</option>
 												<option>+2</option>
@@ -1937,7 +1937,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_ranged_dual_weapon_training" title="macro name: @{dual_weapon_training}">
+											<select name="attr_ranged_dual_weapon_training" title="Macro: @{NAME|dual_weapon_training}">
 												<option value="0" selected="selected">0</option>
 												<option>+1</option>
 												<option>+2</option>
@@ -1959,7 +1959,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_ranged_tactics" title="macro name: @{ranged_tactics}">
+											<select name="attr_ranged_tactics" title="Macro: @{NAME|ranged_tactics}">
 												<option value="0" selected="selected">0</option>
 												<option>+1</option>
 												<option>+2</option>
@@ -1981,7 +1981,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_ranged_backstab" value="1" title="macro name: @{ranged_backstab}" />
+											<input type="checkbox" name="attr_ranged_backstab" value="1" title="Macro: @{NAME|ranged_backstab}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2013,7 +2013,7 @@
 
 									<label>
 										<div>
-											<input type="number" name="attr_vehicle_stability_rating" value="0" min="0" step="1" title="macro name: @{vehicle_stability_rating}" />
+											<input type="number" name="attr_vehicle_stability_rating" value="0" min="0" step="1" title="Macro: @{NAME|vehicle_stability_rating}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2031,7 +2031,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_vehicle_weapon_unstabilized" value="1" title="macro name: @{vehicle_weapon_unstabilized}" />
+											<input type="checkbox" name="attr_vehicle_weapon_unstabilized" value="1" title="Macro: @{NAME|vehicle_weapon_unstabilized}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2055,7 +2055,7 @@
 										</div>
 									</div>
 									<div>
-										<select name="attr_ranged_vehicle_conditions" title="macro name: @{ranged_vehicle_conditions}">
+										<select name="attr_ranged_vehicle_conditions" title="Macro: @{NAME|ranged_vehicle_conditions}">
 											<option value="0" selected="selected">Select</option>
 											<option value="air-handheld">-1 : Air vehicle. Using handheld weapon.</option>
 											<option value="ground-good-road-handheld">-1 : Ground vehicle, good road. Using handheld weapon.</option>
@@ -2115,7 +2115,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_ranged_over_under_mount" value="1" title="macro name: @{ranged_over_under_mount}" />
+											<input type="checkbox" name="attr_ranged_over_under_mount" value="1" title="Macro: @{NAME|ranged_over_under_mount}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2133,7 +2133,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_ranged_vehicle_dodge" value="1" title="macro name: @{ranged_vehicle_dodge}" />
+											<input type="checkbox" name="attr_ranged_vehicle_dodge" value="1" title="Macro: @{NAME|ranged_vehicle_dodge}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2151,7 +2151,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_ranged_air_vehicle_dodge" value="1" title="macro name: @{ranged_air_vehicle_dodge}" />
+											<input type="checkbox" name="attr_ranged_air_vehicle_dodge" value="1" title="Macro: @{NAME|ranged_air_vehicle_dodge}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2195,7 +2195,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_defense_maneuver" value="step-attack" checked="checked" title="macro name: @{defense_maneuver}" />
+											<input type="radio" name="attr_defense_maneuver" value="step-attack" checked="checked" title="Macro: @{NAME|defense_maneuver}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2211,7 +2211,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_defense_maneuver" value="all-out-defense-increased" title="macro name: @{defense_maneuver}" />
+											<input type="radio" name="attr_defense_maneuver" value="all-out-defense-increased" title="Macro: @{NAME|defense_maneuver}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2227,7 +2227,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_defense_maneuver" value="all-out-defense-double" title="macro name: @{defense_maneuver}" />
+											<input type="radio" name="attr_defense_maneuver" value="all-out-defense-double" title="Macro: @{NAME|defense_maneuver}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2243,7 +2243,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="radio" name="attr_defense_maneuver" value="moved-attack" title="macro name: @{defense_maneuver}" />
+											<input type="radio" name="attr_defense_maneuver" value="moved-attack" title="Macro: @{NAME|defense_maneuver}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2265,7 +2265,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_crawling" value="1" title="macro name: @{defense_crawling}" />
+											<input type="checkbox" name="attr_defense_crawling" value="1" title="Macro: @{NAME|defense_crawling}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2281,7 +2281,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_kneeling" value="1" title="macro name: @{defense_kneeling}" />
+											<input type="checkbox" name="attr_defense_kneeling" value="1" title="Macro: @{NAME|defense_kneeling}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2303,7 +2303,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_from_behind" value="1" title="macro name: @{defense_from_behind}" />
+											<input type="checkbox" name="attr_defense_from_behind" value="1" title="Macro: @{NAME|defense_from_behind}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2319,7 +2319,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_runaround" value="1" title="macro name: @{defense_runaround}" />
+											<input type="checkbox" name="attr_defense_runaround" value="1" title="Macro: @{NAME|defense_runaround}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2420,7 +2420,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_retreat_dodge" value="1" title="macro name: @{defense_retreat_dodge}" />
+											<input type="checkbox" name="attr_defense_retreat_dodge" value="1" title="Macro: @{NAME|defense_retreat_dodge}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2436,7 +2436,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_retreat_parry" value="1" title="macro name: @{defense_retreat_parry}" />
+											<input type="checkbox" name="attr_defense_retreat_parry" value="1" title="Macro: @{NAME|defense_retreat_parry}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2452,7 +2452,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_retreat_parry_fence" value="1" title="macro name: @{defense_retreat_parry_fence}" />
+											<input type="checkbox" name="attr_defense_retreat_parry_fence" value="1" title="Macro: @{NAME|defense_retreat_parry_fence}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2468,7 +2468,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_retreating_flight" value="1" title="macro name: @{defense_retreating_flight}" />
+											<input type="checkbox" name="attr_defense_retreating_flight" value="1" title="Macro: @{NAME|defense_retreating_flight}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2484,7 +2484,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_acrobatic_dodge_success" value="1" title="macro name: @{defense_acrobatic_dodge_success}" />
+											<input type="checkbox" name="attr_defense_acrobatic_dodge_success" value="1" title="Macro: @{NAME|defense_acrobatic_dodge_success}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2500,7 +2500,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_acrobatic_dodge_failed" value="1" title="macro name: @{defense_acrobatic_dodge_failed}" />
+											<input type="checkbox" name="attr_defense_acrobatic_dodge_failed" value="1" title="Macro: @{NAME|defense_acrobatic_dodge_failed}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2516,7 +2516,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_dodge_drop" value="1" title="macro name: @{defense_dodge_drop}" />
+											<input type="checkbox" name="attr_defense_dodge_drop" value="1" title="Macro: @{NAME|defense_dodge_drop}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2532,7 +2532,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_feverish" value="1" title="macro name: @{defense_feverish}" />
+											<input type="checkbox" name="attr_defense_feverish" value="1" title="Macro: @{NAME|defense_feverish}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2548,7 +2548,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_offhand_parry" value="1" title="macro name: @{defense_offhand_parry}" />
+											<input type="checkbox" name="attr_defense_offhand_parry" value="1" title="Macro: @{NAME|defense_offhand_parry}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2641,7 +2641,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_laser_sight" value="1" title="macro name: @{defense_laser_sight}" />
+											<input type="checkbox" name="attr_defense_laser_sight" value="1" title="Macro: @{NAME|defense_laser_sight}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2732,7 +2732,7 @@
 									</div>
 								
 									<div>
-										<select name="attr_defense_height_difference" title="macro name: @{defense_height_difference}">
+										<select name="attr_defense_height_difference" title="Macro: @{NAME|defense_height_difference}">
 											<option value="0" selected="selected">0-2 feet: +0</option>
 											<option value="2-3-higher">Above, 2-3 feet: +1</option>
 											<option value="3-4-higher">Above, 3-4 feet: +2</option>
@@ -2748,7 +2748,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_defense_mounted" title="macro name: @{defense_mounted}">
+											<select name="attr_defense_mounted" title="Macro: @{NAME|defense_mounted}">
 												<option value="0" selected="selected">0</option>
 												<option>-1</option>
 												<option>-2</option>
@@ -2772,7 +2772,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_defense_tactics" title="macro name: @{defense_tactics}">
+											<select name="attr_defense_tactics" title="Macro: @{NAME|defense_tactics}">
 												<option value="0" selected="selected">0</option>
 												<option>+1</option>
 												<option>+2</option>
@@ -2795,7 +2795,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_hidden_weapon" value="1" title="macro name: @{defense_hidden_weapon}" />
+											<input type="checkbox" name="attr_defense_hidden_weapon" value="1" title="Macro: @{NAME|defense_hidden_weapon}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2823,7 +2823,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_parry_knife" value="1" title="macro name: @{defense_parry_knife}" />
+											<input type="checkbox" name="attr_defense_parry_knife" value="1" title="Macro: @{NAME|defense_parry_knife}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2841,7 +2841,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_parry_kusari" value="1" title="macro name: @{defense_parry_kusari}" />
+											<input type="checkbox" name="attr_defense_parry_kusari" value="1" title="Macro: @{NAME|defense_parry_kusari}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2859,7 +2859,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_unarmed_parry" value="1" title="macro name: @{defense_unarmed_parry}" />
+											<input type="checkbox" name="attr_defense_unarmed_parry" value="1" title="Macro: @{NAME|defense_unarmed_parry}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2883,7 +2883,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_dual_weapon" value="1" title="macro name: @{defense_dual_weapon}" />
+											<input type="checkbox" name="attr_defense_dual_weapon" value="1" title="Macro: @{NAME|defense_dual_weapon}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2901,7 +2901,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_parry_flail" value="1" title="macro name: @{defense_parry_flail}" />
+											<input type="checkbox" name="attr_defense_parry_flail" value="1" title="Macro: @{NAME|defense_parry_flail}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2919,7 +2919,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_parry_nunchaku" value="1" title="macro name: @{defense_parry_nunchaku}" />
+											<input type="checkbox" name="attr_defense_parry_nunchaku" value="1" title="Macro: @{NAME|defense_parry_nunchaku}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2937,7 +2937,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_block_flail" value="1" title="macro name: @{defense_block_flail}" />
+											<input type="checkbox" name="attr_defense_block_flail" value="1" title="Macro: @{NAME|defense_block_flail}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2955,7 +2955,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_block_nunchaku" value="1" title="macro name: @{defense_block_nunchaku}" />
+											<input type="checkbox" name="attr_defense_block_nunchaku" value="1" title="Macro: @{NAME|defense_block_nunchaku}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2973,7 +2973,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_thrown_weapon" value="1" title="macro name: @{defense_thrown_weapon}" />
+											<input type="checkbox" name="attr_defense_thrown_weapon" value="1" title="Macro: @{NAME|defense_thrown_weapon}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -2991,7 +2991,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_thrown_small_weapon" value="1" title="macro name: @{defense_thrown_small_weapon}" />
+											<input type="checkbox" name="attr_defense_thrown_small_weapon" value="1" title="Macro: @{NAME|defense_thrown_small_weapon}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3009,7 +3009,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_trident_dodge" value="1" title="macro name: @{defense_trident_dodge}" />
+											<input type="checkbox" name="attr_defense_trident_dodge" value="1" title="Macro: @{NAME|defense_trident_dodge}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3027,7 +3027,7 @@
 
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_trident_block" value="1" title="macro name: @{defense_trident_block}" />
+											<input type="checkbox" name="attr_defense_trident_block" value="1" title="Macro: @{NAME|defense_trident_block}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3065,7 +3065,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="number" name="attr_spell_on_penalty_total" value="0" title="Macro name: spell_on_penalty_total" readonly="readonly">
+											<input type="number" name="attr_spell_on_penalty_total" value="0" title="Macro: @{NAME|spell_on_penalty_total}" readonly="readonly">
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3086,7 +3086,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="number" name="attr_spell_maintained_penalty_total" value="0" title="Macro name: spell_maintained_penalty_total" readonly="readonly">
+											<input type="number" name="attr_spell_maintained_penalty_total" value="0" title="Macro: @{NAME|spell_maintained_penalty_total}" readonly="readonly">
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3107,7 +3107,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_spells_low_mana" value="1" title="macro name: @{spells_low_mana}" />
+											<input type="checkbox" name="attr_spells_low_mana" value="1" title="Macro: @{NAME|spells_low_mana}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3127,7 +3127,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="number" value="0" max="0" step="1" name="attr_spell_burn_hit_points" title="macro name: @{spell_burn_hit_points}" />
+											<input type="number" value="0" max="0" step="1" name="attr_spell_burn_hit_points" title="Macro: @{NAME|spell_burn_hit_points}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3143,7 +3143,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="number" value="0" min="0" step="1" name="attr_spell_ceremonial_bonus" title="macro name: @{spell_ceremonial_bonus}" />
+											<input type="number" value="0" min="0" step="1" name="attr_spell_ceremonial_bonus" title="Macro: @{NAME|spell_ceremonial_bonus}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3163,7 +3163,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="number" value="0" max="0" step="1" name="attr_regular_spell_modifier" title="macro name: @{regular_spell_modifier}" />
+											<input type="number" value="0" max="0" step="1" name="attr_regular_spell_modifier" title="Macro: @{NAME|regular_spell_modifier}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3179,7 +3179,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_regular_spell_cant_see_touch" value="1" title="macro name: @{regular_spell_cant_see_touch}" />
+											<input type="checkbox" name="attr_regular_spell_cant_see_touch" value="1" title="Macro: @{NAME|regular_spell_cant_see_touch}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3204,7 +3204,7 @@
 									</div>
 								
 									<div>
-										<select name="attr_spell_long_distance" title="macro name: @{spell_long_distance}">
+										<select name="attr_spell_long_distance" title="Macro: @{NAME|spell_long_distance}">
 											<option value="0" selected="selected">UP to 200 yards : 0</option>
 											<option value="-1">1/2 mile : -1</option>
 											<option value="-2">1 mile : -2</option>
@@ -3236,7 +3236,7 @@
 									</div>
 								
 									<div>
-										<select name="attr_spell_natures_strength" title="macro name: @{spell_natures_strength}">
+										<select name="attr_spell_natures_strength" title="Macro: @{NAME|spell_natures_strength}">
 											<option value="0" selected>Select</option>
 											<option value="wilderness-1">Primeval Wilderness : +1</option>
 											<option value="wilderness-2">Primeval Wilderness : +2</option>
@@ -3282,7 +3282,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_stunned" value="1" title="macro name: @{defense_stunned}" />
+											<input type="checkbox" name="attr_defense_stunned" value="1" title="Macro: @{NAME|defense_stunned}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3298,7 +3298,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_nauseated" value="1" title="macro name: @{defense_nauseated}" />
+											<input type="checkbox" name="attr_defense_nauseated" value="1" title="Macro: @{NAME|defense_nauseated}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3314,7 +3314,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_defense_encumbered" title="macro name: @{defense_encumbered}">
+											<select name="attr_defense_encumbered" title="Macro: @{NAME|defense_encumbered}">
 												<option value="0" selected="selected">0</option>
 												<option>-1</option>
 												<option>-2</option>
@@ -3340,7 +3340,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_cant_see_attacker" value="1" title="macro name: @{defense_cant_see_attacker}" />
+											<input type="checkbox" name="attr_defense_cant_see_attacker" value="1" title="Macro: @{NAME|defense_cant_see_attacker}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3360,7 +3360,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_defense_bad_footing" title="macro name: @{defense_bad_footing}">
+											<select name="attr_defense_bad_footing" title="Macro: @{NAME|defense_bad_footing}">
 												<option value="0" selected="selected">0</option>
 												<option>-1</option>
 												<option>-3</option>
@@ -3383,7 +3383,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_defense_distraction" title="macro name: @{defense_distraction}">
+											<select name="attr_defense_distraction" title="Macro: @{NAME|defense_distraction}">
 												<option value="0" selected="selected">0</option>
 												<option>-1</option>
 												<option>-2</option>
@@ -3409,7 +3409,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_grappled_dodge" value="1" title="macro name: @{defense_grappled_dodge}" />
+											<input type="checkbox" name="attr_defense_grappled_dodge" value="1" title="Macro: @{NAME|defense_grappled_dodge}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3425,7 +3425,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_defense_grappled_block" value="1" title="macro name: @{defense_grappled_block}" />
+											<input type="checkbox" name="attr_defense_grappled_block" value="1" title="Macro: @{NAME|defense_grappled_block}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3456,7 +3456,7 @@
 							<div class="item item2">
 								<label>
 									<div>
-										<input type="number" name="attr_visibility_modifier" value="0" readonly="readonly" title="macro name: @{visibility_modifier}" />
+										<input type="number" name="attr_visibility_modifier" value="0" readonly="readonly" title="Macro: @{NAME|visibility_modifier}" />
 									</div>
 									<div>
 										<div class="tooltip">
@@ -3477,7 +3477,7 @@
 							<div class="item item1">
 								<label>
 									<div>
-										<input type="radio" checked="checked" name="attr_visiblity_condition" value="0" title="macro name: @{visiblity_condition}" />
+										<input type="radio" checked="checked" name="attr_visiblity_condition" value="0" title="Macro: @{NAME|visiblity_condition}" />
 									</div>
 									<div>
 										<div class="tooltip">
@@ -3493,7 +3493,7 @@
 							<div class="item item2">
 								<label>
 									<div>
-										<input type="radio" name="attr_visiblity_condition" value="1" title="macro name: @{attr_visiblity_condition}" />
+										<input type="radio" name="attr_visiblity_condition" value="1" title="Macro: @{NAME|attr_visiblity_condition}" />
 									</div>
 									<div>
 										<div class="tooltip">
@@ -3509,7 +3509,7 @@
 							<div class="item item3">
 								<label>
 									<div>
-										<input type="radio" name="attr_visiblity_condition" value="2" title="macro name: @{attr_visiblity_condition}" />
+										<input type="radio" name="attr_visiblity_condition" value="2" title="Macro: @{NAME|attr_visiblity_condition}" />
 									</div>
 									<div>
 										<div class="tooltip">
@@ -3525,7 +3525,7 @@
 							<div class="item item4">
 								<label>
 									<div>
-										<input type="radio" name="attr_visiblity_condition" value="3" title="macro name: @{attr_visiblity_condition}" />
+										<input type="radio" name="attr_visiblity_condition" value="3" title="Macro: @{NAME|attr_visiblity_condition}" />
 									</div>
 									<div>
 										<div class="tooltip">
@@ -3546,7 +3546,7 @@
 							<div class="item item1">
 								<label>
 									<div>
-										<select name="attr_darkness_penalty" class="number-only-width" title="macro name: @{darkness_penalty}">
+										<select name="attr_darkness_penalty" class="number-only-width" title="Macro: @{NAME|darkness_penalty}">
 											<option>0</option>
 											<option>-1</option>
 											<option>-2</option>
@@ -3573,7 +3573,7 @@
 							<div class="item item2">
 								<label>
 									<div>
-										<select name="attr_smoke_penalty" class="number-only-width" title="macro name: @{smoke_penalty}">
+										<select name="attr_smoke_penalty" class="number-only-width" title="Macro: @{NAME|smoke_penalty}">
 											<option>0</option>
 											<option>-1</option>
 											<option>-2</option>
@@ -3601,7 +3601,7 @@
 							<div class="item item3">
 								<label>
 									<div>
-										<select name="attr_fog_penalty" class="number-only-width" title="macro name: @{fog_penalty}">
+										<select name="attr_fog_penalty" class="number-only-width" title="Macro: @{NAME|fog_penalty}">
 											<option>0</option>
 											<option>-1</option>
 											<option>-2</option>
@@ -3629,7 +3629,7 @@
 							<div class="item item4">
 								<label>
 									<div>
-										<select name="attr_blur_penalty" class="number-only-width" title="macro name: @{blur_penalty}">
+										<select name="attr_blur_penalty" class="number-only-width" title="Macro: @{NAME|blur_penalty}">
 											<option>0</option>
 											<option>-1</option>
 											<option>-2</option>
@@ -3657,7 +3657,7 @@
 							<div class="item item5">
 								<label>
 									<div>
-										<select name="attr_other_vision_penalty" class="number-only-width" title="macro name: @{other_vision_penalty}">
+										<select name="attr_other_vision_penalty" class="number-only-width" title="Macro: @{NAME|other_vision_penalty}">
 											<option>0</option>
 											<option>-1</option>
 											<option>-2</option>
@@ -3704,7 +3704,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_coughing_sneezing_iq" value="1" title="macro name: @{coughing_sneezing_iq}" />
+											<input type="checkbox" name="attr_coughing_sneezing_iq" value="1" title="Macro: @{NAME|coughing_sneezing_iq}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3720,7 +3720,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_coughing_sneezing_dx" value="1" title="macro name: @{coughing_sneezing_dx}" />
+											<input type="checkbox" name="attr_coughing_sneezing_dx" value="1" title="Macro: @{NAME|coughing_sneezing_dx}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3736,7 +3736,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_drowsy" value="1" title="macro name: @{drowsy}" />
+											<input type="checkbox" name="attr_drowsy" value="1" title="Macro: @{NAME|drowsy}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3752,7 +3752,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_tipsy" value="1" title="macro name: @{tipsy}" />
+											<input type="checkbox" name="attr_tipsy" value="1" title="Macro: @{NAME|tipsy}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3768,7 +3768,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_drunk" value="1" title="macro name: @{drunk}" />
+											<input type="checkbox" name="attr_drunk" value="1" title="Macro: @{NAME|drunk}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3784,7 +3784,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_euphoria" value="1" title="macro name: @{euphoria}" />
+											<input type="checkbox" name="attr_euphoria" value="1" title="Macro: @{NAME|euphoria}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3804,7 +3804,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_distraction" title="macro name: @{distraction}">
+											<select name="attr_distraction" title="Macro: @{NAME|distraction}">
 												<option value="0" selected="selected">0</option>
 												<option>-1</option>
 												<option>-2</option>
@@ -3827,7 +3827,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_pain_level" title="macro name: @{pain_level}">
+											<select name="attr_pain_level" title="Macro: @{NAME|pain_level}">
 												<option value="0" selected="selected">No Pain</option>
 												<option value="-2">-2 : Moderate</option>
 												<option value="-4">-4 : Severe</option>
@@ -3848,7 +3848,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_skill_encumbered" title="macro name: @{skill_encumbered}">
+											<select name="attr_skill_encumbered" title="Macro: @{NAME|skill_encumbered}">
 												<option value="0" selected="selected">0</option>
 												<option>-1</option>
 												<option>-2</option>
@@ -3874,7 +3874,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_bad_footing" title="macro name: @{bad_footing}">
+											<select name="attr_bad_footing" title="Macro: @{NAME|bad_footing}">
 												<option value="0" selected="selected">0</option>
 												<option>-2</option>
 												<option>-3</option>
@@ -3897,7 +3897,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<select name="attr_shield_close_combat_penalty" title="macro name: @{shield_close_combat_penalty}">
+											<select name="attr_shield_close_combat_penalty" title="Macro: @{NAME|shield_close_combat_penalty}">
 												<option value="0" selected="selected">0</option>
 												<option>-1</option>
 												<option>-2</option>
@@ -3920,7 +3920,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_grappled" value="1" title="macro name: @{grappled}" />
+											<input type="checkbox" name="attr_grappled" value="1" title="Macro: @{NAME|grappled}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3936,7 +3936,7 @@
 								<div class="block">
 									<label>
 										<div>
-											<input type="checkbox" name="attr_holding_large_shield" value="1" title="macro name: @{holding_large_shield}" />
+											<input type="checkbox" name="attr_holding_large_shield" value="1" title="Macro: @{NAME|holding_large_shield}" />
 										</div>
 										<div>
 											<div class="tooltip">
@@ -3978,7 +3978,7 @@
 									</div>
 								</div>
 								<div>
-									<select name="attr_task_difficulty" class="medium-width" title="macro name: @{task_difficulty}">
+									<select name="attr_task_difficulty" class="medium-width" title="Macro: @{NAME|task_difficulty}">
 										<option value="10">+10 : Automatic (start car)</option>
 										<option value="9">+9 : Trivial (drive empty lot)</option>
 										<option value="8">+8 : Trivial (drive empty lot)</option>
@@ -4014,7 +4014,7 @@
 									</div>
 								</div>
 								<div>
-									<select name="attr_task_extra_time" class="" title="macro name: @{task_extra_time}">
+									<select name="attr_task_extra_time" class="" title="Macro: @{NAME|task_extra_time}">
 										<option value="0" selected="selected">0 : Normal Time</option>
 										<option value="1">+1 : Time x 2</option>
 										<option value="2">+2 : Time x 4</option>
@@ -4035,7 +4035,7 @@
 									</div>
 								</div>
 								<div>
-									<select name="attr_task_haste" class="" title="macro name: @{task_haste}">
+									<select name="attr_task_haste" class="" title="Macro: @{NAME|task_haste}">
 										<option value="0" selected="selected">0 : Normal Time</option>
 										<option value="-1">-1 : Time x 90%</option>
 										<option value="-2">-2 : Time x 80%</option>
@@ -4059,7 +4059,7 @@
 							<div class="item item1">
 								<label>
 									<div>
-										<input type="checkbox" name="attr_unfamiliar_culture" value="1" title="macro name: @{unfamiliar_culture}" />
+										<input type="checkbox" name="attr_unfamiliar_culture" value="1" title="Macro: @{NAME|unfamiliar_culture}" />
 									</div>
 									<div>
 										<div class="tooltip">
@@ -4082,7 +4082,7 @@
 									</div>
 								</div>
 								<div>
-									<select name="attr_language_modifier" class="" title="macro name: @{language_modifier}">
+									<select name="attr_language_modifier" class="" title="Macro: @{NAME|language_modifier}">
 										<option value="0" selected="selected">0 : Native</option>
 										<option value="-1">-1 : Accented (language skills)</option>
 										<option value="-2">-2 : Accented (artistic skills)</option>
@@ -4102,7 +4102,7 @@
 									</div>
 								</div>
 								<div>
-									<select name="attr_iq_tech_level_modifier" class="" title="macro name: @{iq_tech_level_modifier}">
+									<select name="attr_iq_tech_level_modifier" class="" title="Macro: @{NAME|iq_tech_level_modifier}">
 										<option value="-100">Impossible : Your TL + 4</option>
 										<option value="-15">-15 : Your TL + 3</option>
 										<option value="-10">-10 : Your TL + 2</option>
@@ -4134,7 +4134,7 @@
 									</div>
 								</div>
 								<div>
-									<select name="attr_non_iq_tech_level_modifier" class="number-only-width" title="macro name: @{non_iq_tech_level_modifier}">
+									<select name="attr_non_iq_tech_level_modifier" class="number-only-width" title="Macro: @{NAME|non_iq_tech_level_modifier}">
 										<option selected="selected">0</option>
 										<option>-1</option>
 										<option>-2</option>
@@ -4179,7 +4179,7 @@
 									</div>
 								</div>
 								<div>
-									<select name="attr_task_equipment_modifier" class="medium-width" title="macro name: @{task_equipment_modifier}">
+									<select name="attr_task_equipment_modifier" class="medium-width" title="Macro: @{task_equipment_modifier}">
 										<option value="6">+6 : Best for equipment Tech Level 12</option>
 										<option value="5">+5 : Best for equipment Tech Level 10 or 11</option>
 										<option value="4">+4 : Best for equipment Tech Level 8 or 9</option>
@@ -4205,7 +4205,7 @@
 									</div>
 								</div>
 								<div>
-									<select name="attr_task_missing_items" class="" title="macro name: @{task_missing_items}">
+									<select name="attr_task_missing_items" class="" title="Macro: @{NAME|task_missing_items}">
 										<option value="0" selected="selected">0</option>
 										<option value="-1">-1</option>
 										<option value="-2">-2</option>
@@ -4231,7 +4231,7 @@
 									</div>
 								</div>
 								<div>
-									<select name="attr_task_damaged_equipment" class="" title="macro name: @{task_damaged_equipment}">
+									<select name="attr_task_damaged_equipment" class="" title="Macro: @{NAME|task_damaged_equipment}">
 										<option value="0" selected="selected">0</option>
 										<option value="-1">-1</option>
 										<option value="-2">-2</option>
@@ -4243,7 +4243,7 @@
 							<div class="item item9">
 								<label>
 									<div>
-										<input type="checkbox" name="attr_unfamiliar_equipment" value="1" title="macro name: @{unfamiliar_equipment}" />
+										<input type="checkbox" name="attr_unfamiliar_equipment" value="1" title="Macro: @{NAME|unfamiliar_equipment}" />
 									</div>
 									<div>
 										<div class="tooltip">
@@ -4358,26 +4358,9 @@
 					<input type="text" name="attr_announcement_version" readonly="readonly" value="0" title="GURPS Character Sheet Version" />
 				</h4>
 
-				<!-- current version notes: 2.9.0 -->			
+				<!-- current version notes: 2.9.1 -->			
 				<ul>
-					<li>Options -> Import subtab.
-						<ul>
-							<li>This is a new feature with the ability to import GCA5 characters and can be used for importing GCS (once an exporter has been built) characters.</li>
-							<li><b>NOTE:</b> The GCA4 Import has been depracted and will not be updated.</li>
-						</ul>
-					</li>
-					<li>
-						A few tooltip updates requested by Captain Joy.
-					</li>
-					<li>
-						Skill Rolls. Rolls of <span style="color:#247305;font-weight: bold;">1</span> will be highlighted <span style="color:#247305;font-weight: bold;">Green</span>, while rolls of <span style="color:#730505;font-weight: bold;">6</span> are highlighted <span style="color:#730505;font-weight: bold;">Red</span>. Requested by Tommi.
-					</li>
-					<li>
-						Removed minimum value for trait levels, to allow for possible 0 or negative levels. Requested Alexander W.
-					</li>
-					<li>
-						Combat tab. Defense sub-tab. Repeating defense, added tooltip for Talent Level.
-					</li>
+					<li>Updated all Macro Tooltips to use a standard, more useful naming convention.</li>
 				</ul>
 				
 				<label class="check"><input type="checkbox" name="attr_announcements_hide" value="1">&nbsp;<b><span data-i18n="hide-until-next-update">Hide until next update</span></b></label>
@@ -4521,13 +4504,13 @@ Cost reduced by -10% (Max -80%) per SM+1 (B15)
 							</span>
 						</div>
 						<div class="cell col1">
-							<input type="number" name="attr_intelligence" value="10" readonly="readonly" title="Macro name: intelligence" >
+							<input type="number" name="attr_intelligence" value="10" readonly="readonly" title="Macro: @{NAME|intelligence}" >
 						</div>
 						<div class="cell col2">
-							<input type="number" name="attr_intelligence_mod" value="0" step="1" title="Macro name: intelligence_mod" />
+							<input type="number" name="attr_intelligence_mod" value="0" step="1" title="Macro: @{NAME|intelligence_mod}" />
 						</div>
 						<div class="cell col3">
-							<input type="number" name="attr_intelligence_points" value="0" step="20" title="Macro name: intelligence_points" />
+							<input type="number" name="attr_intelligence_points" value="0" step="20" title="Macro: @{NAME|intelligence_points}" />
 						</div>
 						<div class="cell col4">
 							<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Attribute Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Intelligence Roll}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{intelligence} + @{modifier}]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}}" name="roll_vsIQ" />
@@ -4544,13 +4527,13 @@ Cost reduced by -10% (Max -80%) per SM+1 (B15)
 							</span>
 						</div>
 						<div class="cell col1">
-							<input type="number" name="attr_health" value="10" readonly="readonly" title="Macro name: health" >
+							<input type="number" name="attr_health" value="10" readonly="readonly" title="Macro: @{NAME|health}" >
 						</div>
 						<div class="cell col2">
-							<input type="number" name="attr_health_mod" value="0" step="1" title="Macro name: health_mod" />
+							<input type="number" name="attr_health_mod" value="0" step="1" title="Macro: @{NAME|health_mod}" />
 						</div>
 						<div class="cell col3">
-							<input type="number" name="attr_health_points" value="0" step="10" title="Macro name: health_points" />
+							<input type="number" name="attr_health_points" value="0" step="10" title="Macro: @{NAME|health_points}" />
 						</div>
 						<div class="cell col4">
 							<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Attribute Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Health Roll}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{health} + @{modifier}]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}}" name="roll_vsHT" />
@@ -4576,13 +4559,13 @@ Unmodified: <span name="attr_perception_base"></span>
 						</div>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_perception" value="10" readonly="readonly" title="Macro name: perception" />
+						<input type="number" name="attr_perception" value="10" readonly="readonly" title="Macro: @{NAME|perception}" />
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_perception_mod" value="0" step="1" title="Macro name: perception_mod" />
+						<input type="number" name="attr_perception_mod" value="0" step="1" title="Macro: @{NAME|perception_mod}" />
 					</div>
 					<div class="cell col3">
-						<input type="number" name="attr_perception_points" value="0" step="5" title="Macro name: perception_points" />
+						<input type="number" name="attr_perception_points" value="0" step="5" title="Macro: @{NAME|perception_points}" />
 					</div>
 					<div class="cell col4">
 						<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Attribute Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Perception Roll}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{perception} + @{modifier}]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}}" name="roll_vsPer" />
@@ -4603,13 +4586,13 @@ Unmodified: <span name="attr_vision_base"></span>
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_vision" value="10" readonly="readonly" title="Macro name: vision" />
+						<input type="number" name="attr_vision" value="10" readonly="readonly" title="Macro: @{NAME|vision}" />
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_vision_mod" value="0" step="1" title="Macro name: vision_mod" />
+						<input type="number" name="attr_vision_mod" value="0" step="1" title="Macro: @{NAME|vision_mod}" />
 					</div>
 					<div class="cell col3">
-						<input type="number" name="attr_vision_points" value="0" step="2" title="Macro name: vision_points" />
+						<input type="number" name="attr_vision_points" value="0" step="2" title="Macro: @{NAME|vision_points}" />
 					</div>
 					<div class="cell col4">
 						<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Attribute Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Vision Roll}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{vision} + @{modifier}]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}}" name="roll_vsVision" />
@@ -4630,13 +4613,13 @@ Unmodified: <span name="attr_hearing_base"></span>
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_hearing" value="10" readonly="readonly" title="Macro name: hearing" >
+						<input type="number" name="attr_hearing" value="10" readonly="readonly" title="Macro: @{NAME|hearing}" >
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_hearing_mod" value="0" step="1" title="Macro name: hearing_mod" />
+						<input type="number" name="attr_hearing_mod" value="0" step="1" title="Macro: @{NAME|hearing_mod}" />
 					</div>
 					<div class="cell col3">
-						<input type="number" name="attr_hearing_points" value="0" step="2" title="Macro name: hearing_points" />
+						<input type="number" name="attr_hearing_points" value="0" step="2" title="Macro: @{NAME|hearing_points}" />
 					</div>
 					<div class="cell col4">
 						<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Attribute Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Hearing Roll}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{hearing} + @{modifier}]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}}" name="roll_vsHearing" />
@@ -4657,13 +4640,13 @@ Unmodified: <span name="attr_taste_smell_base"></span>
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_taste_smell" value="10" readonly="readonly" title="Macro name: taste_smell" >
+						<input type="number" name="attr_taste_smell" value="10" readonly="readonly" title="Macro: @{NAME|taste_smell}" >
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_taste_smell_mod" value="0" step="1" title="Macro name: taste_smell_mod" />
+						<input type="number" name="attr_taste_smell_mod" value="0" step="1" title="Macro: @{NAME|taste_smell_mod}" />
 					</div>
 					<div class="cell col3">
-						<input type="number" name="attr_taste_smell_points" value="0" step="2" title="Macro name: taste_smell_points" />
+						<input type="number" name="attr_taste_smell_points" value="0" step="2" title="Macro: @{NAME|taste_smell_points}" />
 					</div>
 					<div class="cell col4">
 						<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Attribute Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Taste/Smell Roll}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{taste_smell} + @{modifier}]]}} {{useCriticalPlusTen=[[0]]}}" name="roll_vsTasteSmell" />
@@ -4684,13 +4667,13 @@ Unmodified: <span name="attr_touch_base"></span>
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_touch" value="10" readonly="readonly" title="Macro name: touch" >
+						<input type="number" name="attr_touch" value="10" readonly="readonly" title="Macro: @{NAME|touch}" >
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_touch_mod" value="0" step="1" title="Macro name: touch_mod" />
+						<input type="number" name="attr_touch_mod" value="0" step="1" title="Macro: @{NAME|touch_mod}" />
 					</div>
 					<div class="cell col3">
-						<input type="number" name="attr_touch_points" value="0" step="2" title="Macro name: touch_points" />
+						<input type="number" name="attr_touch_points" value="0" step="2" title="Macro: @{NAME|touch_points}" />
 					</div>
 					<div class="cell col4">
 						<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Attribute Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Touch Roll}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{touch} + @{modifier}]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}}" name="roll_vsTouch" />
@@ -4711,13 +4694,13 @@ Unmodified: <span name="attr_willpower_base"></span>
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_willpower" value="10" readonly="readonly" title="Macro name: willpower" >
+						<input type="number" name="attr_willpower" value="10" readonly="readonly" title="Macro: @{NAME|willpower}" >
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_willpower_mod" value="0" step="1" title="Macro name: willpower_mod" />
+						<input type="number" name="attr_willpower_mod" value="0" step="1" title="Macro: @{NAME|willpower_mod}" />
 					</div>
 					<div class="cell col3">
-						<input type="number" name="attr_willpower_points" value="0" step="5" title="Macro name: willpower_points" />
+						<input type="number" name="attr_willpower_points" value="0" step="5" title="Macro: @{NAME|willpower_points}" />
 					</div>
 					<div class="cell col4">
 						<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Attribute Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Will Roll}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{willpower} + @{modifier}]]}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}}" name="roll_vsWill" />
@@ -4740,13 +4723,13 @@ See extensive list of Modifiers B360 & GURPS Horror p139-142.
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_fear_check" value="10" readonly="readonly" title="Macro name: willpower_fear_check" />
+						<input type="number" name="attr_fear_check" value="10" readonly="readonly" title="Macro: @{NAME|fear_check}" />
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_fear_check_mod" value="0" step="1" title="Macro name: willpower_fear_check_mod" />
+						<input type="number" name="attr_fear_check_mod" value="0" step="1" title="Macro: @{NAME|fear_check_mod}" />
 					</div>
 					<div class="cell col3">
-						<input type="number" name="attr_fear_check_points" value="0" step="2" title="Macro name: willpower_fear_points" />
+						<input type="number" name="attr_fear_check_points" value="0" step="2" title="Macro: @{NAME|fear_check_points}" />
 					</div>
 					<div class="cell col4">
 						<!-- For Fright Check, use "kl1" = Keep Lowest One. [[1d8 ( { 16 , 13 }kl1) ]] = 1d6 + 13 -->
@@ -4773,10 +4756,10 @@ Confusion Check Table for failures. (Powers p85).
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_fright_check_threshold" value="13" readonly="readonly" title="Macro name: fright_check_threshold" />
+						<input type="number" name="attr_fright_check_threshold" value="13" readonly="readonly" title="Macro: @{NAME|fright_check_threshold}" />
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_fright_check_threshold_mod" value="0" step="1" title="Macro name: fright_check_threshold_mod" />
+						<input type="number" name="attr_fright_check_threshold_mod" value="0" step="1" title="Macro: @{NAME|fright_check_threshold_mod}" />
 					</div>
 					<div class="cell col3-fright-label">
 						<i><span data-i18n="fright-check-label">Fright Check</span></i>
@@ -4795,10 +4778,10 @@ Roll at the end of your turn after Do Nothing
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_stun_check" value="10" readonly="readonly" title="Macro name: stun_check" />
+						<input type="number" name="attr_stun_check" value="10" readonly="readonly" title="Macro: @{NAME|stun_check}" />
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_stun_check_mod" value="0" step="1" title="Macro name: stun_check_mod" />
+						<input type="number" name="attr_stun_check_mod" value="0" step="1" title="Macro: @{NAME|stun_check_mod}" />
 					</div>
 					<div class="cell col3">
 						&nbsp;
@@ -4830,10 +4813,10 @@ Roll <span style="font-style: italic; font-weight: bold; text-decoration: underl
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_knockdown_check" value="10" readonly="readonly" title="Macro name: knockdown_check" />
+						<input type="number" name="attr_knockdown_check" value="10" readonly="readonly" title="Macro: @{NAME|knockdown_check}" />
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_knockdown_check_mod" value="0" step="1" title="Macro name: knockdown_check_mod" />
+						<input type="number" name="attr_knockdown_check_mod" value="0" step="1" title="Macro: @{NAME|knockdown_check_mod}" />
 					</div>
 					<div class="cell col3">
 						&nbsp;
@@ -4859,13 +4842,13 @@ Fit +1 to Unc. Check . Very Fit +2 to Unc. Check
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_unconscious_check" value="10" readonly="readonly" title="Macro name: unconscious_check" />
+						<input type="number" name="attr_unconscious_check" value="10" readonly="readonly" title="Macro: @{NAME|unconscious_check}" />
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_unconscious_check_mod" value="0" step="1" title="Macro name: unconscious_check_mod" />
+						<input type="number" name="attr_unconscious_check_mod" value="0" step="1" title="Macro: @{NAME|unconscious_check_mod}" />
 					</div>
 					<div class="cell col3">
-						<input type="number" name="attr_unconscious_check_points" value="0" step="2" title="Macro name: unconscious_check_points" />
+						<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}}" name="roll_vsUnconsciousCheck" />
@@ -4890,13 +4873,13 @@ Fit +1 to Death Check . Very Fit +2 to Death Check
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_death_check" value="10" readonly="readonly" title="Macro name: death_check" />
+						<input type="number" name="attr_death_check" value="10" readonly="readonly" title="Macro: @{NAME|death_check}" />
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_death_check_mod" value="0" step="1" title="Macro name: death_check_mod" />
+						<input type="number" name="attr_death_check_mod" value="0" step="1" title="Macro: @{NAME|death_check_mod}" />
 					</div>
 					<div class="cell col3">
-						<input type="number" name="attr_death_check_points" value="0" step="2" title="Macro name: death_check_points" />
+						<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**, Your receive a Mortal Wound – See Mortal Wounds B423 \n<br /> **On a failure of 3+** ***YOU DIE*** – See Death B423.}}" name="roll_vsDeathCheck" />
@@ -4917,13 +4900,13 @@ Unmodified: <span name="attr_basic_speed_base" value="10"></span>
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_basic_speed" value="" step="0.25" readonly="readonly" title="Macro name: basic_speed" />
+						<input type="number" name="attr_basic_speed" value="" step="0.25" readonly="readonly" title="Macro: @{NAME|basic_speed}" />
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_basic_speed_mod" value="0" step="0.25" title="Macro name: basic_speed_mod" />
+						<input type="number" name="attr_basic_speed_mod" value="0" step="0.25" title="Macro: @{NAME|basic_speed_mod}" />
 					</div>
 					<div class="cell col3">
-						<input type="number" name="attr_basic_speed_points" value="0" step="5" title="Macro name: basic_speed_points" />
+						<input type="number" name="attr_basic_speed_points" value="0" step="5" title="Macro: @{NAME|basic_speed_points}" />
 					</div>
 					<div class="cell col4">
 						<button title="Reminder: You must select your Token first.&#013;This will add the Token's Speed plus DX&#013;as a single number in the Turn Order.&#013;DX was added to Speed to help break ties. (B363)" class="roll-tracker" type="roll" value="@{speed_tracker} [[[[@{selected|Basic_Speed}]]+[[(@{selected|dexterity}/100)]] &{tracker:=}]] &{template:addToTracker} {{characterName=@{character_name}}} {{skillName=Added to the Turn Order as [[ [[@{selected|Basic_Speed}]]+[[(@{selected|dexterity}/100)]] ]]}} {{basicSpeed=Speed: @{selected|Basic_Speed} &nbsp;&nbsp; DX: @{selected|dexterity}}}" name="roll_init" />
@@ -4942,13 +4925,13 @@ Note: The Move score automatically adjusts for Encumbrance and for HP and/or FP
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_basic_move" value="" readonly="readonly" title="Macro name: basic_move" />
+						<input type="number" name="attr_basic_move" value="" readonly="readonly" title="Macro: @{NAME|basic_move}" />
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_basic_move_mod" value="0" step="1" title="Macro name: basic_move_mod" />
+						<input type="number" name="attr_basic_move_mod" value="0" step="1" title="Macro: @{NAME|basic_move_mod}" />
 					</div>
 					<div class="cell col3">
-						<input type="number" name="attr_basic_move_points" value="0" step="5" title="Macro name: basic_move_points" />
+						<input type="number" name="attr_basic_move_points" value="0" step="5" title="Macro: @{NAME|basic_move_points}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row row-basic-move">
@@ -4967,13 +4950,13 @@ Level: <span name="attr_enhanced_ground_move_multiple" value="0"></span>
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_enhanced_ground_move" value="0" readonly="readonly" title="Macro name: enhanced_ground_move" />
+						<input type="number" name="attr_enhanced_ground_move" value="0" readonly="readonly" title="Macro: @{NAME|enhanced_ground_move}" />
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_enhanced_ground_move_mod" value="0" step=".5" class="editable" title="Macro name: enhanced_ground_move_mod" />
+						<input type="number" name="attr_enhanced_ground_move_mod" value="0" step=".5" class="editable" title="Macro: @{NAME|enhanced_ground_move_mod}" />
 					</div>
 					<div class="cell col3">
-						<input type="number" name="attr_enhanced_ground_move_points" value="0" step="10" class="editable" title="Macro name: enhanced_ground_move_points" />
+						<input type="number" name="attr_enhanced_ground_move_points" value="0" step="10" class="editable" title="Macro: @{NAME|enhanced_ground_move_points}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row margin-bottom row-dodge">
@@ -4989,10 +4972,10 @@ Note: The Dodge score automatically adjusts for HP and/or FP loss below 1/3. (B4
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_dodge" value="" readonly="readonly" title="Macro name: dodge" />
+						<input type="number" name="attr_dodge" value="" readonly="readonly" title="Macro: @{NAME|dodge}" />
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_dodge_mod" value="0" step="1" title="Macro name: dodge_mod" />
+						<input type="number" name="attr_dodge_mod" value="0" step="1" title="Macro: @{NAME|dodge_mod}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row row-lift-st hr">
@@ -5010,13 +4993,13 @@ Unmodified: <input class="sheet-inline" type="number" name="attr_lift_st_base" r
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_lift_st" value="0" readonly="readonly" title="Macro name: lift_st" />
+						<input type="number" name="attr_lift_st" value="0" readonly="readonly" title="Macro: @{NAME|lift_st}" />
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_lift_st_mod" value="0" step="1" title="Macro name: lift_st_mod" />
+						<input type="number" name="attr_lift_st_mod" value="0" step="1" title="Macro: @{NAME|lift_st_mod}" />
 					</div>
 					<div class="cell col3">
-						<input type="number" name="attr_lift_st_points" value="0" step="3" title="Macro name: lift_st_points" />
+						<input type="number" name="attr_lift_st_points" value="0" step="3" title="Macro: @{NAME|lift_st_points}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row margin-bottom row-basic-lift">
@@ -5029,7 +5012,7 @@ Unmodified: <input class="sheet-inline" type="number" name="attr_lift_st_base" r
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_basic_lift" value="0" readonly="readonly" title="Macro name: basic_lift" />
+						<input type="number" name="attr_basic_lift" value="0" readonly="readonly" title="Macro: @{NAME|basic_lift}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row row-strike-st hr">
@@ -5048,13 +5031,13 @@ Unmodified: <input class="sheet-inline" type="number" name="attr_striking_st_bas
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="number" name="attr_striking_st" value="0" readonly="readonly" title="Macro name: striking_st" />
+						<input type="number" name="attr_striking_st" value="0" readonly="readonly" title="Macro: @{NAME|striking_st}" />
 					</div>
 					<div class="cell col2">
-						<input type="number" name="attr_striking_st_mod" value="0" step="1" title="Macro name: striking_st_mod" />
+						<input type="number" name="attr_striking_st_mod" value="0" step="1" title="Macro: @{NAME|striking_st_mod}" />
 					</div>
 					<div class="cell col3">
-						<input type="number" name="attr_striking_st_points" value="0" step="5" title="Macro name: striking_st_points" />
+						<input type="number" name="attr_striking_st_points" value="0" step="5" title="Macro: @{NAME|striking_st_points}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row row-thrust-damage">
@@ -5208,13 +5191,13 @@ Cost reduced by -10% per SM+1 (B15)
 								</span>
 							</div>
 							<div class="cell col1">
-								<input type="number" name="attr_hit_points_max" value="10" readonly="readonly" title="Macro: @{NAME|hit_points_max}" />
+								<input type="number" name="attr_hit_points_max" value="10" readonly="readonly" title="Macro: @{NAME|hit_points|max}" />
 							</div>
 							<div class="cell col2">
 								<input type="number" name="attr_hit_points_mod" value="0" step="1" title="Macro: @{NAME|hit_points_mod}" />
 							</div>
 							<div class="cell col3">
-								<input type="number" name="attr_hit_points_points" value="0" step="2" title="Macro name: hit_points_max_points" />
+								<input type="number" name="attr_hit_points_points" value="0" step="2" title="Macro: @{NAME|hit_points_points}" />
 							</div>
 						</div> <!-- .row -->
 						<div class="row sub-row row-current-points">
@@ -5338,13 +5321,13 @@ another multiple of your max HP.
 								</span>
 							</div>
 							<div class="cell col1">
-								<input type="number" name="attr_fatigue_points_max" value="10" readonly="readonly" title="Macro name: fatigue_points_max" />
+								<input type="number" name="attr_fatigue_points_max" value="10" readonly="readonly" title="Macro: @{NAME|fatigue_points|max}" />
 							</div>
 							<div class="cell col2">
-								<input type="number" name="attr_fatigue_points_mod" value="0" step="1" title="Macro name: fatigue_points_mod" />
+								<input type="number" name="attr_fatigue_points_mod" value="0" step="1" title="Macro: @{NAME|fatigue_points_mod}" />
 							</div>
 							<div class="cell col3">
-								<input type="number" name="attr_fatigue_points_points" value="0" step="3" title="Macro name: fatigue_points_points" />
+								<input type="number" name="attr_fatigue_points_points" value="0" step="3" title="Macro: @{NAME|fatigue_points_points}" />
 							</div>
 						</div> <!-- .row -->
 						<div class="row sub-row row-current-points">
@@ -5412,7 +5395,7 @@ such as HP and damage. (B426)
 								</span>
 							</div>
 							<div class="cell col1">
-								<input type="number" name="attr_fatigue_points" value="10" title="Macro name: fatigue_points" />
+								<input type="number" name="attr_fatigue_points" value="10" title="Macro: @{NAME|fatigue_points}" />
 							</div>
 							<div class="cell col2">
 								<input type="hidden" class="fatigue-points-notes" name="attr_fatigue_points_notes" value="0" />
@@ -5454,11 +5437,11 @@ See Powers, pg119 – More detailed<br />
 								</span>
 							</div>
 							<div class="cell col1">
-								<input type="number" name="attr_energy_points_max" title="Macro name: energy_points_max" />
+								<input type="number" name="attr_energy_points_max" title="Macro: @{NAME|energy_points|max}" />
 							</div>
 							<div class="cell col2"></div>
 							<div class="cell col3">
-								<input type="number" name="attr_energy_points_points" value="0" step="3" title="Macro name: energy_points_points" />
+								<input type="number" name="attr_energy_points_points" value="0" step="3" title="Macro: @{NAME|energy_points_points}" />
 							</div>
 						</div> <!-- .row -->
 						<div class="row sub-row row-current-points">
@@ -5475,7 +5458,7 @@ See Powers, pg119 – More detailed
 								</span>
 							</div>
 							<div class="cell col1">
-								<input type="number" name="attr_energy_points" value="0" title="Macro name: energy_points" />
+								<input type="number" name="attr_energy_points" value="0" title="Macro: @{NAME|energy_points}" />
 							</div>
 						</div> <!-- .row -->
 						<div class="row hr">
@@ -5493,14 +5476,14 @@ Examples include:<br />
 								</span>
 							</div>
 							<div class="cell col0 label">
-								<input type="text" name="attr_user_pool1_name" title="Macro name: user_pool1_name" />
+								<input type="text" name="attr_user_pool1_name" title="Macro: @{NAME|user_pool1_name}" />
 							</div>
 							<div class="cell col1">
-								<input type="number" name="attr_user_pool1_max" title="Macro name: user_pool1_max" />
+								<input type="number" name="attr_user_pool1_max" title="Macro: @{NAME|user_pool1|max}" />
 							</div>
 							<div class="cell col2"></div>
 							<div class="cell col3">
-								<input type="number" name="attr_user_pool1_points" value=0 title="Macro name: user_pool1_points" />
+								<input type="number" name="attr_user_pool1_points" value=0 title="Macro: @{NAME|user_pool1_points}" />
 							</div>
 						</div> <!-- .row -->
 						<div class="row sub-row row-current-points">
@@ -5510,19 +5493,19 @@ Examples include:<br />
 								</div>
 							</div>
 							<div class="cell col1">
-								<input type="number" name="attr_user_pool1" value="0" title="Macro name: user_pool1" />
+								<input type="number" name="attr_user_pool1" value="0" title="Macro: @{NAME|user_pool1}" />
 							</div>
 						</div> <!-- .row -->
 						<div class="row">
 							<div class="cell col0 label">
-								<input type="text" name="attr_user_pool2_name" title="Macro name: user_pool2_name" />
+								<input type="text" name="attr_user_pool2_name" title="Macro: @{NAME|user_pool2_name}" />
 							</div>
 							<div class="cell col1">
-								<input type="number" name="attr_user_pool2_max" title="Macro name: user_pool2_max" />
+								<input type="number" name="attr_user_pool2_max" title="Macro: @{NAME|user_pool2|max}" />
 							</div>
 							<div class="cell col2"></div>
 							<div class="cell col3">
-								<input type="number" name="attr_user_pool2_points" value=0 title="Macro name: user_pool2_points" />
+								<input type="number" name="attr_user_pool2_points" value=0 title="Macro: @{NAME|user_pool2_points}" />
 							</div>
 						</div> <!-- .row -->
 						<div class="row sub-row row-current-points padding-bottom">
@@ -5532,7 +5515,7 @@ Examples include:<br />
 								</div>
 							</div>
 							<div class="cell col1">
-								<input type="number" name="attr_user_pool2" value="0" title="Macro name: user_pool2" />
+								<input type="number" name="attr_user_pool2" value="0" title="Macro: @{NAME|user_pool2}" />
 							</div>
 						</div> <!-- .row -->
 					</div>
@@ -5568,7 +5551,7 @@ with one hand in one second.
 								</span>
 							</div>
 							<div class="cell col1">
-								<input type="text" name="attr_simple_lift" value="round(@{basic_lift})" disabled="disabled" title="Macro name: simple_lift" />
+								<input type="text" name="attr_simple_lift" value="round(@{basic_lift})" disabled="disabled" title="Macro: @{NAME|simple_lift}" />
 							</div>
 						</div> <!-- .row -->
 						<div class="row row-one-handed-lift">
@@ -5584,7 +5567,7 @@ with one hand in two seconds.
 								</span>
 							</div>
 							<div class="cell col1">
-								<input type="text" name="attr_one_hand_lift" value="round(2 * @{basic_lift})" disabled="disabled" title="Macro name: one_hand_lift" />
+								<input type="text" name="attr_one_hand_lift" value="round(2 * @{basic_lift})" disabled="disabled" title="Macro: @{NAME|one_hand_lift}" />
 							</div>
 						</div> <!-- .row -->
 						<div class="row row-two-handed-lift">
@@ -5600,7 +5583,7 @@ with both hands in four seconds.
 								</span>
 							</div>
 							<div class="cell col1">
-								<input type="text" name="attr_two_hand_lift" value="round(8 * @{basic_lift})" disabled="disabled" title="Macro name: two_hand_lift" />
+								<input type="text" name="attr_two_hand_lift" value="round(8 * @{basic_lift})" disabled="disabled" title="Macro: @{NAME|two_hand_lift}" />
 							</div>
 						</div> <!-- .row -->
 						<div class="row row-shove-knock-over">
@@ -5616,7 +5599,7 @@ shove and knock over.
 								</span>
 							</div>
 							<div class="cell col1">
-								<input type="text" name="attr_shove_lift" value="round(12 * @{basic_lift})" disabled="disabled" title="Macro name: shove_lift" />
+								<input type="text" name="attr_shove_lift" value="round(12 * @{basic_lift})" disabled="disabled" title="Macro: @{NAME|shove_lift}" />
 							</div>
 						</div> <!-- .row -->
 						<div class="row row-running-shove-knock-over">
@@ -5632,7 +5615,7 @@ shove and knock over with a running start.
 								</span>
 							</div>
 							<div class="cell col1">
-								<input type="text" name="attr_run_shove_lift" value="round(24 * @{basic_lift})" disabled="disabled" title="Macro name: run_shove_lift" />
+								<input type="text" name="attr_run_shove_lift" value="round(24 * @{basic_lift})" disabled="disabled" title="Macro: @{NAME|run_shove_lift}" />
 							</div>
 						</div> <!-- .row -->
 						<div class="row row-carry-on-back">
@@ -5648,7 +5631,7 @@ over his/her back.
 								</span>
 							</div>
 							<div class="cell col1">
-								<input type="text" name="attr_carry_back_lift" value="round(15 * @{basic_lift})" disabled="disabled" title="Macro name: carry_back_lift" />
+								<input type="text" name="attr_carry_back_lift" value="round(15 * @{basic_lift})" disabled="disabled" title="Macro: @{NAME|carry_back_lift}" />
 							</div>
 						</div> <!-- .row -->
 						<div class="row margin-bottom row-shift-slightly">
@@ -5664,7 +5647,7 @@ can shift slightly on a floor.
 								</span>
 							</div>
 							<div class="cell col1">
-								<input type="text" name="attr_shift_lift" value="round(50 * @{basic_lift})" disabled="disabled" title="Macro name: shift_lift" />
+								<input type="text" name="attr_shift_lift" value="round(50 * @{basic_lift})" disabled="disabled" title="Macro: @{NAME|shift_lift}" />
 							</div>
 						</div> <!-- .row -->
 					</div> <!-- .table -->
@@ -5923,22 +5906,22 @@ every second that your encumbrance is over 10xBL<br />
 								<input type="text" name="attr_total_weight_gravity" value="" readonly="readonly" title="Macro: @{NAME|total_weight_gravity}" />
 							</div>
 							<div class="cell colAll">
-								<input type="text" name="attr_current_move" value="" readonly="readonly" title="Macro name: current_move" />
+								<input type="text" name="attr_current_move" value="" readonly="readonly" title="Macro: @{NAME|current_move}" />
 								<input type="hidden" name="attr_current_ground_step" value="1" />
 							</div>
 							<div class="cell colAll">
-								<input type="text" name="attr_enhanced_move_current" value="0" readonly="readonly" title="Macro name: enhanced_move_current" />
+								<input type="text" name="attr_enhanced_move_current" value="0" readonly="readonly" title="Macro: @{NAME|enhanced_move_current}" />
 							</div>
 							<div class="cell colAll">
-								<input type="text" name="attr_current_air" value="0" readonly="readonly" title="Macro name: current_air" />
+								<input type="text" name="attr_current_air" value="0" readonly="readonly" title="Macro: @{NAME|current_air}" />
 								<input type="hidden" name="attr_current_air_step" value="1" />
 							</div>
 							<div class="cell colAll">
-								<input type="text" name="attr_current_water" value="0" readonly="readonly" title="Macro name: current_water" />
+								<input type="text" name="attr_current_water" value="0" readonly="readonly" title="Macro: @{NAME|current_wate}" />
 								<input type="hidden" name="attr_current_water_step" />
 							</div>
 							<div class="cell colAll">
-								<input type="text" name="attr_current_dodge" value="0" readonly="readonly" title="Macro name: @{current_dodge}" />
+								<input type="text" name="attr_current_dodge" value="0" readonly="readonly" title="Macro: @{NAME|current_dodge}" />
 							</div>
 						</div> <!-- .row -->
 						
@@ -6051,22 +6034,22 @@ See B395.
 									</select>
 								</div>
 								<div class="cell colAll">
-									<input type="number" step="1" name="attr_start_velocity" value="0" title="Macro name: start_velocity" />
+									<input type="number" step="1" name="attr_start_velocity" value="0" title="Macro: @{NAME|start_velocity}" />
 								</div>
 								<div class="cell colAll">
-									<input type="number" step="1" name="attr_change_velocity" value="0" title="Macro name: change_velocity" />
+									<input type="number" step="1" name="attr_change_velocity" value="0" title="Macro: @{NAME|change_velocity}" />
 								</div>
 								<div class="cell colAll">
-								<input type="text" name="attr_final_velocity" value="0" title="Macro name: final_velocity" readonly="readonly" />
+								<input type="text" name="attr_final_velocity" value="0" title="Macro: @{NAME|final_velocity}" readonly="readonly" />
 								</div>
 								<div class="cell colAll">
-									<input type="text" name="attr_deceleration_penalty" value="0" title="Macro name: deceleration_penalty" readonly="readonly" />
+									<input type="text" name="attr_deceleration_penalty" value="0" title="Macro: @{NAME|deceleration_penalty}" readonly="readonly" />
 								</div>
 								<div class="cell colAll">
-									<input type="text" name="attr_turn_radius" value="0" title="Macro name: turn_radius" readonly="readonly" />
+									<input type="text" name="attr_turn_radius" value="0" title="Macro: @{NAME|turn_radius}" readonly="readonly" />
 								</div>
 								<div class="cell colAll">
-									<input type="text" name="attr_tight_turn_penalty" value="0" title="Macro name: tight_turn_penalty" readonly="readonly" />
+									<input type="text" name="attr_tight_turn_penalty" value="0" title="Macro: @{NAME|tight_turn_penalty}" readonly="readonly" />
 								</div>
 							</div> <!-- end row-->
 							
@@ -6105,13 +6088,13 @@ Use the text box to enter the number of character points used for Flight
 									</div>
 								</div>
 								<div class="cell col1">
-									<input type="checkbox" name="attr_flight_checked" value="1" class="boolean" title="Macro name: flight_checked" />
+									<input type="checkbox" name="attr_flight_checked" value="1" class="boolean" title="Macro: @{NAME|flight_checked}" />
 								</div>
 								<div class="cell col2">
 									&nbsp;
 								</div>
 								<div class="cell col3">
-									<input type="number" name="attr_flight_points" value="0" class="editable" title="Macro name: flight_points" />
+									<input type="number" name="attr_flight_points" value="0" class="editable" title="Macro: @{NAME|flight_points}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-basic-move">
@@ -6127,13 +6110,13 @@ Base Air Move = Basic Speed * 2 = <input class="sheet-inline" type="number" name
 									</span>
 								</div>
 								<div class="cell col1">
-									<input type="number" name="attr_basic_air_move" value="0" readonly="readonly" title="Macro name: basic_air_move" />
+									<input type="number" name="attr_basic_air_move" value="0" readonly="readonly" title="Macro: @{NAME|basic_air_move}" />
 								</div>
 								<div class="cell col2">
-									<input type="number" name="attr_basic_air_move_mod" value="0" step="1" class="editable" title="Macro name: basic_air_move_mod" />
+									<input type="number" name="attr_basic_air_move_mod" value="0" step="1" class="editable" title="Macro: @{NAME|basic_air_move_mod}" />
 								</div>
 								<div class="cell col3">
-									<input type="number" name="attr_basic_air_move_points" value="0" step="2" class="editable" title="Macro name: basic_air_move_points" />
+									<input type="number" name="attr_basic_air_move_points" value="0" step="2" class="editable" title="Macro: @{NAME|basic_air_move_points}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row margin-bottom row-enhanced-air">
@@ -6152,13 +6135,13 @@ Level: <span name="attr_enhanced_air_move_level" value="0"></span>
 									</span>
 								</div>
 								<div class="cell col1">
-									<input type="number" name="attr_enhanced_air_move" value="0" readonly="readonly" title="Macro name: enhanced_air_move" />
+									<input type="number" name="attr_enhanced_air_move" value="0" readonly="readonly" title="Macro: @{NAME|enhanced_air_move}" />
 								</div>
 								<div class="cell col2">
-									<input type="number" name="attr_enhanced_air_level" value="0" step=".5" min="0" class="editable" title="Macro name: enhanced_air_level" />
+									<input type="number" name="attr_enhanced_air_level" value="0" step=".5" min="0" class="editable" title="Macro: @{NAME|enhanced_air_level}" />
 								</div>
 								<div class="cell col3">
-									<input type="number" name="attr_enhanced_air_move_points" value="0" step="10" min="0" class="editable" title="Macro name: enhanced_air_move_points" />
+									<input type="number" name="attr_enhanced_air_move_points" value="0" step="10" min="0" class="editable" title="Macro: @{NAME|enhanced_air_move_points}" />
 								</div>
 							</div> <!-- .row -->
 						</div> <!-- .container-swimming -->
@@ -6181,13 +6164,13 @@ This will update the swimming movement on the encumbrance table.
 									</div>
 								</div>
 								<div class="cell col1">
-									<input type="checkbox" name="attr_amphibious_checked" value="1" class="boolean" title="Macro name: amphibious_checked" />
+									<input type="checkbox" name="attr_amphibious_checked" value="1" class="boolean" title="Macro: @{NAME|amphibious_checked}" />
 								</div>
 								<div class="cell col2">
 									&nbsp;
 								</div>
 								<div class="cell col3">
-									<input type="number" name="attr_amphibious_points" value="0" class="editable" title="Macro name: amphibious_points" />
+									<input type="number" name="attr_amphibious_points" value="0" class="editable" title="Macro: @{NAME|amphibious_points}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-basic-move">
@@ -6205,13 +6188,13 @@ NOTE: Max +2 water move if you have swimming skill.
 									</span>
 								</div>
 								<div class="cell col1">
-									<input type="number" name="attr_basic_water_move" value="0" readonly="readonly" title="Macro name: basic_water_move" />
+									<input type="number" name="attr_basic_water_move" value="0" readonly="readonly" title="Macro: @{NAME|basic_water_move}" />
 								</div>
 								<div class="cell col2">
-									<input type="number" name="attr_basic_water_move_mod" value="0" step="1" class="editable" title="Macro name: basic_water_move_mod" />
+									<input type="number" name="attr_basic_water_move_mod" value="0" step="1" class="editable" title="Macro: @{NAME|basic_water_move_mod}" />
 								</div>
 								<div class="cell col3">
-									<input type="number" name="attr_basic_water_move_points" value="0" step="5" class="editable" title="Macro name: basic_water_move_points" />
+									<input type="number" name="attr_basic_water_move_points" value="0" step="5" class="editable" title="Macro: @{NAME|basic_water_move_points}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row margin-bottom row-enhanced-water">
@@ -6230,13 +6213,13 @@ Level: <span name="attr_enhanced_water_move_level" value="0"></span>
 									</span>
 								</div>
 								<div class="cell col1">
-									<input type="number" name="attr_enhanced_water_move" value="0" readonly="readonly" title="Macro name: enhanced_water_move" />
+									<input type="number" name="attr_enhanced_water_move" value="0" readonly="readonly" title="Macro: @{NAME|enhanced_water_move}" />
 								</div>
 								<div class="cell col2">
-									<input type="number" name="attr_enhanced_water_level" value="0" step=".5" min="0" class="editable" title="Macro name: enhanced_water_level" />
+									<input type="number" name="attr_enhanced_water_level" value="0" step=".5" min="0" class="editable" title="Macro: @{NAME|enhanced_water_level}" />
 								</div>
 								<div class="cell col3">
-									<input type="number" name="attr_enhanced_water_move_points" value="0" step="10" min="0" class="editable" title="Macro name: enhanced_water_move_points" />
+									<input type="number" name="attr_enhanced_water_move_points" value="0" step="10" min="0" class="editable" title="Macro: @{NAME|enhanced_water_move_points}" />
 								</div>
 							</div> <!-- .row -->
 						</div> <!-- .container-swimming -->
@@ -6260,7 +6243,7 @@ instead of Basic Move to calculate jumping distances. B352
 									</span>
 								</div>
 								<div class="cell col1">
-									<input type="text" name="attr_jump_skill" value="" class="editable" title="Macro name: jump_skill" />
+									<input type="text" name="attr_jump_skill" value="" class="editable" title="Macro: @{NAME|jump_skill}" />
 								</div>
 								<div class="cell col2">
 									&nbsp;
@@ -6302,7 +6285,7 @@ If Basic Lift (<input type="text" name="attr_display_jump_basic_lift" value="@{s
 									</span>
 								</div>
 								<div class="cell col1">
-									<input type="checkbox" name="attr_use_st_for_jump" value="1" class="boolean" title="Macro name: use_st_for_jump" />
+									<input type="checkbox" name="attr_use_st_for_jump" value="1" class="boolean" title="Macro: @{NAME|use_st_for_jump}" />
 								</div>
 								<div class="cell col2">
 									&nbsp;
@@ -6326,13 +6309,13 @@ Super Jump: use this if you have the Super Jump as an Advantage. B89<br />
 									</span>
 								</div>
 								<div class="cell col1">
-									<input type="number" name="attr_super_jump_level" value="0" readonly="readonly" title="Macro name: super_jump_level" />
+									<input type="number" name="attr_super_jump_level" value="0" readonly="readonly" title="Macro: @{NAME|super_jump_level}" />
 								</div>
 								<div class="cell col2">
-									<input type="number" name="attr_super_jump_entered_level" value="0" step="1" min="0" class="editable" title="Macro name: super_jump_entered_level" />
+									<input type="number" name="attr_super_jump_entered_level" value="0" step="1" min="0" class="editable" title="Macro: @{NAME|super_jump_entered_level}" />
 								</div>
 								<div class="cell col3">
-									<input type="number" name="attr_super_jump_points" value="0" step="10" min="0" class="editable" title="Macro name: super_jump_points" />
+									<input type="number" name="attr_super_jump_points" value="0" step="10" min="0" class="editable" title="Macro: @{NAME|super_jump_points}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-basic-move">
@@ -6366,7 +6349,7 @@ Leave unchecked otherwise, in which case you will halve all jump distances. B352
 									</span>
 								</div>
 								<div class="cell col1">
-									<input type="checkbox" name="attr_jump_concentration" value="1" class="boolean" title="Macro name: jump_concentration" />
+									<input type="checkbox" name="attr_jump_concentration" value="1" class="boolean" title="Macro: @{NAME|jump_concentration}" />
 								</div>
 								<div class="cell col2 title">
 									<span data-i18n="feet-measurement-label">feet</span>
@@ -6392,13 +6375,13 @@ Stat to use: <input type="text" name="attr_standing_broad_jump_stat_to_use" valu
 									</span>
 								</div>
 								<div class="cell col1">
-									<input type="text" name="attr_broad_jump_base" value="0" readonly="readonly" title="Macro name: broad_jump_base" />
+									<input type="text" name="attr_broad_jump_base" value="0" readonly="readonly" title="Macro: @{NAME|broad_jump_base}" />
 								</div>
 								<div class="cell col2">
-									<input type="text" name="attr_broad_jump_distance_feet" value="0" readonly="readonly" title="Macro name: broad_jump_distance_feet" />
+									<input type="text" name="attr_broad_jump_distance_feet" value="0" readonly="readonly" title="Macro: @{NAME|broad_jump_distance_feet}" />
 								</div>
 								<div class="cell col3">
-									<input type="text" name="attr_broad_jump_distance_yards" value="0" readonly="readonly" title="Macro name: broad_jump_distance_yards" />
+									<input type="text" name="attr_broad_jump_distance_yards" value="0" readonly="readonly" title="Macro: @{NAME|broad_jump_distance_yards}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-basic-move">
@@ -6419,13 +6402,13 @@ Max running broad jump distance is twice standing broad jump distance.
 									</span>
 								</div>
 								<div class="cell col1">
-									<input type="number" step="1" name="attr_running_jump_yards_moved" value="0" class="editable" title="Macro name: running_jump_yards_moved" />
+									<input type="number" step="1" name="attr_running_jump_yards_moved" value="0" class="editable" title="Macro: @{NAME|running_jump_yards_moved}" />
 								</div>
 								<div class="cell col2">
-									<input type="text" name="attr_running_jump_distance_feet" value="0" readonly="readonly" title="Macro name: running_jump_distance_feet" />
+									<input type="text" name="attr_running_jump_distance_feet" value="0" readonly="readonly" title="Macro: @{NAME|running_jump_distance_feet}" />
 								</div>
 								<div class="cell col3">
-									<input type="text" name="attr_running_jump_distance_yards" value="0" readonly="readonly" title="Macro name: running_jump_distance_yards" />
+									<input type="text" name="attr_running_jump_distance_yards" value="0" readonly="readonly" title="Macro: @{NAME|running_jump_distance_yards}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-basic-move">
@@ -6445,13 +6428,13 @@ Stat to use: <input type="text" name="attr_standing_high_jump_stat_to_use" value
 									</span>
 								</div>
 								<div class="cell col1">
-									<input type="text" name="attr_high_jump_base" value="0" readonly="readonly" title="Macro name: high_jump_base" />
+									<input type="text" name="attr_high_jump_base" value="0" readonly="readonly" title="Macro: @{NAME|high_jump_base}" />
 								</div>
 								<div class="cell col2">
-									<input type="text" name="attr_high_jump_distance_feet" value="0" readonly="readonly" title="Macro name: high_jump_distance_feet" />
+									<input type="text" name="attr_high_jump_distance_feet" value="0" readonly="readonly" title="Macro: @{NAME|high_jump_distance_feet}" />
 								</div>
 								<div class="cell col3">
-									<input type="text" name="attr_high_jump_distance_yards" value="0" readonly="readonly" title="Macro name: high_jump_distance_yards" />
+									<input type="text" name="attr_high_jump_distance_yards" value="0" readonly="readonly" title="Macro: @{NAME|high_jump_distance_yards}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-basic-move">
@@ -6472,13 +6455,13 @@ Max running high jump distance is twice standing high jump distance.
 									</span>
 								</div>
 								<div class="cell col1">
-									<input type="number" step="1" name="attr_running_high_jump_yards_moved" value="0" class="editable" title="Macro name: running_high_jump_yards_moved" />
+									<input type="number" step="1" name="attr_running_high_jump_yards_moved" value="0" class="editable" title="Macro: @{NAME|running_high_jump_yards_moved}" />
 								</div>
 								<div class="cell col2">
-									<input type="text" name="attr_running_high_jump_distance_feet" value="0" readonly="readonly" title="Macro name: running_high_jump_distance_feet" />
+									<input type="text" name="attr_running_high_jump_distance_feet" value="0" readonly="readonly" title="Macro: @{NAME|running_high_jump_distance_feet}" />
 								</div>
 								<div class="cell col3">
-									<input type="text" name="attr_running_high_jump_distance_yards" value="0" readonly="readonly" title="Macro name: running_high_jump_distance_yards" />
+									<input type="text" name="attr_running_high_jump_distance_yards" value="0" readonly="readonly" title="Macro: @{NAME|running_high_jump_distance_yards}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row margin-bottom row-jump-move">
@@ -6494,7 +6477,7 @@ Greater of Broad Jump Yards / 5 OR Normal Ground Move.<br />
 									</span>
 								</div>
 								<div class="cell col1">
-									<input type="text" name="attr_jump_move_speed" value="0" readonly="readonly" title="Macro name: jump_move_speed" />
+									<input type="text" name="attr_jump_move_speed" value="0" readonly="readonly" title="Macro: @{NAME|jump_move_speed}" />
 								</div>
 								<div class="cell col2">
 									&nbsp;
@@ -6551,7 +6534,7 @@ PC in Character Points (spent and unspent combined).
 						</span>	
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_total_points" value="150" title="Macro name: total_points" />
+						<input type="text" name="attr_total_points" value="150" title="Macro: @{NAME|total_points}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row margin-bottom row-spent hr">
@@ -6559,7 +6542,7 @@ PC in Character Points (spent and unspent combined).
 						<span data-i18n="spent-label">Spent</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_point_summary" disabled="disabled" value="@{att_points} + @{languages_points} + @{tl_pts} + @{cf_points} + @{racial_points} +  @{advantages_points} + @{advantages_perks} + @{disadvantages_points} + @{disadvantages_quirks} + @{skill_points} + @{techniques_points} + @{techniques_revised_points} + @{spells_points} + @{misc_points}" title="Macro name: point_summary" />
+						<input type="text" name="attr_point_summary" disabled="disabled" value="@{att_points} + @{languages_points} + @{tl_pts} + @{cf_points} + @{racial_points} +  @{advantages_points} + @{advantages_perks} + @{disadvantages_points} + @{disadvantages_quirks} + @{skill_points} + @{techniques_points} + @{techniques_revised_points} + @{spells_points} + @{misc_points}" title="Macro: @{NAME|point_summary}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row margin-bottom row-total hr">
@@ -6567,7 +6550,7 @@ PC in Character Points (spent and unspent combined).
 						<span data-i18n="unspent-label">Unspent</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_point_diff" value="@{total_points} - (@{att_points} + @{languages_points} + @{tl_pts} + @{cf_points} + @{racial_points} +  @{advantages_points} + @{advantages_perks} + @{disadvantages_points} + @{disadvantages_quirks} + @{skill_points} + @{techniques_points} + @{techniques_revised_points} + @{spells_points} + @{misc_points})" disabled="disabled" title="Macro name: point_diff" />
+						<input type="text" name="attr_point_diff" value="@{total_points} - (@{att_points} + @{languages_points} + @{tl_pts} + @{cf_points} + @{racial_points} +  @{advantages_points} + @{advantages_perks} + @{disadvantages_points} + @{disadvantages_quirks} + @{skill_points} + @{techniques_points} + @{techniques_revised_points} + @{spells_points} + @{misc_points})" disabled="disabled" title="Macro: @{NAME|point_diff}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row margin-bottom row-unspent hr">
@@ -6575,7 +6558,7 @@ PC in Character Points (spent and unspent combined).
 						<span data-i18n="unspent-label">Unspent</span>
 					</div>
 					<div class="cell col1 unspent-points">
-						<input type="text" name="attr_unspent_points" value="0" title="Macro name: unspent_points" />
+						<input type="text" name="attr_unspent_points" value="0" title="Macro: @{NAME|unspent_points}" />
 					</div>
 				</div> <!-- .row -->
 				
@@ -6635,7 +6618,7 @@ and change the radio button for <b>Point Summary Layout</b>
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_trait_racial_points" disabled="disabled" value="@{racial_points}" title="Macro name: trait_racial_points">
+						<input type="text" name="attr_trait_racial_points" disabled="disabled" value="@{racial_points}" title="Macro: @{NAME|trait_racial_points}">
 					</div>
 				</div> <!-- .row -->
 				
@@ -6649,7 +6632,7 @@ and change the radio button for <b>Point Summary Layout</b>
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_trait_racial_points" disabled="disabled" value="@{racial_points}" title="Macro name: trait_racial_points">
+						<input type="text" name="attr_trait_racial_points" disabled="disabled" value="@{racial_points}" title="Macro: @{NAME|trait_racial_points}">
 					</div>
 				</div> <!-- .row -->
 				
@@ -6671,7 +6654,7 @@ Flying, Air Move, Enhanced Air Move, Super Jump
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_att_points" value="@{strength_points} + @{dexterity_points} + @{intelligence_points} + @{health_points} + @{perception_points} + @{vision_points} + @{hearing_points} + @{taste_smell_points} + @{touch_points} + @{willpower_points} + @{fear_check_points} + @{hit_points_points} + @{fatigue_points_points} + @{energy_points_points} + @{user_pool1_points} + @{user_pool2_points} + @{basic_speed_points} + @{basic_move_points} + @{striking_st_points} + @{lift_st_points} + @{enhanced_ground_move_points} + @{flight_points} + @{basic_air_move_points} + racial_points@{enhanced_air_move_points} + @{amphibious_points} + @{basic_water_move_points} + @{enhanced_water_move_points} + @{super_jump_points} + @{unconscious_check_points} + @{death_check_points}" disabled="disabled" title="Macro name: @{att_points}" />
+						<input type="text" name="attr_att_points" value="@{strength_points} + @{dexterity_points} + @{intelligence_points} + @{health_points} + @{perception_points} + @{vision_points} + @{hearing_points} + @{taste_smell_points} + @{touch_points} + @{willpower_points} + @{fear_check_points} + @{hit_points_points} + @{fatigue_points_points} + @{energy_points_points} + @{user_pool1_points} + @{user_pool2_points} + @{basic_speed_points} + @{basic_move_points} + @{striking_st_points} + @{lift_st_points} + @{enhanced_ground_move_points} + @{flight_points} + @{basic_air_move_points} + racial_points@{enhanced_air_move_points} + @{amphibious_points} + @{basic_water_move_points} + @{enhanced_water_move_points} + @{super_jump_points} + @{unconscious_check_points} + @{death_check_points}" disabled="disabled" title="Macro: @{NAME|att_points}" />
 					</div>
 				</div> <!-- .row -->
 				
@@ -6689,7 +6672,7 @@ Advantages, and Racial traits.
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_trait_advantages_points" disabled="disabled" value="@{languages_points} + @{tl_pts} + @{cf_points} + @{racial_points} + @{advantages_points}" title="Macro name: @{trait_advantages_points}" />
+						<input type="text" name="attr_trait_advantages_points" disabled="disabled" value="@{languages_points} + @{tl_pts} + @{cf_points} + @{racial_points} + @{advantages_points}" title="Macro: @{NAME|trait_advantages_points}" />
 					</div>
 				</div> <!-- .row -->
 				
@@ -6707,7 +6690,7 @@ Advantages, and Perks.
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_trait_advantages_points_gcs" disabled="disabled" value="@{languages_points} +  @{tl_pts} +  @{cf_points} + @{advantages_points} + @{advantages_perks}" title="Macro name: @{trait_advantages_points_gcs}" />
+						<input type="text" name="attr_trait_advantages_points_gcs" disabled="disabled" value="@{languages_points} +  @{tl_pts} +  @{cf_points} + @{advantages_points} + @{advantages_perks}" title="Macro: @{NAME|trait_advantages_points_gcs}" />
 					</div>
 				</div> <!-- .row -->
 				
@@ -6725,7 +6708,7 @@ and Advantages.
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_trait_advantages_points_all" disabled="disabled" value="@{languages_points} + @{tl_pts} + @{cf_points} + @{advantages_points}" title="Macro name: @{trait_advantages_points_all}" />
+						<input type="text" name="attr_trait_advantages_points_all" disabled="disabled" value="@{languages_points} + @{tl_pts} + @{cf_points} + @{advantages_points}" title="Macro: @{NAME|trait_advantages_points_all}" />
 					</div>
 				</div> <!-- .row -->
 				
@@ -6734,7 +6717,7 @@ and Advantages.
 						<span data-i18n="perks-label">Perks</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_advantages_perks_display" disabled="disabled" value="@{advantages_perks}" title="Macro name: @{advantages_perks_display}" />
+						<input type="text" name="attr_advantages_perks_display" disabled="disabled" value="@{advantages_perks}" title="Macro: @{NAME|advantages_perks_display}" />
 					</div>
 				</div> <!-- .row -->
 				
@@ -6743,7 +6726,7 @@ and Advantages.
 						<span data-i18n="perks-label">Perks</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_advantages_perks_display" disabled="disabled" value="@{advantages_perks}" title="Macro name: @{advantages_perks_display}" />
+						<input type="text" name="attr_advantages_perks_display" disabled="disabled" value="@{advantages_perks}" title="Macro: @{NAME|advantages_perks_display}" />
 					</div>
 				</div> <!-- .row -->
 				
@@ -6757,7 +6740,7 @@ and Advantages.
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_trait_disadvantages_points" disabled="disabled" value="@{disadvantages_points}" title="Macro name: @{trait_disadvantages_points}" />
+						<input type="text" name="attr_trait_disadvantages_points" disabled="disabled" value="@{disadvantages_points}" title="Macro: @{NAME|trait_disadvantages_points}" />
 					</div>
 				</div> <!-- .row -->
 				
@@ -6766,7 +6749,7 @@ and Advantages.
 						<span data-i18n="quirks-label">Quirks</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_disadvantages_quirks_display" disabled="disabled" value="@{disadvantages_quirks}" title="Macro name: @{disadvantages_quirks_display}" />
+						<input type="text" name="attr_disadvantages_quirks_display" disabled="disabled" value="@{disadvantages_quirks}" title="Macro: @{NAME|disadvantages_quirks_display}" />
 					</div>
 				</div> <!-- .row -->
 				
@@ -6775,7 +6758,7 @@ and Advantages.
 						<span data-i18n="skills-label">Skills</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_skill_technique_points" disabled="disabled" value="@{skills_points} + @{techniques_points} + @{techniques_revised_points}" title="Macro name: @{skill_technique_points}" />
+						<input type="text" name="attr_skill_technique_points" disabled="disabled" value="@{skills_points} + @{techniques_points} + @{techniques_revised_points}" title="Macro: @{NAME|skill_technique_points}" />
 					</div>
 				</div> <!-- .row -->
 				
@@ -6784,7 +6767,7 @@ and Advantages.
 						<span data-i18n="skills-label">Skills</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_skill_technique_points" disabled="disabled" value="@{skills_points} + @{techniques_points} + @{techniques_revised_points}" title="Macro name: @{skill_technique_points}" />
+						<input type="text" name="attr_skill_technique_points" disabled="disabled" value="@{skills_points} + @{techniques_points} + @{techniques_revised_points}" title="Macro: @{NAME|skill_technique_points}" />
 					</div>
 				</div> <!-- .row -->
 				
@@ -6793,7 +6776,7 @@ and Advantages.
 						<span data-i18n="skills-label">Skills</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_skill_points" disabled="disabled" value="@{skills_points}" title="Macro name: @{skill_points}" />
+						<input type="text" name="attr_skill_points" disabled="disabled" value="@{skills_points}" title="Macro: @{NAME|skill_points}" />
 					</div>
 				</div> <!-- .row -->
 				
@@ -6807,7 +6790,7 @@ and Advantages.
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_techniques_total_points" disabled="disabled" value="@{techniques_points}" title="Macro name: @{techniques_total_points}" />
+						<input type="text" name="attr_techniques_total_points" disabled="disabled" value="@{techniques_points}" title="Macro: @{NAME|techniques_total_points}" />
 					</div>
 				</div> <!-- .row -->
 				
@@ -6821,7 +6804,7 @@ and Advantages.
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_techniques_total_points" disabled="disabled" value="@{techniques_revised_points}" title="Macro name: @{techniques_total_points}" />
+						<input type="text" name="attr_techniques_total_points" disabled="disabled" value="@{techniques_revised_points}" title="Macro: @{NAME|techniques_total_points}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row row-skills">
@@ -6829,7 +6812,7 @@ and Advantages.
 						<span data-i18n="spells-label">Spells</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_spells_total_points" disabled="disabled" value="@{spells_points}" title="Macro name: @{spell_total_points}" />
+						<input type="text" name="attr_spells_total_points" disabled="disabled" value="@{spells_points}" title="Macro: @{NAME|spell_total_points}" />
 					</div>
 				</div> <!-- .row -->
 				
@@ -6838,7 +6821,7 @@ and Advantages.
 						<span data-i18n="other-label">Other</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_misc_points" value="0" title="Macro name: misc_points" />
+						<input type="text" name="attr_misc_points" value="0" title="Macro: @{NAME|misc_points}" />
 					</div>
 				</div> <!-- .row -->
 				
@@ -6873,10 +6856,10 @@ and Advantages.
 					<div class="cell col0 label">
 						<!-- idkey is the key used by either GCA or GCS. Can be used to update and advantage instead of just adding -->
 						<input type="hidden" name="attr_native_language_idkey" />
-						<input type="text" style="font-weight:bold;" name="attr_name_native_language" placeholder="-Enter Native Language here" title="Macro name: name_native_language" />
+						<input type="text" style="font-weight:bold;" name="attr_name_native_language" placeholder="-Enter Native Language here" title="Macro: @{NAME|name_native_language}" />
 					</div>
 					<div class="cell col1">
-						<select name="attr_native_language_spoken" title="Macro name: @{native_language_spoken}">
+						<select name="attr_native_language_spoken" title="Macro: @{NAME|native_language_spoken}">
 							<option value="0" data-i18n="option-native" selected>Native</option>
 							<option value="-1" data-i18n="option-accented">Accented</option>
 							<option value="-2" data-i18n="option-broken">Broken</option>
@@ -6884,7 +6867,7 @@ and Advantages.
 						</select>
 					</div>
 					<div class="cell col2">
-						<select name="attr_native_language_written" title="Macro name: @{native_language_written}">
+						<select name="attr_native_language_written" title="Macro: @{NAME|native_language_written}">
 							<option value="0" data-i18n="option-native" selected>Native</option>
 							<option value="-1" data-i18n="option-literate">Literate</option>
 							<option value="-2" data-i18n="option-semi-literate">Semi-literate</option>
@@ -6892,7 +6875,7 @@ and Advantages.
 						</select>
 					</div>
 					<div class="cell col3">
-						<input type="text" name="attr_native_language_points" value="@{native_language_spoken} + @{native_language_written}" disabled="disabled" title="Macro name: @{native_language_points}" />
+						<input type="text" name="attr_native_language_points" value="@{native_language_spoken} + @{native_language_written}" disabled="disabled" title="Macro: @{NAME|native_language_points}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="header">
@@ -6914,10 +6897,10 @@ and Advantages.
 						<div class="cell col0">
 							<!-- idkey is the key used by either GCA or GCS. Can be used to update and advantage instead of just adding -->
 							<input type="hidden" name="attr_idkey" />
-							<input type="text" name="attr_name" title="Macro table name: repeating_languages. Field name: name" />
+							<input type="text" name="attr_name" title="Macro: @{NAME|repeating_languages_$[row #]_name}" />
 						</div>
 						<div class="cell col1">
-							<select name="attr_spoken" title="Macro table name: repeating_languages. Field name: @{spoken}">
+							<select name="attr_spoken" title="Macro: @{NAME|repeating_languages_$[row #]_spoken}">
 								<option value="3" data-i18n="option-native">Native</option>
 								<option value="2" data-i18n="option-accented">Accented</option>
 								<option value="1" data-i18n="option-broken">Broken</option>
@@ -6925,7 +6908,7 @@ and Advantages.
 							</select>
 						</div>
 						<div class="cell col2">
-							<select name="attr_written" title="Macro table name: repeating_languages. Field name: @{written}">
+							<select name="attr_written" title="Macro: @{NAME|repeating_languages_$[row #]_written}">
 								<option value="3" data-i18n="option-native">Native</option>
 								<option value="2" data-i18n="option-literate">Literate</option>
 								<option value="1" data-i18n="option-semi-literate">Semi-literate</option>
@@ -6933,7 +6916,7 @@ and Advantages.
 							</select>
 						</div>
 						<div class="cell col3">
-							<input type="text" name="attr_points" value="@{spoken} + @{written}" disabled="disabled" title="Macro table name: repeating_languages. Field name: points" />
+							<input type="text" name="attr_points" value="@{spoken} + @{written}" disabled="disabled" title="Macro: @{NAME|repeating_languages_$[row #]_points}" />
 						</div>
 					</div> <!-- .row -->
 				</fieldset> <!-- .repeating_languages -->
@@ -6961,7 +6944,7 @@ and Advantages.
 						<span data-i18n="campaign-technology-level-label">Campaign Tech Level</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_campaign_tl" title="Macro name: @{campaign_tl}" />
+						<input type="text" name="attr_campaign_tl" title="Macro: @{NAME|campaign_tl}" />
 					</div>
 					<div class="cell col2">
 						&nbsp;
@@ -6972,10 +6955,10 @@ and Advantages.
 						<span data-i18n="your-technology-level-label">Your Tech Level</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_tl" title="Macro name: @{tl}" />
+						<input type="text" name="attr_tl" title="Macro: @{NAME|tl}" />
 					</div>
 					<div class="cell col2">
-						<input type="number" step="5" name="attr_tl_pts" value="0" title="Macro name: @{tl_pts}" />
+						<input type="number" step="5" name="attr_tl_pts" value="0" title="Macro: @{NAME|tl_pts}" />
 					</div>
 				</div> <!-- .row -->
 			</div> <!-- .table -->
@@ -7011,10 +6994,10 @@ and Advantages.
 						<div class="cell col0">
 							<!-- idkey is the key used by either GCA or GCS. Can be used to update and advantage instead of just adding -->
 							<input type="hidden" name="attr_idkey" />
-							<input type="text" name="attr_name" title="Macro table name: repeating_cultures. Field name: name" />
+							<input type="text" name="attr_name" title="Macro: @{NAME|repeating_cultures_$[row #]_name}" />
 						</div>
 						<div class="cell col1">
-							<input type="number" name="attr_points" title="Macro table name: repeating_cultures. Field name: points" />
+							<input type="number" name="attr_points" title="Macro: @{NAME|repeating_cultures_$[row #]_points}" />
 						</div>
 					</div> <!-- .row -->
 
@@ -7022,7 +7005,7 @@ and Advantages.
 						
 						<div class="row">
 							<div class="cell label">
-								<textarea class="text-left notes" name="attr_notes" title="Macro: repeating_cultures_{$1}_notes. $1 = Row number OR the Row ID."></textarea>
+								<textarea class="text-left notes" name="attr_notes" title="Macro: @{NAME|repeating_cultures_$[row #]_notes}"></textarea>
 							</div>
 						</div> <!-- .row -->
 					</div>
@@ -7096,22 +7079,22 @@ PU2:126 = Power-Ups 2. Page 126
 						<div class="cell col0">
 							<!-- idkey is the key used by either GCA or GCS. Can be used to update and advantage instead of just adding -->
 							<input type="hidden" name="attr_idkey" />
-							<input type="text" name="attr_name" title="Macro table name: repeating_traits. Field name: name" />
+							<input type="text" name="attr_name" title="Macro: @{NAME|repeating_traits_$[row #]_name}" />
 						</div>
 						<div class="cell col1">
-							<input type="number" name="attr_trait_level" step="1" title="Macro table name: repeating_traits. field name: trait_level" />
+							<input type="number" name="attr_trait_level" step="1" title="Macro: @{NAME|repeating_traits_$[row #]_trait_level}" />
 						</div>
 						<div class="cell col1">
-							<input type="number" name="attr_foa" min="3" max="18" step="1" title="Macro table name: repeating_traits. Field name: foa" />
+							<input type="number" name="attr_foa" min="3" max="18" step="1" title="Macro: @{NAME|repeating_traits_$[row #]_foa}" />
 						</div>
 						<div class="cell col2">
 							<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Frequency of Appearance Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{foa} + @{modifier}]]}} {{notes=@{notes}}} {{showNotes=[[@{show_notes}]]}} {{bookReference=@{ref}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{customSuccessNote=@{success_notes}}} {{customCriticalSuccessNote=@{critical_success_notes}}} {{customFailNote=@{fail_notes}}} {{customCriticalFailNote=@{critical_fail_notes}}}" name="roll_vsAFOA" />
 						</div>
 						<div class="cell col3">
-							<input type="number" name="attr_points" title="Macro table name: repeating_traits. Field name: points" />
+							<input type="number" name="attr_points" title="Macro: @{NAME|repeating_traits_$[row #]_points}" />
 						</div>
 						<div class="cell col4">
-							<input type="text" name="attr_ref" title="Macro table name: repeating_traits. Field name: ref" />
+							<input type="text" name="attr_ref" title="Macro: @{NAME|repeating_traits_$[row #]_ref}" />
 						</div>
 					</div> <!-- .row -->
 
@@ -7125,7 +7108,7 @@ PU2:126 = Power-Ups 2. Page 126
 										<span data-i18n="show-notes-below-label">Show notes below in roll template</span>
 									</span> 	
 								</div>
-								<textarea class="text-left full-width-margin-zero texbox-height-medium" name="attr_notes" title="Macro table name: repeating_traits. Field name: notes"></textarea>
+								<textarea class="text-left full-width-margin-zero texbox-height-medium" name="attr_notes" title="Macro: @{NAME|repeating_traits_$[row #]_notes}"></textarea>
 							</div>
 						</div> <!-- .row -->
 
@@ -7140,7 +7123,7 @@ PU2:126 = Power-Ups 2. Page 126
 	Example: Select Location: ?{Location|Head|Torso}
 									</span>
 								</span>
-								<textarea class="text-left chat-size" name="attr_success_notes" title="Macro table name: repeating_traits. Field name: success_notes"></textarea>
+								<textarea class="text-left chat-size" name="attr_success_notes" title="Macro: @{NAME|repeating_traits_$[row #]_success_notes}"></textarea>
 							</div>
 							<div class="cell">
 								<div class="popup">
@@ -7152,7 +7135,7 @@ PU2:126 = Power-Ups 2. Page 126
 	Example: Does an additional [[1d6]] fire damage.
 									</span>
 								</span>
-								<textarea class="text-left chat-size" name="attr_critical_success_notes" title="Macro table name: repeating_traits. Field name: critical_success_notes"></textarea>
+								<textarea class="text-left chat-size" name="attr_critical_success_notes" title="Macro: @{NAME|repeating_traits_$[row #]_critical_success_notes}"></textarea>
 							</div>
 						</div> <!-- .row -->
 
@@ -7167,7 +7150,7 @@ PU2:126 = Power-Ups 2. Page 126
 Example: Select Location: ?{Location|Head|Torso}
 									</span>
 								</span>
-								<textarea class="text-left chat-size" name="attr_fail_notes" title="Macro table name: repeating_traits. Field name: fail_notes"></textarea>
+								<textarea class="text-left chat-size" name="attr_fail_notes" title="Macro: @{NAME|repeating_traits_$[row #]_critical_fail_notes}"></textarea>
 							</div>
 							<div class="cell">
 								<div class="popup">
@@ -7179,7 +7162,7 @@ Example: Select Location: ?{Location|Head|Torso}
 Example: Does an additional [[1d6]] fire damage.
 									</span>
 								</span>
-								<textarea class="text-left chat-size" name="attr_critical_fail_notes" title="Macro table name: repeating_traits. Field name: critical_fail_notes"></textarea>
+								<textarea class="text-left chat-size" name="attr_critical_fail_notes" title="Macro: @{NAME|repeating_traits_$[row #]_critical_fail_notes}"></textarea>
 							</div>
 						</div> <!-- .row -->
 
@@ -7246,19 +7229,19 @@ PU2:126 = Power-Ups 2. Page 126
 						<div class="cell col0">
 							<!-- idkey is the key used by either GCA or GCS. Can be used to update and advantage instead of just adding -->
 							<input type="hidden" name="attr_idkey" />
-							<input type="text" name="attr_name" title="Macro table name: repeating_perks. Field name: name" />
+							<input type="text" name="attr_name" title="Macro: @{NAME|repeating_perks_$[row #]_name}" />
 						</div>
 						<div class="cell col1">
-							<input type="number" min="3" max="18" step="1" name="attr_foa" title="Macro table name: repeating_perks. Field name: foa" />
+							<input type="number" min="3" max="18" step="1" name="attr_foa" title="Macro: @{NAME|repeating_perks_$[row #]_foa}" />
 						</div>
 						<div class="cell col2">
 							<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Frequency of Appearance Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{foa} + @{modifier}]]}} {{notes=@{notes}}} {{showNotes=[[@{show_notes}]]}} {{bookReference=@{ref}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}}" name="roll_vsAFOA" />
 						</div>
 						<div class="cell col3">
-							<input type="number" name="attr_points" value="1" title="Macro table name: repeating_perks. Field name: points" />
+							<input type="number" name="attr_points" value="1" title="Macro: @{NAME|repeating_perks_$[row #]_points}" />
 						</div>
 						<div class="cell col4">
-							<input type="text" name="attr_ref" title="Macro table name: repeating_perks. Field name: ref" />
+							<input type="text" name="attr_ref" title="Macro: @{NAME|repeating_perks_$[row #]_ref}" />
 						</div>
 					</div> <!-- .row -->
 					<div class="row row-details notebox">
@@ -7269,7 +7252,7 @@ PU2:126 = Power-Ups 2. Page 126
 									<span data-i18n="show-notes-below-label">Show notes below in roll template</span>
 								</span>
 							</div>
-							<textarea name="attr_notes" title="Macro table name: repeating_perks. Field name: notes"></textarea>
+							<textarea name="attr_notes" title="Macro: @{NAME|repeating_perks_$[row #]_notes}"></textarea>
 						</div>
 					</div> <!-- .row -->
 				</fieldset> <!-- .repeating_perks -->
@@ -7327,19 +7310,19 @@ PU2:126 = Power-Ups 2. Page 126
 						<div class="cell col0">
 							<!-- idkey is the key used by either GCA or GCS. Can be used to update and advantage instead of just adding -->
 							<input type="hidden" name="attr_idkey" />
-							<input type="text" name="attr_name" title="Macro table name: repeating_quirks. Field name: name" />
+							<input type="text" name="attr_name" title="Macro: @{NAME|repeating_quirks_$[row #]_name}" />
 						</div>
 						<div class="cell col1">
-							<input type="number" name="attr_control_rating" title="Macro table name: repeating_quirks. Field name: control_rating" />
+							<input type="number" name="attr_control_rating" title="Macro: @{NAME|repeating_quirks_$[row #]_control_rating}" />
 						</div>
 						<div class="cell col2">
 							<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Self-control Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{control_rating} + @{modifier}]]}} {{notes=@{notes}}} {{showNotes=[[@{show_notes}]]}} {{bookReference=@{ref}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}}" name="roll_vsDSCR" />
 						</div>
 						<div class="cell col3">
-							<input type="number" name="attr_points" value="-1" title="Macro table name: repeating_quirks. Field name: points" />
+							<input type="number" name="attr_points" value="-1" title="Macro: @{NAME|repeating_quirks_$[row #]_points}" />
 						</div>
 						<div class="cell col4">
-							<input type="text" name="attr_ref" title="Macro table name: repeating_quirks. Field name: ref" />
+							<input type="text" name="attr_ref" title="Macro: @{NAME|repeating_quirks_$[row #]_ref}" />
 						</div>
 					</div> <!-- .row -->
 					<div class="row row-details notebox">
@@ -7350,7 +7333,7 @@ PU2:126 = Power-Ups 2. Page 126
 									<span data-i18n="show-notes-below-label">Show notes below in roll template</span>
 								</span>
 							</div>
-							<textarea name="attr_notes" title="Macro table name: repeating_quirks. Field name: notes"></textarea>
+							<textarea name="attr_notes" title="Macro: @{NAME|repeating_quirks_$[row #]_notes}"></textarea>
 						</div>
 					</div> <!-- .row -->
 				</fieldset> <!-- .repeating_perks -->
@@ -7421,22 +7404,22 @@ PU2:126 = Power-Ups 2. Page 126
 						<div class="cell col0">
 							<!-- idkey is the key used by either GCA or GCS. Can be used to update and advantage instead of just adding -->
 							<input type="hidden" name="attr_idkey" />
-							<input type="text" name="attr_name" title="Macro table name: repeating_disadvantages. Field name: name" />
+							<input type="text" name="attr_name" title="Macro: @{NAME|repeating_disadvantages_$[row #]_name}" />
 						</div>
 						<div class="cell col1">
-							<input type="number" step="1" name="attr_trait_level" title="Macro table name: repeating_disadvantages. Field name: trait_level" />
+							<input type="number" step="1" name="attr_trait_level" title="Macro: @{NAME|repeating_disadvantages_$[row #]_trait_level}" />
 						</div>
 						<div class="cell col1">
-							<input type="number" min="0" step="1" name="attr_control_rating" title="Macro table name: repeating_disadvantages. Field name: control_rating" />
+							<input type="number" min="0" step="1" name="attr_control_rating" title="Macro: @{NAME|repeating_disadvantages_$[row #]_control_rating}" />
 						</div>
 						<div class="cell col2">
 							<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Self-control Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{control_rating} + @{modifier}]]}} {{notes=@{notes}}} {{showNotes=[[@{show_notes}]]}} {{bookReference=@{ref}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{customSuccessNote=@{success_notes}}} {{customCriticalSuccessNote=@{critical_success_notes}}} {{customFailNote=@{fail_notes}}} {{customCriticalFailNote=@{critical_fail_notes}}}" name="roll_vsDSCR" />
 						</div>
 						<div class="cell col3">
-							<input type="number" name="attr_points" title="Macro table name: repeating_disadvantages. Field name: points" />
+							<input type="number" name="attr_points" title="Macro: @{NAME|repeating_disadvantages_$[row #]_points}" />
 						</div>
 						<div class="cell col4">
-							<input type="text" name="attr_ref" title="Macro table name: repeating_disadvantages. Field name: ref" />
+							<input type="text" name="attr_ref" title="Macro: @{NAME|repeating_disadvantages_$[row #]_ref}" />
 						</div>
 					</div> <!-- .row -->
 
@@ -7450,7 +7433,7 @@ PU2:126 = Power-Ups 2. Page 126
 										<span data-i18n="show-notes-below-label">Show notes below in roll template</span>
 									</span> 	
 								</div>
-								<textarea class="text-left full-width-margin-zero texbox-height-medium" name="attr_notes" title="Macro table name: repeating_disadvantages Field name: notes"></textarea>
+								<textarea class="text-left full-width-margin-zero texbox-height-medium" name="attr_notes" title="Macro: @{NAME|repeating_disadvantages_$[row #]_notes}"></textarea>
 							</div>
 						</div> <!-- .row -->
 
@@ -7465,7 +7448,7 @@ PU2:126 = Power-Ups 2. Page 126
 	Example: Select Location: ?{Location|Head|Torso}
 									</span>
 								</span>
-								<textarea class="text-left chat-size" name="attr_success_notes" title="Macro table name: repeating_disadvantages. Field name: success_notes"></textarea>
+								<textarea class="text-left chat-size" name="attr_success_notes" title="Macro: @{NAME|repeating_disadvantages_$[row #]_success_notes}"></textarea>
 							</div>
 							<div class="cell">
 								<div class="popup">
@@ -7477,7 +7460,7 @@ PU2:126 = Power-Ups 2. Page 126
 	Example: Does an additional [[1d6]] fire damage.
 									</span>
 								</span>
-								<textarea class="text-left chat-size" name="attr_critical_success_notes" title="Macro table name: repeating_disadvantages. Field name: critical_success_notes"></textarea>
+								<textarea class="text-left chat-size" name="attr_critical_success_notes" title="Macro: @{NAME|repeating_disadvantages_$[row #]_critical_success_notes}"></textarea>
 							</div>
 						</div> <!-- .row -->
 
@@ -7492,7 +7475,7 @@ PU2:126 = Power-Ups 2. Page 126
 Example: Select Location: ?{Location|Head|Torso}
 									</span>
 								</span>
-								<textarea class="text-left chat-size" name="attr_fail_notes" title="Macro table name: repeating_disadvantages. Field name: fail_notes"></textarea>
+								<textarea class="text-left chat-size" name="attr_fail_notes" title="Macro: @{NAME|repeating_disadvantages_$[row #]_fail_notes}"></textarea>
 							</div>
 							<div class="cell">
 								<div class="popup">
@@ -7504,7 +7487,7 @@ Example: Select Location: ?{Location|Head|Torso}
 Example: Does an additional [[1d6]] fire damage.
 									</span>
 								</span>
-								<textarea class="text-left chat-size" name="attr_critical_fail_notes" title="Macro table name: repeating_disadvantages. Field name: critical_fail_notes"></textarea>
+								<textarea class="text-left chat-size" name="attr_critical_fail_notes" title="Macro: @{NAME|repeating_disadvantages_$[row #]_critical_fail_notes}"></textarea>
 							</div>
 						</div> <!-- .row -->
 
@@ -7575,10 +7558,10 @@ PU2:126 = Power-Ups 2. Page 126
 					<div class="cell col1"></div>
 					<div class="cell col2"></div>
 					<div class="cell col3">
-						<input type="text" name="attr_trait_racial_points" disabled="disabled" value="@{racial_points}" title="Macro name: @{trait_racial_points}" />
+						<input type="text" name="attr_trait_racial_points" disabled="disabled" value="@{racial_points}" title="Macro: @{NAME|trait_racial_points}" />
 					</div>
 					<div class="cell col4">
-						<input type="text" name="attr_race_ref" title="Macro name: race_ref" />
+						<input type="text" name="attr_race_ref" title="Macro: @{NAME|race_ref}" />
 					</div>
 				</div> 
 				<div class="row">
@@ -7599,22 +7582,22 @@ PU2:126 = Power-Ups 2. Page 126
 						<div class="cell col0">
 							<!-- idkey is the key used by either GCA or GCS. Can be used to update and advantage instead of just adding -->
 							<input type="hidden" name="attr_idkey" />
-							<input type="text" name="attr_name" title="Macro table name: repeating_racial. Field name: name" />
+							<input type="text" name="attr_name" title="Macro: @{NAME|repeating_racial_$[row #]_name}" />
 						</div>
 						<div class="cell col1">
-							<input type="number" step="1" name="attr_trait_level" title="Macro table name: repeating_racial. Field name: trait_level" />
+							<input type="number" step="1" name="attr_trait_level" title="Macro: @{NAME|repeating_racial_$[row #]_trait_level}" />
 						</div>
 						<div class="cell col1">
-							<input type="number" min="1" step="1" name="attr_control_rating" title="Macro table name: repeating_racial. Field name: control_rating" />
+							<input type="number" min="1" step="1" name="attr_control_rating" title="Macro: @{NAME|repeating_racial_$[row #]_control_rating}" />
 						</div>
 						<div class="cell col2">
 							<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Self-control Check}} {{activeDefense=[[0]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{control_rating} + @{modifier}]]}} {{notes=@{notes}}} {{showNotes=[[@{show_notes}]]}} {{bookReference=@{ref}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}} {{customSuccessNote=@{success_notes}}} {{customCriticalSuccessNote=@{critical_success_notes}}} {{customFailNote=@{fail_notes}}} {{customCriticalFailNote=@{critical_fail_notes}}}" name="roll_vsRSCR" />
 						</div>
 						<div class="cell col3">
-							<input type="number" name="attr_points" title="Macro table name: repeating_racial. Field name: points" />
+							<input type="number" name="attr_points" title="Macro: @{NAME|repeating_racial_$[row #]_points}" />
 						</div>
 						<div class="cell col4">
-							<input type="text" name="attr_ref" title="Macro table name: repeating_racial. Field name: ref" />
+							<input type="text" name="attr_ref" title="Macro: @{NAME|repeating_racial_$[row #]_ref}" />
 						</div>
 					</div> <!-- .row -->
 					
@@ -7628,7 +7611,7 @@ PU2:126 = Power-Ups 2. Page 126
 										<span data-i18n="show-notes-below-label">Show notes below in roll template</span>
 									</span> 	
 								</div>
-								<textarea class="text-left full-width-margin-zero texbox-height-medium" name="attr_notes" title="Macro table name: repeating_racial Field name: notes"></textarea>
+								<textarea class="text-left full-width-margin-zero texbox-height-medium" name="attr_notes" title="Macro: @{NAME|repeating_racial_$[row #]_notes}"></textarea>
 							</div>
 						</div> <!-- .row -->
 
@@ -7643,7 +7626,7 @@ PU2:126 = Power-Ups 2. Page 126
 	Example: Select Location: ?{Location|Head|Torso}
 									</span>
 								</span>
-								<textarea class="text-left chat-size" name="attr_success_notes" title="Macro table name: repeating_racial. Field name: success_notes"></textarea>
+								<textarea class="text-left chat-size" name="attr_success_notes" title="Macro: @{NAME|repeating_racial_$[row #]_success_notes}"></textarea>
 							</div>
 							<div class="cell">
 								<div class="popup">
@@ -7655,7 +7638,7 @@ PU2:126 = Power-Ups 2. Page 126
 	Example: Does an additional [[1d6]] fire damage.
 									</span>
 								</span>
-								<textarea class="text-left chat-size" name="attr_critical_success_notes" title="Macro table name: repeating_racial. Field name: critical_success_notes"></textarea>
+								<textarea class="text-left chat-size" name="attr_critical_success_notes" title="Macro: @{NAME|repeating_racial_$[row #]_critical_success_notes}"></textarea>
 							</div>
 						</div> <!-- .row -->
 
@@ -7670,7 +7653,7 @@ PU2:126 = Power-Ups 2. Page 126
 Example: Select Location: ?{Location|Head|Torso}
 									</span>
 								</span>
-								<textarea class="text-left chat-size" name="attr_fail_notes" title="Macro table name: repeating_racial. Field name: fail_notes"></textarea>
+								<textarea class="text-left chat-size" name="attr_fail_notes" title="Macro: @{NAME|repeating_racial_$[row #]_fail_notes}"></textarea>
 							</div>
 							<div class="cell">
 								<div class="popup">
@@ -7682,7 +7665,7 @@ Example: Select Location: ?{Location|Head|Torso}
 Example: Does an additional [[1d6]] fire damage.
 									</span>
 								</span>
-								<textarea class="text-left chat-size" name="attr_critical_fail_notes" title="Macro table name: repeating_racial. Field name: critical_fail_notes"></textarea>
+								<textarea class="text-left chat-size" name="attr_critical_fail_notes" title="Macro: @{NAME|repeating_racial_$[row #]_critical_fail_notes}"></textarea>
 							</div>
 						</div> <!-- .row -->
 
@@ -7708,7 +7691,7 @@ Example: Does an additional [[1d6]] fire damage.
 						<span data-i18n="full-name-label">Full name</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_fullname" title="Macro name: fullname" />
+						<input type="text" name="attr_fullname" title="Macro: @{NAME|fullname}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row">
@@ -7724,7 +7707,7 @@ Example: Does an additional [[1d6]] fire damage.
 						<span data-i18n="nickname-label">Nickname</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_nickname" title="Macro name: nickname" />
+						<input type="text" name="attr_nickname" title="Macro: @{NAME|nickname}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row">
@@ -7732,7 +7715,7 @@ Example: Does an additional [[1d6]] fire damage.
 						<span data-i18n="race-label">Race</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_race" title="Macro name: race" />
+						<input type="text" name="attr_race" title="Macro: @{NAME|race}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row">
@@ -7740,7 +7723,7 @@ Example: Does an additional [[1d6]] fire damage.
 						<span data-i18n="gender-label">Gender</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_gender" title="Macro name: gender" />
+						<input type="text" name="attr_gender" title="Macro: @{NAME|gender}" />
 					</div>
 				</div> <!-- .row -->
 
@@ -7755,7 +7738,7 @@ Example: Does an additional [[1d6]] fire damage.
 						</span>
 					</div>
 					<div class="cell col-half">
-						<input type="number" name="attr_size" value="0" title="Macro name: size" />
+						<input type="number" name="attr_size" value="0" title="Macro: @{NAME|size}" />
 					</div>
 
 					<div class="cell col-apply-size-modifier label">
@@ -7779,7 +7762,7 @@ Example: Does an additional [[1d6]] fire damage.
 						</span>
 					</div>
 					<div class="cell col-input">
-						<input type="number" name="attr_reach" value="0" readonly="readonly" title="Macro name: reach" />
+						<input type="number" name="attr_reach" value="0" readonly="readonly" title="Macro: @{NAME|reach}" />
 					</div>
 
 					<div class="cell col0 label">
@@ -7791,7 +7774,7 @@ Example: Does an additional [[1d6]] fire damage.
 						</span>
 					</div>
 					<div class="cell col-input">
-						<input type="checkbox" name="attr_is_close_reach" title="Macro name: is_close_reach" />
+						<input type="checkbox" name="attr_is_close_reach" title="Macro: @{NAME|is_close_reach}" />
 					</div>
 
 				</div> <!-- .row -->
@@ -7801,7 +7784,7 @@ Example: Does an additional [[1d6]] fire damage.
 						<span data-i18n="main-hand-label">Main Hand</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_hand" title="Macro name: hand" />
+						<input type="text" name="attr_hand" title="Macro: @{NAME|hand}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row row-textarea-reactions">
@@ -7809,7 +7792,7 @@ Example: Does an additional [[1d6]] fire damage.
 						<span data-i18n="reactions-label">Reactions</span>
 					</div>
 					<div class="cell col1">
-						<textarea name="attr_reactions" title="Macro name: reactions"></textarea>
+						<textarea name="attr_reactions" title="Macro: @{NAME|reactions}"></textarea>
 					</div>
 				</div> <!-- .row -->
 			</div> <!-- .table -->
@@ -7828,7 +7811,7 @@ Example: Does an additional [[1d6]] fire damage.
 						<span data-i18n="age-label">Age</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_age" title="Macro name: age" />
+						<input type="text" name="attr_age" title="Macro: @{NAME|age}" />
 					</div>
 				</div> <!-- .row -->
 
@@ -7837,7 +7820,7 @@ Example: Does an additional [[1d6]] fire damage.
 						<span data-i18n="height-label">Height</span>
 					</div>
 					<div class="cell col-half">
-						<input type="text" name="attr_height" title="Macro name: height" />
+						<input type="text" name="attr_height" title="Macro: @{NAME|height}" />
 					</div>
 					<div class="cell col0 label">
 						<div class="popup">
@@ -7853,7 +7836,7 @@ Weight and thus needs to be numerical.
 						</span>
 					</div>
 					<div class="cell col-half">
-						<input type="number" name="attr_weight" title="Macro name: weight" />
+						<input type="number" name="attr_weight" title="Macro: @{NAME|weight}" />
 					</div>
 				</div> <!-- .row -->
 
@@ -7862,7 +7845,7 @@ Weight and thus needs to be numerical.
 						<span data-i18n="eyes-label">Eyes</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_eyes" title="Macro name: eyes" />
+						<input type="text" name="attr_eyes" title="Macro: @{NAME|eyes}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row">
@@ -7870,7 +7853,7 @@ Weight and thus needs to be numerical.
 						<span data-i18n="build-label">Build</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_build" title="Macro name: build" />
+						<input type="text" name="attr_build" title="Macro: @{NAME|build}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row">
@@ -7878,7 +7861,7 @@ Weight and thus needs to be numerical.
 						<span data-i18n="hair-label">Hair</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_hair" title="Macro name: hair" />
+						<input type="text" name="attr_hair" title="Macro: @{NAME|hair}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row row-textarea">
@@ -7895,7 +7878,7 @@ the Traits tab under Advantages or Disadvantages.
 						</span>
 					</div>
 					<div class="cell col1">
-						<select name="attr_appearance" title="Macro name: appearance">
+						<select name="attr_appearance" title="Macro: @{NAME|appearance}">
 							<option value="-24" data-i18n="option-horrific">Horrific (-6)</option>
 							<option value="-20" data-i18n="option-monstrous">Monstrous (-5)</option>
 							<option value="-16" data-i18n="option-hideous">Hideous (-4)</option>
@@ -7907,7 +7890,7 @@ the Traits tab under Advantages or Disadvantages.
 							<option value="16" data-i18n="option-very-handsome-beautiful">Very Handsome/Beautiful (+6/2)</option>
 							<option value="20" data-i18n="option-transcendent">Transcendent (+8/2)</option>
 						</select>
-						<textarea name="attr_general_appearance" title="Macro name: appearance"></textarea>
+						<textarea name="attr_general_appearance" title="Macro: @{NAME|general_appearance}"></textarea>
 					</div>
 				</div> <!-- .row -->
 				<div class="row row-textarea-features">
@@ -7920,7 +7903,7 @@ the Traits tab under Advantages or Disadvantages.
 						</span>
 					</div>
 					<div class="cell col1 textarea-container">
-						<textarea name="attr_distinguishing_features" title="Macro name: distinguishing_features"></textarea>
+						<textarea name="attr_distinguishing_features" title="Macro: @{NAME|distinguishing_features}"></textarea>
 					</div>
 				</div> <!-- .row -->
 			</div> <!-- .table -->
@@ -7939,7 +7922,7 @@ the Traits tab under Advantages or Disadvantages.
 						<span data-i18n="birth-date-label">Birth Date</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_birth_date" title="Macro name: birth_date" />
+						<input type="text" name="attr_birth_date" title="Macro: @{NAME|birth_date}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row">
@@ -7947,7 +7930,7 @@ the Traits tab under Advantages or Disadvantages.
 						<span data-i18n="birth-place-label">Birth Place</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_birth_place" title="Macro name: birth_place" />
+						<input type="text" name="attr_birth_place" title="Macro: @{NAME|birth_place}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row">
@@ -7955,7 +7938,7 @@ the Traits tab under Advantages or Disadvantages.
 						<span data-i18n="status-label">Status</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_status" title="Macro name: status" />
+						<input type="text" name="attr_status" title="Macro: @{NAME|status}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row">
@@ -7963,7 +7946,7 @@ the Traits tab under Advantages or Disadvantages.
 						<span data-i18n="wealth-label">Wealth</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_wealth" title="Macro name: wealth" />
+						<input type="text" name="attr_wealth" title="Macro: @{NAME|wealth}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row">
@@ -7971,7 +7954,7 @@ the Traits tab under Advantages or Disadvantages.
 						<span data-i18n="income-label">Income</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_income" title="Macro name: income" />
+						<input type="text" name="attr_income" title="Macro: @{NAME|income}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row">
@@ -7979,7 +7962,7 @@ the Traits tab under Advantages or Disadvantages.
 						<span data-i18n="cost-of-living">Cost of Living</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_cost_of_living" title="Macro name: cost_of_living" />
+						<input type="text" name="attr_cost_of_living" title="Macro: @{NAME|cost_of_living}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row">
@@ -7992,7 +7975,7 @@ the Traits tab under Advantages or Disadvantages.
 						</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_stash" title="Macro name: stash" />
+						<input type="text" name="attr_stash" title="Macro: @{NAME|stash}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row">
@@ -8000,7 +7983,7 @@ the Traits tab under Advantages or Disadvantages.
 						<span data-i18n="affiliations">Affiliations</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_affiliations" value="" title="Macro name: affiliations" />
+						<input type="text" name="attr_affiliations" value="" title="Macro: @{NAME|affiliations}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row">
@@ -8008,7 +7991,7 @@ the Traits tab under Advantages or Disadvantages.
 						<span data-i18n="home-base-label">Home Base</span>
 					</div>
 					<div class="cell col1">
-						<input type="text" name="attr_home_base" title="Macro name: home_base" />
+						<input type="text" name="attr_home_base" title="Macro: @{NAME|home_base}" />
 					</div>
 				</div> <!-- .row -->
 				<div class="row row-textarea-family">
@@ -8016,7 +7999,7 @@ the Traits tab under Advantages or Disadvantages.
 						<span data-i18n="family-label">Family</span>
 					</div>
 					<div class="cell col1">
-						<textarea name="attr_family" title="Macro name: family"></textarea>
+						<textarea name="attr_family" title="Macro: @{NAME|family}"></textarea>
 					</div>
 				</div> <!-- .row -->
 			</div> <!-- .table -->
@@ -8032,7 +8015,7 @@ the Traits tab under Advantages or Disadvantages.
 				</div> <!-- .header -->
 				<div class="row row-textarea">
 					<div class="cell col0">
-						<textarea name="attr_misc_notes" title="Macro name: misc_notes"></textarea>
+						<textarea name="attr_misc_notes" title="Macro: @{NAME|misc_notes}"></textarea>
 					</div>
 				</div> <!-- .row -->
 			</div> <!-- .table -->
@@ -8058,7 +8041,7 @@ Engineering: Back to School.
 				</div> <!-- .header -->
 				<div class="row row-textarea">
 					<div class="cell col0">
-						<textarea name="attr_training_notes" title="Macro name: training_notes"></textarea>
+						<textarea name="attr_training_notes" title="Macro: @{NAME|training_notes}"></textarea>
 					</div>
 				</div> <!-- .row -->
 			</div> <!-- .table -->
@@ -8246,13 +8229,13 @@ PU2:126 = Power-Ups 2. Page 126
 							<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}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{level} + @{modifier} + @{skill_roll_modifier}, @{skill_roll_max_nine_value} }kl1]]}} {{useModToll=[[@{use_skill_modifier_tool}]]}} {{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}}}" name="roll_vsSL" />
 						</div>
 						<div class="cell col2">
-							<input type="text" name="attr_tl" title="Macro table name: repeating_skills. Field name: tl" />
+							<input type="text" name="attr_tl" title="Macro: @{NAME|repeating_skills_$[row #]_tl}" />
 						</div>
 						<div class="cell col3">
-							<input type="text" name="attr_level" title="Macro table name: repeating_skills. Field name: level" readonly="readonly" value="10"/>
+							<input type="text" name="attr_level" title="Macro: @{NAME|repeating_skills_$[row #]_level}" readonly="readonly" value="10"/>
 						</div>
 						<div class="cell col4">
-							<select name="attr_base" title="Macro table name: repeating_skills. Field name: base">
+							<select name="attr_base" title="Macro: @{NAME|repeating_skills_$[row #]_base}">
 								<option value="@{strength}" data-i18n="option-strength">ST</option>
 								<option value="@{dexterity}" data-i18n="option-dexterity" selected>DX</option>
 								<option value="@{intelligence}" data-i18n="option-intelligence">IQ</option>
@@ -8263,7 +8246,7 @@ PU2:126 = Power-Ups 2. Page 126
 							</select>
 						</div>
 						<div class="cell col5">
-							<select name="attr_difficulty" title="Macro table name: repeating_skills. Field name: difficulty">
+							<select name="attr_difficulty" title="Macro: @{NAME|repeating_skills_$[row #]_difficulty}">
 								<option value="-1" data-i18n="abbreviation-option-easy">E</option>
 								<option value="-2" data-i18n="abbreviation-option-average" selected>A</option>
 								<option value="-3" data-i18n="abbreviation-option-hard">H</option>
@@ -8272,7 +8255,7 @@ PU2:126 = Power-Ups 2. Page 126
 							</select>
 						</div>
 						<div class="cell col6">
-							<input type="number" name="attr_bonus" value="0" title="Macro table name: repeating_skills. Field name: bonus" />
+							<input type="number" name="attr_bonus" value="0" title="Macro: @{NAME|repeating_skills_$[row #]_bonus}" />
 						</div>
 						<div class="cell col7">
 							<input type="hidden" name="attr_use_wildcard_points" value="0" />
@@ -8281,7 +8264,7 @@ PU2:126 = Power-Ups 2. Page 126
 							<input type="number" name="attr_points" value="0" />
 						</div>
 						<div class="cell col8">
-							<input type="text" name="attr_ref" title="Macro table name: repeating_skills. Field name: ref" />
+							<input type="text" name="attr_ref" title="Macro: @{NAME|repeating_skills_$[row #]_ref}" />
 						</div>
 					</div> <!-- .row -->
 					
@@ -8309,7 +8292,7 @@ This example would represent the skill level on that row.
 								<span data-i18n="abbrevation-miscellaneous-label">Misc:</span>
 							</div>
 							<div class="cell">
-								<input type="text" name="attr_skill_misc" title="Macro table name: repeating_skills. Field name: skill_misc" />
+								<input type="text" name="attr_skill_misc" title="Macro: @{NAME|repeating_skills_$[row #]_skill_misc}" />
 							</div>
 							<div class="cell label">
 								<div class="popup">
@@ -8325,7 +8308,7 @@ Examples:<br />
 									</span>
 							</div>
 							<div class="cell">
-								<input type="text" name="attr_skill_mod_notes" title="Macro table name: repeating_skills. Field name: skill_mod_notes" />
+								<input type="text" name="attr_skill_mod_notes" title="Macro: @{NAME|repeating_skills_$[row #]_skill_mod_notes}" />
 							</div>
 						</div> <!-- .row -->
 
@@ -8336,7 +8319,7 @@ Examples:<br />
 									<span data-i18n="show-notes-below-label">Show notes below in roll template</span>
 								</span>
 							</div>
-							<textarea name="attr_notes" title="Macro table name: repeating_skills. Field name: notes"></textarea>
+							<textarea name="attr_notes" title="Macro: @{NAME|repeating_skills_$[row #]_notes}"></textarea>
 						</div>
 
 						<div class="col-notebox">
@@ -8346,7 +8329,7 @@ Examples:<br />
 									<span data-i18n="show-skill-mod-notes-below-label">Show Skill Modifier notes (refer to the actual skill description)</span>
 								</span>
 							</div>
-							<textarea name="attr_skill_mod_description_notes" title="Macro table name: repeating_skills. Field name: skill_mod_description_notes"></textarea>
+							<textarea name="attr_skill_mod_description_notes" title="Macro: @{NAME|repeating_skills_$[row #]_skill_mod_description_notes}"></textarea>
 						</div>
 
 						<div class="col-notebox">
@@ -8356,7 +8339,7 @@ Examples:<br />
 									<span data-i18n="show-skill-conditional-below-label">Show Skill Conditionals notes</span>
 								</span>
 							</div>
-							<textarea name="attr_skill_conditional_notes" title="Macro table name: repeating_skills. Field name: skill_conditional_notes"></textarea>
+							<textarea name="attr_skill_conditional_notes" title="Macro: @{NAME|repeating_skills_$[row #]_skill_conditional_notes}"></textarea>
 						</div>
 
 						<div class="header">
@@ -8380,12 +8363,12 @@ visualize what it will look like in chat.
 								<div class="note-title">
 									<span data-i18n="success-note-label">Success Note:</span>
 								</div>
-								<textarea name="attr_skill_success_note" title="Macro table name: repeating_skills. Field name: skill_success_note"></textarea>
+								<textarea name="attr_skill_success_note" title="Macro: @{NAME|repeating_skills_$[row #]_skill_success_note}"></textarea>
 							</div>
 							
 							<div class="note-input">
 								<div class="note-title"><span data-i18n="critical-success-note-label">Critical Success Note:</span></div>
-								<textarea name="attr_skill_critical_success_note" title="Macro table name: repeating_skills. Field name: skill_critical_success_note"></textarea>
+								<textarea name="attr_skill_critical_success_note" title="Macro: @{NAME|repeating_skills_$[row #]_skill_critical_success_note}"></textarea>
 							</div>
 						</div>
 						
@@ -8393,12 +8376,12 @@ visualize what it will look like in chat.
 							
 							<div class="note-input">
 								<div class="note-title"><div data-i18n="fail-note-label">Fail Note:</div></div>
-								<textarea name="attr_skill_fail_note" title="Macro table name: repeating_skills. Field name: skill_fail_note"></textarea>
+								<textarea name="attr_skill_fail_note" title="Macro: @{NAME|repeating_skills_$[row #]_skill_fail_note}"></textarea>
 							</div>
 							
 							<div class="note-input">
 								<div class="note-title"><span data-i18n="critical-fail-note-label">Critical Fail Note:</span></div>
-								<textarea name="attr_skill_critical_fail_note" title="Macro table name: repeating_skills. Field name: skill_critical_fail_note"></textarea>
+								<textarea name="attr_skill_critical_fail_note" title="Macro: @{NAME|repeating_skills_$[row #]_skill_critical_fail_note}"></textarea>
 							</div>
 							
 						</div>
@@ -8472,31 +8455,31 @@ PU2:126 = Power-Ups 2. Page 126
 					<span class="checkbox"></span>
 					<div class="row row-stats">
 						<div class="cell col0">
-							<input type="text" name="attr_name" title="Macro table name: repeating_techniques. Field name: name" />
+							<input type="text" name="attr_name" title="Macro: @{NAME|repeating_techniques_$[row #]_name}" />
 						</div>
 						<div class="cell col1">
-							<input type="text" name="attr_parent" title="Macro table name: repeating_techniques. Field name: parent" />
+							<input type="text" name="attr_parent" title="Macro: @{NAME|repeating_techniques_$[row #]_parent}" />
 						</div>
 						<div class="cell col2">
-							<input type="number" name="attr_min" value="0" title="Macro table name: repeating_techniques. Field name: min" />
+							<input type="number" name="attr_min" value="0" title="Macro: @{NAME|repeating_techniques_$[row #]_min}" />
 						</div>
 						<div class="cell col3">
 							---
 						</div>
 						<div class="cell col4">
-							<input type="text" name="attr_level" disabled="disabled" title="Macro table name: repeating_techniques. Field name: level" value="@{min} + floor(@{points} / @{points_per_level}) + @{bonus}"/>
+							<input type="text" name="attr_level" disabled="disabled" title="Macro: @{NAME|repeating_techniques_$[row #]_level}" value="@{min} + floor(@{points} / @{points_per_level}) + @{bonus}"/>
 						</div>
 						<div class="cell col5">
-							<input type="number" name="attr_points_per_level" value="1" title="Macro table name: repeating_techniques. Field name: points_per_level" />
+							<input type="number" name="attr_points_per_level" value="1" title="Macro: @{NAME|repeating_techniques_$[row #]_points_per_level}" />
 						</div>
 						<div class="cell col6">
-							<input type="number" name="attr_bonus" value="0" title="Macro table name: repeating_techniques. Field name: bonus" />
+							<input type="number" name="attr_bonus" value="0" title="Macro: @{NAME|repeating_techniques_$[row #]_bonus}" />
 						</div>
 						<div class="cell col7">
-							<input type="number" name="attr_points" value="0" title="Macro table name: repeating_techniques. Field name: points" />
+							<input type="number" name="attr_points" value="0" title="Macro: @{NAME|repeating_techniques_$[row #]_points}" />
 						</div>
 						<div class="cell col8">
-							<input type="text" name="attr_ref" title="Macro table name: repeating_techniques. Field name: ref" />
+							<input type="text" name="attr_ref" title="Macro: @{NAME|repeating_techniques_$[row #]_ref}" />
 						</div>
 					</div> <!-- .row -->
 					<div class="row row-details notebox">
@@ -8507,7 +8490,7 @@ PU2:126 = Power-Ups 2. Page 126
 									<span data-i18n="show-notes-below-label">Show notes below in roll template</span>
 								</span>
 							</div>
-							<textarea name="attr_notes" title="Macro table name: repeating_techniques. Field name: notes"></textarea>
+							<textarea name="attr_notes" title="Macro: @{NAME|repeating_techniques_$[row #]_notes}"></textarea>
 						</div>
 					</div> <!-- .row -->
 				</fieldset> <!-- .repeating_techniques -->
@@ -8697,41 +8680,41 @@ PU2:126 = Power-Ups 2. Page 126
 					<span class="checkbox"></span>
 					<div class="row row-stats">
 						<div class="cell col0">
-							<input type="text" name="attr_name" title="Macro table name: repeating_techniquesrevised. Field name: name" />
+							<input type="text" name="attr_name" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_name}" />
 							<input type="hidden" name="attr_idkey" />
 						</div>
 						<div class="cell col1">
-							<input type="text" name="attr_parent" title="Macro table name: repeating_techniquesrevised. Field name: parent" />
+							<input type="text" name="attr_parent" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_parent}" />
 						</div>
 						<div class="cell col2">
-							<input type="number" name="attr_base_level" value="0" title="Macro table name: repeating_techniquesrevised. Field name: base_level" />
+							<input type="number" name="attr_base_level" value="0" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_base_level}" />
 						</div>
 						<div class="cell col3">
-							<input type="number" name="attr_default" value="0" title="Macro table name: repeating_techniquesrevised. Field name: default" />
+							<input type="number" name="attr_default" value="0" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_default}" />
 						</div>
 						<div class="cell col4">
-							<input type="number" name="attr_max_modifier" value="0" title="Macro table name: repeating_techniquesrevised. Field name: max_modifier" />
+							<input type="number" name="attr_max_modifier" value="0" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_max_modifier}" />
 						</div>
 						<div class="cell col5">
-							<select name="attr_difficulty" title="Macro table name: repeating_techniquesrevised. Field name: difficulty">
+							<select name="attr_difficulty" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_difficulty}">
 								<option value="Average" data-i18n="option-average">Average</option>
 								<option value="Hard" data-i18n="option-hard">Hard</option>
 							</select>
 						</div>
 						<div class="cell col6">
-							<input type="number" name="attr_skill_modifier" value="0" title="Macro table name: repeating_techniquesrevised. Field name: skill_modifier" />
+							<input type="number" name="attr_skill_modifier" value="0" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_skill_modifier}" />
 						</div>
 						<div class="cell col7">
-							<input type="number" name="attr_points" value="0" title="Macro table name: repeating_techniquesrevised. Field name: points" />
+							<input type="number" name="attr_points" value="0" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_points}" />
 						</div>
 						<div class="cell col8">
-							<input type="text" name="attr_level" readonly="readonly" title="Macro table name: repeating_techniquesrevised. Field name: level" value="10"/>
+							<input type="text" name="attr_level" readonly="readonly" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_level}" value="10"/>
 						</div>
 						<div class="cell col9">
 							<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Technique Skill Roll}} {{activeDefense=[[0]]}} {{isSkillRoll=[[1]]}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{level} + @{modifier} + @{technique_roll_modifier}, @{technique_roll_max_nine_value} }kl1]]}} {{useModToll=[[@{use_technique_modifier_tool}]]}} {{maxNine=[[@{technique_roll_max_nine}]]}} {{rollModifier=[[@{technique_roll_modifier}]]}} {{rollModifierSummary=@{technique_roll_modifier_summary}}} {{rollTraitSummary=@{technique_roll_trait_summary}}} {{notes=@{notes}}} {{showNotes=[[@{show_notes_revised}]]}} {{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}}}" name="roll_vsSL"></button>
 						</div>
 						<div class="cell col10">
-							<input type="text" name="attr_ref" title="Macro table name: repeating_techniquesrevised. Field name: ref" />
+							<input type="text" name="attr_ref" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_ref}" />
 						</div>
 					</div> <!-- .row -->
 					
@@ -8757,13 +8740,13 @@ This example would represent the skill level on that row.
 								<span data-i18n="abbrevation-miscellaneous-label">Misc:</span>
 							</div>
 							<div class="cell">
-								<input type="text" name="attr_skill_misc" title="Macro table name: repeating_techniquesrevised. Field name: skill_misc" />
+								<input type="text" name="attr_skill_misc" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_skill_misc}" />
 							</div>
 							<div class="cell label">
 								<span data-i18n="reason-for-modifier-label">Reason for MOD (Modifier):</span>
 							</div>
 							<div class="cell">
-								<input type="text" name="attr_skill_mod_notes" title="Macro table name: repeating_techniquesrevised. Field name: skill_mod_notes" />
+								<input type="text" name="attr_skill_mod_notes" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_skill_mod_notes}" />
 							</div>
 						</div> <!-- .row -->
 						
@@ -8807,7 +8790,7 @@ the skill/spell level of the Base Skill. Do not change this skill Level number m
 							</div>
 							<div class="cell col-input-medium show-hide-row-id">
 								<input type="hidden" name="attr_technique_skill_row_id_toggle" value="0" />
-								<input type="text" name="attr_technique_skill_row_id" title="Macro table name: repeating_techniquesrevised. Field name: technique_skill_row_id" />
+								<input type="text" name="attr_technique_skill_row_id" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_technique_skill_row_id}" />
 							</div>
 							<div class="cell col-wide">
 								<input type="hidden" name="attr_skill" value="" />
@@ -8826,7 +8809,7 @@ the skill/spell level of the Base Skill. Do not change this skill Level number m
 									<span data-i18n="show-notes-below-label">Show notes below in roll template</span>
 								</span>
 							</div>
-							<textarea name="attr_notes" title="Macro table name: repeating_techniquesrevised. Field name: notes" style="height: 50px"></textarea>
+							<textarea name="attr_notes" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_notes}" style="height: 50px"></textarea>
 						</div>
 					
 						<div class="header">
@@ -8850,12 +8833,12 @@ visualize what it will look like in chat.
 								<div class="note-title">
 									<span data-i18n="success-note-label">Success Note:</span>
 								</div>
-								<textarea name="attr_skill_success_note" title="Macro table name: repeating_techniquesrevised. Field name: skill_success_note"></textarea>
+								<textarea name="attr_skill_success_note" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_skill_success_note}"></textarea>
 							</div>
 							
 							<div class="note-input">
 								<div class="note-title"><span data-i18n="critical-success-note-label">Critical Success Note:</span></div>
-								<textarea name="attr_skill_critical_success_note" title="Macro table name: repeating_techniquesrevised. Field name: skill_critical_success_note"></textarea>
+								<textarea name="attr_skill_critical_success_note" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_skill_critical_success_note}"></textarea>
 							</div>
 						</div>
 						
@@ -8865,14 +8848,14 @@ visualize what it will look like in chat.
 								<div class="note-title">
 									<div data-i18n="fail-note-label">Fail Note:</div>
 								</div>
-								<textarea name="attr_skill_fail_note" title="Macro table name: repeating_techniquesrevised. Field name: skill_fail_note"></textarea>
+								<textarea name="attr_skill_fail_note" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_skill_fail_note}"></textarea>
 							</div>
 							
 							<div class="note-input">
 								<div class="note-title">
 									<span data-i18n="critical-fail-note-label">Critical Fail Note:</span>
 								</div>
-								<textarea name="attr_skill_critical_fail_note" title="Macro table name: repeating_techniquesrevised. Field name: skill_critical_fail_note"></textarea>
+								<textarea name="attr_skill_critical_fail_note" title="Macro: @{NAME|repeating_techniquesrevised_$[row #]_skill_critical_fail_note}"></textarea>
 							</div>
 							
 						</div>
@@ -9065,7 +9048,7 @@ visualize what it will look like in chat.
 								</div>
 								
 								<div class="item item7">
-									<input type="number" name="attr_hit_points_max" value="10" readonly="readonly" title="Macro: @{NAME|hit_points_max}" />
+									<input type="number" name="attr_hit_points_max" value="10" readonly="readonly" title="Macro: @{NAME|hit_points|max}" />
 								</div>
 
 								<div class="item item8">
@@ -9146,19 +9129,19 @@ visualize what it will look like in chat.
 									<input type="text" name="attr_total_weight_gravity" value="" readonly="readonly" title="Macro: @{NAME|total_weight_gravity}" />
 								</div>
 								<div class="item item10">
-									<input type="text" name="attr_current_move" value="" readonly="readonly" title="Macro name: current_move" />
+									<input type="text" name="attr_current_move" value="" readonly="readonly" title="Macro: @{NAME|current_move}" />
 								</div>
 								<div class="item item11">
-									<input type="text" name="attr_enhanced_move_current" value="0" readonly="readonly" title="Macro name: enhanced_move_current" />
+									<input type="text" name="attr_enhanced_move_current" value="0" readonly="readonly" title="Macro: @{NAME|enhanced_move_current}" />
 								</div>
 								<div class="item item12">
-									<input type="text" name="attr_current_air" value="0" readonly="readonly" title="Macro name: current_air" />
+									<input type="text" name="attr_current_air" value="0" readonly="readonly" title="Macro: @{NAME|current_air}" />
 								</div>
 								<div class="item item13">
-									<input type="text" name="attr_current_water" value="0" readonly="readonly" title="Macro name: current_water" />
+									<input type="text" name="attr_current_water" value="0" readonly="readonly" title="Macro: @{NAME|current_water}" />
 								</div>
 								<div class="item item14">
-									<input type="text" name="attr_current_dodge" value="0" readonly="readonly" title="Macro name: @{current_dodge}" />
+									<input type="text" name="attr_current_dodge" value="0" readonly="readonly" title="Macro: @{NAME|current_dodge}" />
 								</div>
 							
 							</div>
@@ -9596,134 +9579,134 @@ visualize what it will look like in chat.
 
 							<div class="row row-skull">
 								<div class="cell col0 label">
-									<input type="text" name="attr_name_skull" value="Skull" title="Macro name: name_skull" />
+									<input type="text" name="attr_name_skull" value="Skull" title="Macro: @{NAME|name_skull}" />
 								</div>
 								<div class="cell col1">
-									<input type="text" name="attr_hit_penalty_skull" value="-7" title="Macro name: hit_penalty_skull" />
+									<input type="text" name="attr_hit_penalty_skull" value="-7" title="Macro: @{NAME|hit_penalty_skull}" />
 								</div>
 								<div class="cell col2">
-									<input type="text" name="attr_skull_dr_max" value="2" title="Macro name: skull_dr_max" />
+									<input type="text" name="attr_skull_dr_max" value="2" title="Macro: @{NAME|skull_dr_max}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-face">
 								<div class="cell col0 label">
-									<input type="text" name="attr_name_face" value="Face" title="Macro name: name_face" />
+									<input type="text" name="attr_name_face" value="Face" title="Macro: @{NAME|name_face}" />
 								</div>
 								<div class="cell col1">
-									<input type="text" name="attr_hit_penalty_face" value="-5" title="Macro name: hit_penalty_face" />
+									<input type="text" name="attr_hit_penalty_face" value="-5" title="Macro: @{NAME|hit_penalty_face}" />
 								</div>
 								<div class="cell col2">
-									<input type="text" name="attr_face_dr_max" value="0" title="Macro name: face_dr_max" />
+									<input type="text" name="attr_face_dr_max" value="0" title="Macro: @{NAME|face_dr_max}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-eyes">
 								<div class="cell col0 label">
-									<input type="text" name="attr_name_eyes" value="Eyes" title="Macro name: name_eyes" />
+									<input type="text" name="attr_name_eyes" value="Eyes" title="Macro: @{NAME|name_eyes}" />
 								</div>
 								<div class="cell col1">
-									<input type="text" name="attr_hit_penalty_eyes" value="-9" title="Macro name: hit_penalty_eyes" />
+									<input type="text" name="attr_hit_penalty_eyes" value="-9" title="Macro: @{NAME|hit_penalty_eyes}" />
 								</div>
 								<div class="cell col2">
-									<input type="text" name="attr_eyes_dr_max" value="0" title="Macro name: eyes_dr_max" />
+									<input type="text" name="attr_eyes_dr_max" value="0" title="Macro: @{NAME|eyes_dr_max}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-neck">
 								<div class="cell col0 label">
-									<input type="text" name="attr_name_neck" value="Neck" title="Macro name: name_neck" />
+									<input type="text" name="attr_name_neck" value="Neck" title="Macro: @{NAME|name_neck}" />
 								</div>
 								<div class="cell col1">
-									<input type="text" name="attr_hit_penalty_neck" value="-5" title="Macro name: hit_penalty_neck" />
+									<input type="text" name="attr_hit_penalty_neck" value="-5" title="Macro: @{NAME|hit_penalty_neck}" />
 								</div>
 								<div class="cell col2">
-									<input type="text" name="attr_neck_dr_max" value="0" title="Macro name: neck_dr_max" />
+									<input type="text" name="attr_neck_dr_max" value="0" title="Macro: @{NAME|neck_dr_max}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-arms">
 								<div class="cell col0 label">
-									<input type="text" name="attr_name_arms" value="Arms" title="Macro name: name_arms" />
+									<input type="text" name="attr_name_arms" value="Arms" title="Macro: @{NAME|name_arms}" />
 								</div>
 								<div class="cell col1">
-									<input type="text" name="attr_hit_penalty_arms" value="-2" title="Macro name: hit_penalty_arms" />
+									<input type="text" name="attr_hit_penalty_arms" value="-2" title="Macro: @{NAME|hit_penalty_arms}" />
 								</div>
 								<div class="cell col2">
-									<input type="text" name="attr_arms_dr_max" value="0" title="Macro name: arms_dr_max" />
+									<input type="text" name="attr_arms_dr_max" value="0" title="Macro: @{NAME|arms_dr_max}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-hands">
 								<div class="cell col0 label">
-									<input type="text" name="attr_name_hands" value="Hands" title="Macro name: name_hands" />
+									<input type="text" name="attr_name_hands" value="Hands" title="Macro: @{NAME|name_hands}" />
 								</div>
 								<div class="cell col1">
-									<input type="text" name="attr_hit_penalty_hands" value="-4" title="Macro name: hit_penalty_hands" />
+									<input type="text" name="attr_hit_penalty_hands" value="-4" title="Macro: @{NAME|hit_penalty_hands}" />
 								</div>
 								<div class="cell col2">
-									<input type="text" name="attr_hands_dr_max" value="0" title="Macro name: hands_dr_max" />
+									<input type="text" name="attr_hands_dr_max" value="0" title="Macro: @{NAME|hands_dr_max}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-torso">
 								<div class="cell col0 label">
-									<input type="text" name="attr_name_torso" value="Torso" title="Macro name: name_torso" />
+									<input type="text" name="attr_name_torso" value="Torso" title="Macro: @{NAME|name_torso}" />
 								</div>
 								<div class="cell col1">
-									<input type="text" name="attr_hit_penalty_torso" value="0" title="Macro name: hit_penalty_torso" />
+									<input type="text" name="attr_hit_penalty_torso" value="0" title="Macro: @{NAME|hit_penalty_torso}" />
 								</div>
 								<div class="cell col2">
-									<input type="text" name="attr_torso_dr_max" value="0" title="Macro name: torso_dr_max" />
+									<input type="text" name="attr_torso_dr_max" value="0" title="Macro: @{NAME|torso_dr_max}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-vitals">
 								<div class="cell col0 label">
-									<input type="text" name="attr_name_vitals" value="Vitals" title="Macro name: name_vitals" />
+									<input type="text" name="attr_name_vitals" value="Vitals" title="Macro: @{NAME|name_vitals}" />
 								</div>
 								<div class="cell col1">
-									<input type="text" name="attr_hit_penalty_vitals" value="-3" title="Macro name: hit_penalty_vitals" />
+									<input type="text" name="attr_hit_penalty_vitals" value="-3" title="Macro: @{NAME|hit_penalty_vitals}" />
 								</div>
 								<div class="cell col2">
-									<input type="text" name="attr_vitals_dr_max" value="See Torso" title="Macro name: vitals_dr_max" />
+									<input type="text" name="attr_vitals_dr_max" value="See Torso" title="Macro: @{NAME|vitals_dr_max}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-groin">
 								<div class="cell col0 label">
-									<input type="text" name="attr_name_groin" value="Groin" title="Macro name: name_groin" />
+									<input type="text" name="attr_name_groin" value="Groin" title="Macro: @{NAME|name_groin}" />
 								</div>
 								<div class="cell col1">
-									<input type="text" name="attr_hit_penalty_groin" value="-3" title="Macro name: hit_penalty_groin" />
+									<input type="text" name="attr_hit_penalty_groin" value="-3" title="Macro: @{NAME|hit_penalty_groin}" />
 								</div>
 								<div class="cell col2">
-									<input type="text" name="attr_groind_dr_max" value="0" title="Macro name: groind_dr_max" />
+									<input type="text" name="attr_groind_dr_max" value="0" title="Macro: @{NAME|groind_dr_max}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-legs">
 								<div class="cell col0 label">
-									<input type="text" name="attr_name_legs" value="Legs" title="Macro name: name_legs" />
+									<input type="text" name="attr_name_legs" value="Legs" title="Macro: @{NAME|name_legs}" />
 								</div>
 								<div class="cell col1">
-									<input type="text" name="attr_hit_penalty_legs" value="-2" title="Macro name: hit_penalty_legs" />
+									<input type="text" name="attr_hit_penalty_legs" value="-2" title="Macro: @{NAME|hit_penalty_legs}" />
 								</div>
 								<div class="cell col2">
-									<input type="text" name="attr_legs_dr_max" value="0" title="Macro name: legs_dr_max" />
+									<input type="text" name="attr_legs_dr_max" value="0" title="Macro: @{NAME|legs_dr_max}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-feet">
 								<div class="cell col0 label">
-									<input type="text" name="attr_name_feet" value="Feet" title="Macro name: name_feet" />
+									<input type="text" name="attr_name_feet" value="Feet" title="Macro: @{NAME|name_feet}" />
 								</div>
 								<div class="cell col1">
-									<input type="text" name="attr_hit_penalty_feet" value="-4" title="Macro name: hit_penalty_feet" />
+									<input type="text" name="attr_hit_penalty_feet" value="-4" title="Macro: @{NAME|hit_penalty_feet}" />
 								</div>
 								<div class="cell col2">
-									<input type="text" name="attr_feet_dr_max" value="0" title="Macro name: feet_dr_max" />
+									<input type="text" name="attr_feet_dr_max" value="0" title="Macro: @{NAME|feet_dr_max}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="row row-area">
 								<div class="cell col0 label">
-									<input type="text" name="attr_name_area" value="Area" title="Macro name: name_area" />
+									<input type="text" name="attr_name_area" value="Area" title="Macro: @{NAME|name_area}" />
 								</div>
 								<div class="cell col1">
-									<input type="text" name="attr_hit_penalty_area" value="n/a" title="Macro name: hit_penalty_area" />
+									<input type="text" name="attr_hit_penalty_area" value="n/a" title="Macro: @{NAME|hit_penalty_area}" />
 								</div>
 								<div class="cell col2">
-									<input type="text" name="attr_area_dr_max" value="0" title="Macro name: area_dr_max" />
+									<input type="text" name="attr_area_dr_max" value="0" title="Macro: @{NAME|area_dr_max}" />
 								</div>
 							</div> <!-- .row -->
 							<div class="header row-title">
@@ -9734,13 +9717,13 @@ visualize what it will look like in chat.
 							<fieldset class="repeating_location">
 								<div class="row row-stats">
 									<div class="cell col0 label">
-										<input type="text" name="attr_name" title="Macro table name: repeating_location. Field name: name" />
+										<input type="text" name="attr_name" title="Macro: @{NAME|repeating_location_$[row #]_name}" />
 									</div>
 									<div class="cell col1">
-										<input type="text" name="attr_hit_penalty" value="0" title="Macro table name: repeating_location. Field name: hit_penalty" />
+										<input type="text" name="attr_hit_penalty" value="0" title="Macro: @{NAME|repeating_location_$[row #]_hit_penalty}" />
 									</div>
 									<div class="cell col2">
-										<input type="text" name="attr_dr_max" value="0" title="Macro table name: repeating_location. Field name: dr_max" />
+										<input type="text" name="attr_dr_max" value="0" title="Macro: @{NAME|repeating_location_$[row #]_dr_max}" />
 									</div>
 								</div> <!-- .row -->
 							</fieldset>
@@ -9960,9 +9943,9 @@ visualize what it will look like in chat.
 										</span>
 									</div>
 									<div class="cell col2"></div>
-									<div class="cell col2"><input type="text" name="attr_ad_dodge_skill" value="@{current_dodge}" disabled="disabled" title="Macro name: @{ad_dodge_skill}" /></div>
-									<div class="cell col2"><input type="number" step="1" name="attr_ad_dodge_skill_mod" value="0" title="Macro name: @{ad_dodge_skill_mod}" /></div>
-									<div class="cell col3"><input type="text" name="attr_ad_dodge_skill_final" value="@{current_dodge} + @{ad_dodge_skill_mod}" disabled="disabled" title="Macro name: @{ad_dodge_skill_final}" /></div>
+									<div class="cell col2"><input type="text" name="attr_ad_dodge_skill" value="@{current_dodge}" disabled="disabled" title="Macro: @{NAME|ad_dodge_skill}" /></div>
+									<div class="cell col2"><input type="number" step="1" name="attr_ad_dodge_skill_mod" value="0" title="Macro: @{NAME|ad_dodge_skill_mod}" /></div>
+									<div class="cell col3"><input type="text" name="attr_ad_dodge_skill_final" value="@{current_dodge} + @{ad_dodge_skill_mod}" disabled="disabled" title="Macro: @{NAME|ad_dodge_skill_final}" /></div>
 									<div class="cell col4">
 										<input type="hidden" name="attr_raw_dodge_success_notes" />
 										<input type="hidden" name="attr_raw_dodge_critical_success_notes" />
@@ -10127,9 +10110,9 @@ visualize what it will look like in chat.
 									</div>
 
 									<div class="cell col2"></div>
-									<div class="cell col2"><input type="text" name="attr_ad_dodge_retreat_skill" value="@{current_dodge} + 3" disabled="disabled" title="Macro name: @{ad_dodge_retreat_skill}" /></div>
-									<div class="cell col2"><input type="number" step="1" name="attr_ad_dodge_retreat_skill_mod" value="0" title="Macro name: @{ad_dodge_retreat_skill_mod}" /></div>
-									<div class="cell col3"><input type="text" name="attr_ad_dodge_retreat_skill_final" value="@{current_dodge} + 3 + @{ad_dodge_retreat_skill_mod}" disabled="disabled" title="Macro name: @{ad_dodge_retreat_skill_final}" /></div>
+									<div class="cell col2"><input type="text" name="attr_ad_dodge_retreat_skill" value="@{current_dodge} + 3" disabled="disabled" title="Macro: @{NAME|ad_dodge_retreat_skill}" /></div>
+									<div class="cell col2"><input type="number" step="1" name="attr_ad_dodge_retreat_skill_mod" value="0" title="Macro: @{NAME|ad_dodge_retreat_skill_mod}" /></div>
+									<div class="cell col3"><input type="text" name="attr_ad_dodge_retreat_skill_final" value="@{current_dodge} + 3 + @{ad_dodge_retreat_skill_mod}" disabled="disabled" title="Macro: @{NAME|ad_dodge_retreat_skill_final}" /></div>
 									<div class="cell col4">
 										<input type="hidden" name="attr_raw_dodge_retreat_success_notes" />
 										<input type="hidden" name="attr_raw_dodge_retreat_critical_success_notes" />
@@ -10292,9 +10275,9 @@ visualize what it will look like in chat.
 										</span>
 									</div>
 									<div class="cell col2"></div>
-									<div class="cell col2"><input type="text" name="attr_ad_dodge_drop_skill" value="@{current_dodge} + 3" disabled="disabled" title="Macro name: @{ad_dodge_drop_skill}" /></div>
-									<div class="cell col2"><input type="number" step="1" name="attr_ad_dodge_drop_skill_mod" value="0" title="Macro name: ad_dodge_drop_skill_mod" /></div>
-									<div class="cell col3"><input type="text" name="attr_ad_dodge_drop_skill_final" value="@{current_dodge} + 3 + @{ad_dodge_drop_skill_mod}" disabled="disabled" title="Macro name: @{ad_dodge_drop_skill_final}" /></div>
+									<div class="cell col2"><input type="text" name="attr_ad_dodge_drop_skill" value="@{current_dodge} + 3" disabled="disabled" title="Macro: @{NAME|ad_dodge_drop_skill}" /></div>
+									<div class="cell col2"><input type="number" step="1" name="attr_ad_dodge_drop_skill_mod" value="0" title="Macro: @{NAME|ad_dodge_drop_skill_mod}" /></div>
+									<div class="cell col3"><input type="text" name="attr_ad_dodge_drop_skill_final" value="@{current_dodge} + 3 + @{ad_dodge_drop_skill_mod}" disabled="disabled" title="Macro: @{NAME|ad_dodge_drop_skill_final}" /></div>
 									<div class="cell col4">
 										<input type="hidden" name="attr_raw_dodge_drop_success_notes" />
 										<input type="hidden" name="attr_raw_dodge_drop_critical_success_notes" />
@@ -10438,9 +10421,9 @@ visualize what it will look like in chat.
 										<input type="hidden" name="attr_knockback_points" value="" />
 										<span data-i18n="knockback-calculation-description">1 yard per <b><span name="attr_knockback_points"></span></b> points</span> 
 									</div>
-									<div class="cell col2"><input type="text" name="attr_ad_knockback_skill" value="10" title="Macro name: @{ad_knockback_skill}" /></div>
-									<div class="cell col2"><input type="number" step="1" name="attr_ad_knockback_skill_mod" value="0" title="Macro name: @{ad_knockback_skill_skill_mod}" /></div>
-									<div class="cell col3"><input type="text" name="attr_ad_knockback_skill_final" value="@{ad_knockback_skill} + @{ad_knockback_skill_mod}" disabled="disabled" title="Macro name: @{ad_knockback_skill_final}" /></div>
+									<div class="cell col2"><input type="text" name="attr_ad_knockback_skill" value="10" title="Macro: @{NAME|ad_knockback_skill}" /></div>
+									<div class="cell col2"><input type="number" step="1" name="attr_ad_knockback_skill_mod" value="0" title="Macro: @{NAME|ad_knockback_skill_skill_mod}" /></div>
+									<div class="cell col3"><input type="text" name="attr_ad_knockback_skill_final" value="@{ad_knockback_skill} + @{ad_knockback_skill_mod}" disabled="disabled" title="Macro: @{NAME|ad_knockback_skill_final}" /></div>
 									<div class="cell col4">
 										<input type="hidden" name="attr_raw_knockback_success_notes" value="Avoided falling prone, but check for collision." />
 										<input type="hidden" name="attr_raw_knockback_critical_success_notes" value="Avoided falling prone, but check for collision." />
@@ -10632,13 +10615,13 @@ visualize what it will look like in chat.
 								<span class="checkbox"></span>
 								<div class="row row-stats">
 									<div class="cell col0">
-										<input type="text" name="attr_name" title="Macro: repeating_defense_{$1}_name. $1 = Row number OR the Row ID." />
+										<input type="text" name="attr_name" title="Macro: @{NAME|repeating_defense_$[row #]_name}" />
 										<input type="hidden" name="attr_idkey" />
 										<input type="hidden" name="attr_new" value="1" />
 									</div>
 									<div class="cell col1">
 										<input type="hidden" name="attr_defense_type" value="0" />
-										<select name="attr_type" title="Macro: repeating_defense_{$1}_type. $1 = Row number OR the Row ID.">
+										<select name="attr_type" title="Macro: @{NAME|repeating_defense_$[row #]_type}">
 											<option value="Dodge" data-i18n="option-dodge">Dodge</option>
 											<option value="Parry" data-i18n="option-parry">Parry</option>
 											<option value="Unarmed Parry" data-i18n="option-unarmed-parry">Unarmed Parry</option>
@@ -10652,16 +10635,16 @@ visualize what it will look like in chat.
 										</select>
 									</div>
 									<div class="cell col2">
-										<input type="text" name="attr_info" title="Macro: repeating_defense_{$1}_info. $1 = Row number OR the Row ID." />
+										<input type="text" name="attr_info" title="Macro: @{NAME|repeating_defense_$[row #]_info}" />
 									</div>
 									<div class="cell col2">
-										<input type="number" step="1" value="10" name="attr_skill" title="Macro: repeating_defense_{$1}_skill. $1 = Row number OR the Row ID." />
+										<input type="number" step="1" value="10" name="attr_skill" title="Macro: @{NAME|repeating_defense_$[row #]_skill}" />
 									</div>
 									<div class="cell col2">
-										<input type="number" step="1" value="0" name="attr_skill_mod" title="Macro: repeating_defense_{$1}_skill_mod. $1 = Row number OR the Row ID." />
+										<input type="number" step="1" value="0" name="attr_skill_mod" title="Macro: @{NAME|repeating_defense_$[row #]_skill_mod}" />
 									</div>
 									<div class="cell col3">
-										<input type="text" name="attr_skill_final" value="@{skill} + @{skill_mod} + @{defense_combat_reflexes_bonus}" disabled="disabled" title="Macro: repeating_defense_{$1}_skill_final. $1 = Row number OR the Row ID." />
+										<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=@{name}}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{skill_final} + @{modifier} + @{defense_roll_modifier}, @{defense_roll_max_nine_value} }kl1]]}} {{useModToll=[[@{use_defense_modifier_tool}]]}} {{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}}}" name="roll_vsSL" />
@@ -10762,7 +10745,7 @@ visualize what it will look like in chat.
 										</div>
 										<div class="cell col-input-medium show-hide-row-id">
 											<input type="hidden" name="attr_defense_skill_row_id_toggle" value="0" />
-											<input type="text" name="attr_defense_skill_row_id" title="Macro table name: repeating_defense. Field name: defense_skill_row_id" />
+											<input type="text" name="attr_defense_skill_row_id" title="Macro: @{NAME|repeating_defense_$[row #]_defense_skill_row_id}" />
 										</div>
 										
 									</div> <!-- .row -->
@@ -10818,7 +10801,7 @@ visualize what it will look like in chat.
 											</span> 
 										</div>
 										<div class="cell col-input-wide">
-											<input type="text" name="attr_defense_mod_reason" title="Macro: repeating_defense_{$1}_defense_mod_reason. $1 = Row number OR the Row ID." />
+											<input type="text" name="attr_defense_mod_reason" title="Macro: @{NAME|repeating_defense_$[row #]_defense_mod_reason}" />
 										</div>
 									</div>
 
@@ -10865,7 +10848,7 @@ visualize what it will look like in chat.
 													</span>
 												</span>
 											</div>
-											<textarea name="attr_info_description" title="Macro: repeating_defense_{$1}_info_description. $1 = Row number OR the Row ID." style="height: 50px"></textarea>
+											<textarea name="attr_info_description" title="Macro: @{NAME|repeating_defense_$[row #]_info_description}" style="height: 50px"></textarea>
 										</div>
 
 										<div class="note-input">
@@ -10877,7 +10860,7 @@ visualize what it will look like in chat.
 													<span data-i18n="custom-notes-active-defense-tooltip">Add custom notes for this active defense.</span>
 												</span>
 											</div>
-											<textarea name="attr_notes" title="Macro: repeating_defense_{$1}_notes. $1 = Row number OR the Row ID." style="height: 50px"></textarea>
+											<textarea name="attr_notes" title="Macro: @{NAME|repeating_defense_$[row #]_notes}" style="height: 50px"></textarea>
 										</div>
 										
 									</div>
@@ -10889,7 +10872,7 @@ visualize what it will look like in chat.
 												<span data-i18n="success-note-label">Success Note:</span>
 											</div>
 											<input type="hidden" name="attr_raw_success_note" />
-											<textarea name="attr_defense_success_note" title="Macro: repeating_defense_{$1}_defense_success_note. $1 = Row number OR the Row ID."></textarea>
+											<textarea name="attr_defense_success_note" title="Macro: @{NAME|repeating_defense_$[row #]_defense_success_note}"></textarea>
 										</div>
 										
 										<div class="note-input">
@@ -10897,7 +10880,7 @@ visualize what it will look like in chat.
 												<span data-i18n="critical-success-note-label">Critical Success Note:</span>
 											</div>
 											<input type="hidden" name="attr_raw_critical_success_note" />
-											<textarea name="attr_defense_critical_success_note" title="Macro: repeating_defense_{$1}_defense_critical_success_note. $1 = Row number OR the Row ID."></textarea>
+											<textarea name="attr_defense_critical_success_note" title="Macro: @{NAME|repeating_defense_$[row #]_defense_critical_success_note}"></textarea>
 										</div>
 										
 									</div>
@@ -10909,7 +10892,7 @@ visualize what it will look like in chat.
 												<span data-i18n="fail-note-label">Fail Note:</span>
 											</div>
 											<input type="hidden" name="attr_raw_fail_note" />
-											<textarea name="attr_defense_fail_note" title="Macro: repeating_defense_{$1}_defense_fail_note. $1 = Row number OR the Row ID."></textarea>
+											<textarea name="attr_defense_fail_note" title="Macro: @{NAME|repeating_defense_$[row #]_defense_fail_note}"></textarea>
 										</div>
 										
 										<div class="note-input">
@@ -10917,7 +10900,7 @@ visualize what it will look like in chat.
 												<span data-i18n="critical-fail-note-label">Critical Fail Note:</span>
 											</div>
 											<input type="hidden" name="attr_raw_critical_fail_note" />
-											<textarea name="attr_defense_critical_fail_note" title="Macro: repeating_defense_{$1}_defense_critical_fail_note. $1 = Row number OR the Row ID."></textarea>
+											<textarea name="attr_defense_critical_fail_note" title="Macro: @{NAME|repeating_defense_$[row #]_defense_critical_fail_note}"></textarea>
 										</div>
 										
 									</div>
@@ -10970,7 +10953,7 @@ visualize what it will look like in chat.
 									</div>
 								</div>
 								<div class="defense-bonus-notes-textarea">
-									<textarea name="attr_defense_bonus_notes" title="Macro name: defense_bonus_notes"></textarea>
+									<textarea name="attr_defense_bonus_notes" title="Macro: @{NAME|defense_bonus_notes}"></textarea>
 								</div>
 							</div>
 							
@@ -11187,17 +11170,17 @@ visualize what it will look like in chat.
 									<div class="cell col0">
 										<!-- idkey is the key used by either GCA or GCS. Can be used to update and advantage instead of just adding -->
 										<input type="hidden" name="attr_idkey" />
-										<input type="text" name="attr_name" title="Macro table name: repeating_melee. Field name: name" />
+										<input type="text" name="attr_name" title="Macro: @{NAME|repeating_melee_$[row #]_name}" />
 									</div>
 									<div class="cell col1">
-										<input type="text" name="attr_damage" title="Macro table name: repeating_melee. Field name: damage" />
+										<input type="text" name="attr_damage" title="Macro: @{NAME|repeating_melee_$[row #]_damage}" />
 									</div>
 									<div class="cell col2">
 										<input type="hidden" name="attr_damage_dice_icon" class="melee-damage-dice-icon" value="explode" />
 										<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Melee Damage}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{damageRoll=[[@{damage}]]}} {{showMinimumDmgNote=[[@{show_minimum_damage_notes}]]}} {{minDamageNote=@{minimum_damage_note}}} {{damageType=@{type}}} {{useDamageTypeNotes=[[@{use_damage_type_notes}]]}} {{damageTypeNote=@{damage_type_note}}} {{showNotes=[[1]]}} {{notes=@{damage_notes}}} {{armorDivisor=[[@{armor_divisor}]]}}" name="roll_damage" class="roll_damage" />
 									</div>
 									<div class="cell col3">
-										<select name="attr_type" title="Macro table name: repeating_melee. Field name: type">
+										<select name="attr_type" title="Macro: @{NAME|repeating_melee_$[row #]_type}">
 											<option value="Affliction (aff)" data-i18n="abbreviation-option-affliction">aff</option>
 											<option value="Burning (burn)" data-i18n="abbreviation-option-burning">burn</option>
 											<option value="Corrosion (cor)" data-i18n="abbreviation-option-corrosion">cor</option>
@@ -11217,10 +11200,10 @@ visualize what it will look like in chat.
 										<input type="hidden" name="attr_minimum_damage_note" value="Min 1" />
 									</div>
 									<div class="cell col4">
-										<input type="text" name="attr_reach" title="Macro table name: repeating_melee. Field name: reach" />
+										<input type="text" name="attr_reach" title="Macro: @{NAME|repeating_melee_$[row #]_reach}" />
 									</div>
 									<div class="cell col5">
-										<input type="text" name="attr_skill" title="Macro table name: repeating_melee. Field name: skill" />
+										<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}} {{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]]}} {{useModToll=[[@{use_melee_modifier_tool}]]}} {{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}}}" name="roll_vsSL" />
@@ -11277,7 +11260,7 @@ visualize what it will look like in chat.
 										</div>
 										<div class="cell col-input-medium show-hide-row-id">
 											<input type="hidden" name="attr_melee_skill_row_id_toggle" value="0" />
-											<input type="text" name="attr_melee_skill_row_id" title="Macro table name: repeating_melee. Field name: melee_skill_row_id" />
+											<input type="text" name="attr_melee_skill_row_id" title="Macro: @{NAME|repeating_melee_$[row #]_melee_skill_row_id}" />
 										</div>
 										
 										<div class="cell">
@@ -11296,7 +11279,7 @@ visualize what it will look like in chat.
 											</div>
 										</div>
 										<div class="cell">
-											<input type="number" value="0" name="attr_melee_skill_row_id_modifier" class="inline" title="Macro table name: repeating_melee. Field name: melee_skill_row_id_modifier" />
+											<input type="number" value="0" name="attr_melee_skill_row_id_modifier" class="inline" title="Macro: @{NAME|repeating_melee_$[row #]_melee_skill_row_id_modifier}" />
 										</div>
 								
 										<div class="cell col-wide">
@@ -11325,7 +11308,7 @@ visualize what it will look like in chat.
 										</div>
 									
 										<div class="cell reason-for-mod">
-											<input type="text" name="attr_reason_for_mod" title="Macro table name: repeating_melee. Field name: reason_for_mod" />
+											<input type="text" name="attr_reason_for_mod" title="Macro: @{NAME|repeating_melee_$[row #]_reason_for_mod}" />
 										</div>
 
 									</div><!-- .row -->
@@ -11340,7 +11323,7 @@ visualize what it will look like in chat.
 											</span>	
 										</div>
 										<div class="cell">
-											<input type="number" class="inline" name="attr_armor_divisor" value="1" min="1" step="1" title="Macro table name: repeating_melee. Field name: armor_divisor" />
+											<input type="number" class="inline" name="attr_armor_divisor" value="1" min="1" step="1" title="Macro: @{NAME|repeating_melee_$[row #]_armor_divisor}" />
 										</div>
 									</div> <!-- .row -->
 
@@ -11352,7 +11335,7 @@ visualize what it will look like in chat.
 											<span class="tooltip">
 												<span data-i18n="private-notes-tooltip">These notes do not appear in any Roll Template; they are just here for your reference.</span>
 											</span>
-											<textarea class="text-left full-size" name="attr_private_notes" title="Macro table name: repeating_melee. Field name: private_notes"></textarea>
+											<textarea class="text-left full-size" name="attr_private_notes" title="Macro: @{NAME|repeating_melee_$[row #]_private_notes}"></textarea>
 										</div>
 									</div> <!-- .row -->
 									
@@ -11367,7 +11350,7 @@ visualize what it will look like in chat.
 			Example: Select Location: ?{Location|Head|Torso}
 												</span>
 											</span>
-											<textarea class="text-left chat-size" name="attr_notes" title="Macro table name: repeating_melee. Field name: notes"></textarea>
+											<textarea class="text-left chat-size" name="attr_notes" title="Macro: @{NAME|repeating_melee_$[row #]_notes}"></textarea>
 										</div>
 										<div class="cell">
 											<div class="popup">
@@ -11379,7 +11362,7 @@ visualize what it will look like in chat.
 			Example: Does an additional [[1d6]] fire damage.
 												</span>
 											</span>
-											<textarea class="text-left chat-size" name="attr_damage_notes" title="Macro table name: repeating_melee. Field name: damage_notes"></textarea>
+											<textarea class="text-left chat-size" name="attr_damage_notes" title="Macro: @{NAME|repeating_melee_$[row #]_damage_notes}"></textarea>
 										</div>
 									</div> <!-- .row -->
 
@@ -11394,7 +11377,7 @@ visualize what it will look like in chat.
 			Example: Select Location: ?{Location|Head|Torso}
 												</span>
 											</span>
-											<textarea class="text-left chat-size" name="attr_success_notes" title="Macro table name: repeating_melee. Field name: success_notes"></textarea>
+											<textarea class="text-left chat-size" name="attr_success_notes" title="Macro: @{NAME|repeating_melee_$[row #]_success_notes}"></textarea>
 										</div>
 										<div class="cell">
 											<div class="popup">
@@ -11406,7 +11389,7 @@ visualize what it will look like in chat.
 			Example: Does an additional [[1d6]] fire damage.
 												</span>
 											</span>
-											<textarea class="text-left chat-size" name="attr_critical_success_notes" title="Macro table name: repeating_melee. Field name: critical_success_notes"></textarea>
+											<textarea class="text-left chat-size" name="attr_critical_success_notes" title="Macro: @{NAME|repeating_melee_$[row #]_critical_success_notes}"></textarea>
 										</div>
 									</div> <!-- .row -->
 
@@ -11421,7 +11404,7 @@ visualize what it will look like in chat.
 			Example: Select Location: ?{Location|Head|Torso}
 												</span>
 											</span>
-											<textarea class="text-left chat-size" name="attr_fail_notes" title="Macro table name: repeating_melee. Field name: fail_notes"></textarea>
+											<textarea class="text-left chat-size" name="attr_fail_notes" title="Macro: @{NAME|repeating_melee_$[row #]_fail_notes}"></textarea>
 										</div>
 										<div class="cell">
 											<div class="popup">
@@ -11433,7 +11416,7 @@ visualize what it will look like in chat.
 			Example: Does an additional [[1d6]] fire damage.
 												</span>
 											</span>
-											<textarea class="text-left chat-size" name="attr_critical_fail_notes" title="Macro table name: repeating_melee. Field name: critical_fail_notes"></textarea>
+											<textarea class="text-left chat-size" name="attr_critical_fail_notes" title="Macro: @{NAME|repeating_melee_$[row #]_critical_fail_notes}"></textarea>
 										</div>
 									</div> <!-- .row -->
 									
@@ -11714,18 +11697,18 @@ visualize what it will look like in chat.
 								<span class="checkbox"></span>
 								<div class="row row-stats">
 									<div class="cell col0">
-										<input type="text" name="attr_name" title="Macro: repeating_ranged_{$1}_name. $1 = Row number OR the Row ID." />
+										<input type="text" name="attr_name" title="Macro: @{NAME|repeating_ranged_$[row #]_name}" />
 										<input type="hidden" name="attr_idkey" />
 									</div>
 									<div class="cell col1">
-										<input type="text" name="attr_damage" title="Macro: repeating_ranged_{$1}_damage. $1 = Row number OR the Row ID." />
+										<input type="text" name="attr_damage" title="Macro: @{NAME|repeating_ranged_$[row #]_damage}" />
 									</div>
 									<div class="cell col2">
 										<input type="hidden" name="attr_damage_dice_icon" class="range-damage-dice-icon" value="explode" />
 										<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Ranged Damage}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{damageRoll=[[@{damage}]]}} {{showMinimumDmgNote=[[@{show_minimum_damage_notes}]]}} {{minDamageNote=@{minimum_damage_note}}} {{damageType=@{type}}} {{useDamageTypeNotes=[[@{use_damage_type_notes}]]}} {{damageTypeNote=@{damage_type_note}}} {{showNotes=[[1]]}} {{notes=@{damage_notes}}} {{armorDivisor=[[@{armor_divisor}]]}}" name="roll_damage" class="roll_damage" />
 									</div>
 									<div class="cell col3">
-										<select name="attr_type" title="Macro: repeating_ranged_{$1}_type. $1 = Row number OR the Row ID.">
+										<select name="attr_type" title="Macro: @{NAME|repeating_ranged_$[row #]_type}">
 											<option value="Affliction (aff)"><span data-i18n="abbreviation-option-affliction">aff</span></option>
 											<option value="Burning (burn)"><span data-i18n="abbreviation-option-burning">burn</span></option>
 											<option value="Corrosion (cor)"><span data-i18n="abbreviation-option-corrosion">cor</span></option>
@@ -11745,25 +11728,25 @@ visualize what it will look like in chat.
 										<input type="hidden" name="attr_minimum_damage_note" value="Min 1" />
 									</div>
 									<div class="cell col4">
-										<input type="text" name="attr_acc" title="Macro: repeating_ranged_{$1}_acc. $1 = Row number OR the Row ID." />
+										<input type="text" name="attr_acc" title="Macro: @{NAME|repeating_ranged_$[row #]_acc}" />
 									</div>
 									<div class="cell col5">
-										<input type="text" name="attr_range" title="Macro: repeating_ranged_{$1}_range. $1 = Row number OR the Row ID." />
+										<input type="text" name="attr_range" title="Macro: @{NAME|repeating_ranged_$[row #]_range}" />
 									</div>
 									<div class="cell col6">
-										<input type="text" name="attr_rof" title="Macro: repeating_ranged_{$1}_rof. $1 = Row number OR the Row ID." />
+										<input type="text" name="attr_rof" title="Macro: @{NAME|repeating_ranged_$[row #]_rof}" />
 									</div>
 									<div class="cell col7">
-										<input type="text" name="attr_shots" title="Macro: repeating_ranged_{$1}_shots. $1 = Row number OR the Row ID." />
+										<input type="text" name="attr_shots" title="Macro: @{NAME|repeating_ranged_$[row #]_shots}" />
 									</div>
 									<div class="cell col8">
-										<input type="text" name="attr_bulk" title="Macro: repeating_ranged_{$1}_bulk. $1 = Row number OR the Row ID." />
+										<input type="text" name="attr_bulk" title="Macro: @{NAME|repeating_ranged_$[row #]_bulk}" />
 									</div>
 									<div class="cell col9">
-										<input type="text" name="attr_recoil" title="Macro: repeating_ranged_{$1}_recoil. $1 = Row number OR the Row ID." />
+										<input type="text" name="attr_recoil" title="Macro: @{NAME|repeating_ranged_$[row #]_recoil}" />
 									</div>
 									<div class="cell col10">
-										<input type="text" name="attr_skill" title="Macro: repeating_ranged_{$1}_skill. $1 = Row number OR the Row ID." />
+										<input type="text" name="attr_skill" title="Macro: @{NAME|repeating_ranged_$[row #]_skil}" />
 									</div>
 									<div class="cell col11">
 										<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Ranged Attack}} {{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}, @{malf_max_value} }kl1]]}} {{useModToll=[[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}}}" name="roll_vsSL" />
@@ -11805,7 +11788,7 @@ visualize what it will look like in chat.
 										</div>
 										<div class="cell col-input-medium show-hide-row-id">
 											<input type="hidden" name="attr_ranged_skill_row_id_toggle" value="0" />
-											<input type="text" name="attr_ranged_skill_row_id" title="Macro: repeating_ranged_{$1}_ranged_skill_row_id. $1 = Row number OR the Row ID." />
+											<input type="text" name="attr_ranged_skill_row_id" title="Macro: @{NAME|repeating_ranged_$[row #]_ranged_skill_row_id}" />
 										</div>
 										<div class="cell">
 											<div class="popup">
@@ -11823,7 +11806,7 @@ visualize what it will look like in chat.
 											</div>
 										</div>
 										<div class="cell">
-											<input type="number" value="0" name="attr_ranged_skill_row_id_modifier" class="inline" title="Macro: repeating_ranged_{$1}_ranged_skill_row_id_modifier. $1 = Row number OR the Row ID." />
+											<input type="number" value="0" name="attr_ranged_skill_row_id_modifier" class="inline" title="Macro: @{NAME|repeating_ranged_$[row #]_ranged_skill_row_id_modifier}" />
 										</div>
 										<div class="cell col-wide">
 											<input type="hidden" name="attr_ranged_skill_row_id_message" value="" />
@@ -11850,7 +11833,7 @@ visualize what it will look like in chat.
 											</span>
 										</div>
 										<div class="cell reason-for-mod">
-											<input type="text" name="attr_reason_for_mod" title="Macro: repeating_ranged_{$1}_reason_for_mod. $1 = Row number OR the Row ID." />
+											<input type="text" name="attr_reason_for_mod" title="Macro: @{NAME|repeating_ranged_$[row #]_reason_for_mod}" />
 										</div>
 									</div><!-- .row -->
 									
@@ -11870,7 +11853,7 @@ visualize what it will look like in chat.
 										</div>
 										
 										<div class="cell col-input">
-											<input type="number" default="0" name="attr_malfunction" value="0" title="Macro: repeating_ranged_{$1}_malfunction. $1 = Row number OR the Row ID." />
+											<input type="number" default="0" name="attr_malfunction" value="0" title="Macro: @{NAME|repeating_ranged_$[row #]_malfunction}" />
 											<input type="hidden" name="attr_malf_max_value" value="100" />
 										</div>
 										
@@ -11884,7 +11867,7 @@ visualize what it will look like in chat.
 										</div>
 										
 										<div class="cell col-verifycheck custom-checkbox">
-											<input type="checkbox" name="attr_malfunction_verify" value="1" class="inline" title="Macro: repeating_ranged_{$1}_malfunction_verify. $1 = Row number OR the Row ID." />
+											<input type="checkbox" name="attr_malfunction_verify" value="1" class="inline" title="Macro: @{NAME|repeating_ranged_$[row #]_malfunction_verify}" />
 										</div>
 										
 										<div class="cell custom-checkbox">
@@ -11896,7 +11879,7 @@ visualize what it will look like in chat.
 											</span>	
 										</div>
 										<div class="cell col-verifycheck custom-checkbox">
-											<input type="checkbox" name="attr_malfunction_very_reliable" value="1" class="inline" title="Macro: repeating_ranged_{$1}_malfunction_very_reliable. $1 = Row number OR the Row ID" />
+											<input type="checkbox" name="attr_malfunction_very_reliable" value="1" class="inline" title="Macro: @{NAME|repeating_ranged_$[row #]_malfunction_very_reliable}" />
 										</div>
 
 										<div class="cell col-setting-text">
@@ -11915,7 +11898,7 @@ visualize what it will look like in chat.
 											</span>	
 										</div>
 										<div class="cell">
-											<input type="number" class="inline" name="attr_armor_divisor" value="1" min="1" step="1" title="Macro: repeating_ranged_{$1}_armor_divisor. $1 = Row number OR the Row ID." />
+											<input type="number" class="inline" name="attr_armor_divisor" value="1" min="1" step="1" title="Macro: @{NAME|repeating_ranged_$[row #]_armor_divisor}" />
 										</div>
 									</div> <!-- .row -->
 									
@@ -11927,7 +11910,7 @@ visualize what it will look like in chat.
 											<span class="tooltip">
 												<span data-i18n="private-notes-tooltip">These notes do not appear in any Roll Template; they are just here for your reference.</span>
 											</span>
-											<textarea class="text-left full-size" name="attr_private_notes" title="Macro: repeating_ranged_{$1}_private_notes. $1 = Row number OR the Row ID."></textarea>
+											<textarea class="text-left full-size" name="attr_private_notes" title="Macro: @{NAME|repeating_ranged_$[row #]_private_notes}"></textarea>
 										</div>
 									</div> <!-- .row -->
 
@@ -11942,7 +11925,7 @@ visualize what it will look like in chat.
 			Example: Arrow: ?{Arrow Type|Bodkin|Normal}
 												</span>
 											</span>
-											<textarea class="text-left chat-size" name="attr_notes" title="Macro: repeating_ranged_{$1}_notes. $1 = Row number OR the Row ID."></textarea>
+											<textarea class="text-left chat-size" name="attr_notes" title="Macro: @{NAME|repeating_ranged_$[row #]_notes}"></textarea>
 										</div>
 										<div class="cell">
 											<div class="popup">
@@ -11954,7 +11937,7 @@ visualize what it will look like in chat.
 			Example: Does an additional [[1d6]] fire damage.
 												</span>
 											</span>
-											<textarea class="text-left chat-size" name="attr_damage_notes" title="Macro: repeating_ranged_{$1}_damage_notes. $1 = Row number OR the Row ID."></textarea>
+											<textarea class="text-left chat-size" name="attr_damage_notes" title="Macro: @{NAME|repeating_ranged_$[row #]_damage_notes}"></textarea>
 										</div>
 									</div> <!-- .row -->
 
@@ -11969,7 +11952,7 @@ visualize what it will look like in chat.
 			Example: Select Location: ?{Location|Head|Torso}
 												</span>
 											</span>
-											<textarea class="text-left chat-size" name="attr_success_notes" title="Macro: repeating_ranged_{$1}_success_notes. $1 = Row number OR the Row ID."></textarea>
+											<textarea class="text-left chat-size" name="attr_success_notes" title="Macro: @{NAME|repeating_ranged_$[row #]_success_notes}"></textarea>
 										</div>
 										<div class="cell">
 											<div class="popup">
@@ -11981,7 +11964,7 @@ visualize what it will look like in chat.
 			Example: Does an additional [[1d6]] fire damage.
 												</span>
 											</span>
-											<textarea class="text-left chat-size" name="attr_critical_success_notes" title="Macro: repeating_ranged_{$1}_critical_success_notes. $1 = Row number OR the Row ID."></textarea>
+											<textarea class="text-left chat-size" name="attr_critical_success_notes" title="Macro: @{NAME|repeating_ranged_$[row #]_critical_success_notes}"></textarea>
 										</div>
 									</div> <!-- .row -->
 
@@ -11996,7 +11979,7 @@ visualize what it will look like in chat.
 			Example: Select Location: ?{Location|Head|Torso}
 												</span>
 											</span>
-											<textarea class="text-left chat-size" name="attr_fail_notes" title="Macro: repeating_ranged_{$1}_fail_notes. $1 = Row number OR the Row ID."></textarea>
+											<textarea class="text-left chat-size" name="attr_fail_notes" title="Macro: @{NAME|repeating_ranged_$[row #]_fail_notes}"></textarea>
 										</div>
 										<div class="cell">
 											<div class="popup">
@@ -12008,7 +11991,7 @@ visualize what it will look like in chat.
 			Example: Does an additional [[1d6]] fire damage.
 												</span>
 											</span>
-											<textarea class="text-left chat-size" name="attr_critical_fail_notes" title="Macro: repeating_ranged_{$1}_critical_fail_notes. $1 = Row number OR the Row ID."></textarea>
+											<textarea class="text-left chat-size" name="attr_critical_fail_notes" title="Macro: @{NAME|repeating_ranged_$[row #]_critical_fail_notes}"></textarea>
 										</div>
 									</div> <!-- .row -->
 									
@@ -12192,29 +12175,29 @@ visualize what it will look like in chat.
 									
 									<div class="row row-stats row-thrown-object">
 										<div class="cell col0-st">
-											<input type="number" step="1" value="1" min="1" name="attr_thrown_object_weight" title="Macro name: thrown_object_weight" />
+											<input type="number" step="1" value="1" min="1" name="attr_thrown_object_weight" title="Macro: @{NAME|thrown_object_weight}" />
 										</div>
 										<div class="cell col8">
-											<input type="text" name="attr_thrown_object_strength" readonly="readonly" value="10" title="Macro name: thrown_object_strength" />
+											<input type="text" name="attr_thrown_object_strength" readonly="readonly" value="10" title="Macro: @{NAME|thrown_object_strength}" />
 										</div>
 										<div class="cell col8">
-											<input type="number" name="attr_thrown_object_strength_mod" value="0" step="1" title="Macro name: thrown_object_strength_mod" />
+											<input type="number" name="attr_thrown_object_strength_mod" value="0" step="1" title="Macro: @{NAME|thrown_object_strength_mod}" />
 										</div>
 										<div class="cell col8">
-											<input type="number" name="attr_super_throw_level" value="0" step="1" title="Macro name: super_throw_level" />
+											<input type="number" name="attr_super_throw_level" value="0" step="1" title="Macro: @{NAME|super_throw_level}" />
 										</div>
 										<div class="cell col1">
-											<input type="text" name="attr_thrown_object_damage" readonly="readonly" value="@{thrust}" title="Macro name: thrown_object_damage" />
+											<input type="text" name="attr_thrown_object_damage" readonly="readonly" value="@{thrust}" title="Macro: @{NAME|thrown_object_damage}" />
 										</div>
 										<div class="cell col8">
-											<input type="number" step="1" name="attr_thrown_object_damage_mod" value="0" title="Macro name: thrown_object_damage_mod" />
+											<input type="number" step="1" name="attr_thrown_object_damage_mod" value="0" title="Macro: @{NAME|thrown_object_damage_mod}" />
 										</div>
 										<div class="cell col2">
 											<input type="hidden" name="attr_damage_dice_icon" class="range-damage-dice-icon" value="explode" />
 											<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Ranged Damage}} {{selected=@{selected_token_macro}}} {{target1=@{target_token_macro}}} {{characterName=@{character_name}}} {{skillName=Thrown Object @{thrown_object_weight} @{weight_system}.}} {{damageRoll=[[@{thrown_object_damage}]]}} {{showMinimumDmgNote=[[@{show_minimum_damage_notes}]]}} {{minDamageNote=@{thrown_minimum_damage_note}}} {{damageType=@{thrown_object_damage_type}}} {{useDamageTypeNotes=[[@{use_damage_type_notes}]]}} {{damageTypeNote=@{thrown_object_damage_type_note}}} {{showNotes=[[1]]}} {{notes=@{thrown_object_damage_notes}}}" name="roll_damage" class="roll_damage" />
 										</div>
 										<div class="cell col3">
-											<select name="attr_thrown_object_damage_type" title="Macro name: thrown_object_damage_type">
+											<select name="attr_thrown_object_damage_type" title="Macro: @{NAME|thrown_object_damage_type}">
 												<option value="Cutting (cut)"><span data-i18n="abbreviation-option-cutting">cut</span></option>
 												<option value="Impaling (imp)"><span data-i18n="abbreviation-option-impaling">imp</span></option>
 												<option value="Crushing (cr)"><span data-i18n="abbreviation-option-crushing">cr</span></option>
@@ -12234,25 +12217,25 @@ visualize what it will look like in chat.
 											<input type="hidden" name="attr_thrown_minimum_damage_note" value="Min 1" />
 										</div>
 										<div class="cell col4">
-											<input type="number" step="1" name="attr_thrown_object_acc" value="0" title="Macro name: thrown_object_acc" />
+											<input type="number" step="1" name="attr_thrown_object_acc" value="0" title="Macro: @{NAME|thrown_object_acc}" />
 										</div>
 										<div class="cell col5-thrown thrown-object-input">
 											<input type="number" name="attr_gravity" value="1" min="0" step=".01" title="Macro: @{NAME|gravity}" />
 										</div>
 										<div class="cell col5-thrown thrown-object-input">
-											<input type="text" name="attr_thrown_object_range" readonly="readonly" value="10" title="Macro name: thrown_object_range" />
+											<input type="text" name="attr_thrown_object_range" readonly="readonly" value="10" title="Macro: @{NAME|thrown_object_range}" />
 										</div>
 										<div class="cell col6">
-											<input type="text" name="attr_thrown_object_rof" value="1" title="Macro name: thrown_object_rof" />
+											<input type="text" name="attr_thrown_object_rof" value="1" title="Macro: @{NAME|thrown_object_rof}" />
 										</div>
 										<div class="cell col5-thrown">
-											<input type="text" name="attr_thrown_object_shots" value="1" title="Macro name: thrown_object_shots" />
+											<input type="text" name="attr_thrown_object_shots" value="1" title="Macro: @{NAME|thrown_object_shots}" />
 										</div>
 										<div class="cell col9">
-											<input type="text" name="attr_thrown_object_recoil" value="-1" title="Macro name: thrown_object_recoil" />
+											<input type="text" name="attr_thrown_object_recoil" value="-1" title="Macro: @{NAME|thrown_object_recoil}" />
 										</div>
 										<div class="cell col10">
-											<input type="text" name="attr_thrown_object_skill" value="10" title="Macro name: thrown_object_skill" />
+											<input type="text" name="attr_thrown_object_skill" value="10" title="Macro: @{NAME|thrown_object_skill}" />
 										</div>
 										<div class="cell col11">
 											<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Ranged Attack}} {{activeDefense=[[0]]}} {{isSkillRoll=[[1]]}} {{showHitLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Thrown Object @{thrown_object_weight} @{weight_system}.}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[{@{thrown_object_skill} + @{modifier} + @{ranged_roll_modifier}, @{ranged_roll_max_nine_value} }kl1]]}} {{useModToll=[[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}}} {{showNotes=[[1]]}} {{notes=@{thrown_object_notes}}} {{rof=@{thrown_object_rof}}} {{recoil=@{thrown_object_recoil}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}}" name="roll_vsSL" />
@@ -12263,7 +12246,7 @@ visualize what it will look like in chat.
 											<span data-i18n="weapon-notes-label">Weapon Notes</span>
 										</div>
 										<div class="cell col1">
-											<input type="text" name="attr_thrown_object_notes" title="Macro name: thrown_object_notes" />
+											<input type="text" name="attr_thrown_object_notes" title="Macro: @{NAME|thrown_object_notes}" />
 										</div>
 										<div class="cell col2 label">
 											<div class="popup">
@@ -12277,7 +12260,7 @@ visualize what it will look like in chat.
 											</span>
 										</div>
 										<div class="cell col3">
-											<input type="text" name="attr_thrown_object_damage_notes" title="Macro name: thrown_object_damage_notes" />
+											<input type="text" name="attr_thrown_object_damage_notes" title="Macro: @{NAME|thrown_object_damage_notes}" />
 										</div>
 									</div>
 								</div> <!-- .row -->
@@ -12396,35 +12379,35 @@ visualize what it will look like in chat.
 								
 								<div class="row">
 									<div class="cell linear-range">
-										<input type="number" step="1" value="0" min="0" name="attr_firing_distance" title="Macro name: firing_distance" />
+										<input type="number" step="1" value="0" min="0" name="attr_firing_distance" title="Macro: @{NAME|firing_distance}" />
 									</div>
 									<div class="cell speed">
-										<input type="number" step="1" value="0" min="0" name="attr_firing_speed_difference" title="Macro name: firing_speed_difference" />
+										<input type="number" step="1" value="0" min="0" name="attr_firing_speed_difference" title="Macro: @{NAME|firing_speed_difference}" />
 									</div>
 									<div class="cell fire-up-dwn-distance">
-										<input type="number" step="1" value="0" min="0" name="attr_firing_elevation" title="Macro name: firing_elevation" />
+										<input type="number" step="1" value="0" min="0" name="attr_firing_elevation" title="Macro: @{NAME|firing_elevation}" />
 									</div>
 									<div class="cell new-range">
-										<input type="number" step="1" value="0" min="0" name="attr_firing_new_range" readonly="readonly" title="Macro name: firing_new_range" />
+										<input type="number" step="1" value="0" min="0" name="attr_firing_new_range" readonly="readonly" title="Macro: @{NAME|firing_new_range}" />
 									</div>
 									<div class="cell speed">
-										<input type="number" step="1" value="0" min="0" name="attr_firing_acc" title="Macro name: firing_acc" />
+										<input type="number" step="1" value="0" min="0" name="attr_firing_acc" title="Macro: @{NAME|firing_acc}" />
 									</div>
 									<div class="cell aiming">
-										<select name="attr_firing_aiming_bonus" title="macro name: @{firing_aiming_bonus}">
+										<select name="attr_firing_aiming_bonus" title="Macro: @{NAME|firing_aiming_bonus}">
 											<option value="0" selected="selected">+0</option>
 											<option value="1">2 turns: +1</option>
 											<option value="2">3+ turns: +2</option>
 										</select>
 									</div>
 									<div class="cell rof">
-										<input type="number" step="1" value="0" min="1" name="attr_firing_rof" title="Macro name: firing_acc" />
+										<input type="number" step="1" value="0" min="1" name="attr_firing_rof" title="Macro: @{NAME|firing_acc}" />
 									</div>
 									<div class="cell size">
-										<input type="number" step="1" value="0" name="attr_firing_size_mod" title="Macro name: firing_size_mod" />
+										<input type="number" step="1" value="0" name="attr_firing_size_mod" title="Macro: @{NAME|firing_size_mod}" />
 									</div>
 									<div class="cell hit-mod">
-										<input type="number" step="1" value="0" name="attr_firing_hit_mod" readonly="readonly" title="Macro name: firing_hit_mod" />
+										<input type="number" step="1" value="0" name="attr_firing_hit_mod" readonly="readonly" title="Macro: @{NAME|firing_hit_mod}" />
 									</div>
 									<div class="cell reset">
 										<button type="action" name="act_range_calc_reset" class="reset"><span data-i18n="reset-label">Reset</span></button>
@@ -12510,13 +12493,13 @@ visualize what it will look like in chat.
 								
 								<div class="row">
 									<div class="cell damage">
-										<input type="text" value="1d6+1" name="attr_shotgun_damage" title="Macro name: shotgun_damage" />
+										<input type="text" value="1d6+1" name="attr_shotgun_damage" title="Macro: @{NAME|shotgun_damage}" />
 									</div>
 									<div class="cell rof">
-										<input type="text" value="2x9" name="attr_shotgun_rof" title="Macro name: shotgun_rof" />
+										<input type="text" value="2x9" name="attr_shotgun_rof" title="Macro: @{NAME|shotgun_rof}" />
 									</div>
 									<div class="cell type">
-										<select name="attr_shotgun_damage_type" title="Macro name: shotgun_damage_type">
+										<select name="attr_shotgun_damage_type" title="Macro: @{NAME|shotgun_damage_type}">
 											<option value="Affliction (aff)"><span data-i18n="abbreviation-option-affliction">aff</span></option>
 											<option value="Burning (burn)"><span data-i18n="abbreviation-option-burning">burn</span></option>
 											<option value="Corrosion (cor)"><span data-i18n="abbreviation-option-corrosion">cor</span></option>
@@ -12534,19 +12517,19 @@ visualize what it will look like in chat.
 										</select>
 									</div>
 									<div class="cell range">
-										<input type="number" value="50" step="1" min="0" name="attr_shotgun_half_range" title="Macro name: shotgun_half_range" />
+										<input type="number" value="50" step="1" min="0" name="attr_shotgun_half_range" title="Macro: @{NAME|shotgun_half_range}" />
 									</div>
 									<div class="cell close-range">
-										<input type="text" value="5" name="attr_shotgun_close_range" readonly="readonly" title="Macro name: shotgun_close_range" />
+										<input type="text" value="5" name="attr_shotgun_close_range" readonly="readonly" title="Macro: @{NAME|shotgun_close_range}" />
 									</div>
 									<div class="cell close-rof">
-										<input type="text" value="2" name="attr_shotgun_close_rof" readonly="readonly" title="Macro name: shotgun_close_row" />
+										<input type="text" value="2" name="attr_shotgun_close_rof" readonly="readonly" title="Macro: @{NAME|shotgun_close_row}" />
 									</div>
 									<div class="cell close-damage">
-										<input type="text" value="4d6+4" name="attr_shotgun_close_damage" readonly="readonly" title="Macro name: shotgun_close_damage" />
+										<input type="text" value="4d6+4" name="attr_shotgun_close_damage" readonly="readonly" title="Macro: @{NAME|shotgun_close_damage}" />
 									</div>
 									<div class="cell close-damage">
-										<input type="text" value="DR x 4" name="attr_shotgun_dr_multiplier" readonly="readonly" title="Macro name: shotgun_dr_multiplier" />
+										<input type="text" value="DR x 4" name="attr_shotgun_dr_multiplier" readonly="readonly" title="Macro: @{NAME|shotgun_dr_multiplier}" />
 									</div>
 									<div class="cell roll-damage">
 										<input type="hidden" name="attr_thrust_damage_dice_icon" class="thrust-damage-dice-icon" value="explode" />
@@ -12992,28 +12975,28 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 										<span data-i18n="falling-label">Falling</span>
 									</div>
 									<div class="cell yards-fallen">
-										<input type="number" step="1" value="1" min="1" name="attr_yards_fallen" title="Macro name: yards_fallen" />
+										<input type="number" step="1" value="1" min="1" name="attr_yards_fallen" title="Macro: @{NAME|yards_fallen}" />
 									</div>
 									<div class="cell gravity">
-										<input type="number" value="1" min="0" step=".01" name="attr_gravity" title="Macro name: gravity" />
+										<input type="number" value="1" min="0" step=".01" name="attr_gravity" title="Macro: @{NAME|gravity}" />
 									</div>
 									<div class="cell atmosphere">
-										<input type="number" value="1" min="0" name="attr_atmosphere" title="Macro name: atmosphere" />
+										<input type="number" value="1" min="0" name="attr_atmosphere" title="Macro: @{NAME|atmosphere}" />
 									</div>
 									<div class="cell velocity">
-										<input type="number" value="5" readonly="readonly" name="attr_falling_velocity" title="Macro name: velocity" />
+										<input type="number" value="5" readonly="readonly" name="attr_falling_velocity" title="Macro: @{NAME|falling_velocity}" />
 									</div>									
 									<div class="cell terminal-velocity">
-										<input type="number" value="1" readonly="readonly" name="attr_terminal_velocity_multiplier" title="Macro name: terminal_velocity_multiplier" />
+										<input type="number" value="1" readonly="readonly" name="attr_terminal_velocity_multiplier" title="Macro: @{NAME|terminal_velocity_multiplier}" />
 									</div>
 									<div class="cell hit-points">
-										<input type="number" step="1" value="10" min="1" name="attr_falling_hit_points" title="Macro name: falling_hit_points" />
+										<input type="number" step="1" value="10" min="1" name="attr_falling_hit_points" title="Macro: @{NAME|falling_hit_points}" />
 									</div>
 									<div class="cell hard-object">
 										<input type="checkbox" name="attr_falling_hard_object" value="1" title="Macro: @{NAME|falling_hard_object}" />
 									</div>
 									<div class="cell damage">
-										<input type="text" value="1d6-2" name="attr_falling_damage" readonly="readonly" title="Macro name: falling_damage" />
+										<input type="text" value="1d6-2" name="attr_falling_damage" readonly="readonly" title="Macro: @{NAME|falling_damage}" />
 									</div>
 									<div class="cell roll-damage">
 										<input type="hidden" name="attr_thrust_damage_dice_icon" class="thrust-damage-dice-icon" value="explode" />
@@ -13038,19 +13021,19 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 										&nbsp;
 									</div>
 									<div class="cell velocity">
-										<input type="number" value="1" step="1" min="1" name="attr_collision_velocity" title="Macro name: collision_velocity" />
+										<input type="number" value="1" step="1" min="1" name="attr_collision_velocity" title="Macro: @{NAME|collision_velocity}" />
 									</div>
 									<div class="cell terminal-velocity">
 										&nbsp;
 									</div>
 									<div class="cell hit-points">
-										<input type="number" step="1" value="10" min="1" name="attr_collision_hit_points" title="Macro name: collision_hit_points" />
+										<input type="number" step="1" value="10" min="1" name="attr_collision_hit_points" title="Macro: @{NAME|collision_hit_points}" />
 									</div>
 									<div class="cell hard-object">
 										<input type="checkbox" name="attr_collision_hard_object" value="1" title="Macro: @{NAME|collision_hard_object}" />
 									</div>
 									<div class="cell damage">
-										<input type="text" value="1d6-3" name="attr_collision_damage" readonly="readonly" title="Macro name: collision_damage" />
+										<input type="text" value="1d6-3" name="attr_collision_damage" readonly="readonly" title="Macro: @{NAME|collision_damage}" />
 									</div>
 									<div class="cell roll-damage">
 										<input type="hidden" name="attr_thrust_damage_dice_icon" class="thrust-damage-dice-icon" value="explode" />
@@ -13221,29 +13204,29 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 										</select>
 									</div>
 									<div class="cell text-box">
-										<input type="text" value="TNT" name="attr_demo_how_much_type" title="Macro name: demo_how_much_type" />
+										<input type="text" value="TNT" name="attr_demo_how_much_type" title="Macro: @{NAME|demo_how_much_type}" />
 									</div>
 									<div class="cell input">
-										<input type="number" value="1.0" min="0" step=".01" name="attr_demo_how_much_ref" title="Macro name: demo_how_much_ref" />
+										<input type="number" value="1.0" min="0" step=".01" name="attr_demo_how_much_ref" title="Macro: @{NAME|demo_how_much_ref}" />
 									</div>
 									<div class="cell input">
-										<input type="number" value="1" readonly="readonly" name="attr_demo_how_much_weight" title="Macro name: demo_how_much_weight" />
+										<input type="number" value="1" readonly="readonly" name="attr_demo_how_much_weight" title="Macro: @{NAME|demo_how_much_weight}" />
 									</div>
 									<div class="cell input">
-										<input type="text" value="6d6" name="attr_demo_how_much_base_damage" title="Macro name: demo_how_much_base_damage" />
+										<input type="text" value="6d6" name="attr_demo_how_much_base_damage" title="Macro: @{NAME|demo_how_much_base_damage}" />
 									</div>
 									<div class="cell six-d-spacer">X</div>
 									<div class="cell damage">
-										<input type="number" value="1" min="1" step="1" name="attr_demo_how_much_damage_multiplier" title="Macro name: demo_how_much_damage_multiplier" />
+										<input type="number" value="1" min="1" step="1" name="attr_demo_how_much_damage_multiplier" title="Macro: @{NAME|demo_how_much_damage_multiplier}" />
 									</div>
 									<div class="cell roll-damage">
-										<input type="text" readonly="readonly" value="12" name="attr_demo_how_much_radius" title="Macro name: demo_how_much_radius" />
+										<input type="text" readonly="readonly" value="12" name="attr_demo_how_much_radius" title="Macro: @{NAME|demo_how_much_radius}" />
 									</div>
 									<div class="cell roll-damage">
-										<input type="number" value="3" min="1" step="1" max="3" name="attr_demo_how_much_divisor" title="Macro name: demo_how_much_divisor" />
+										<input type="number" value="3" min="1" step="1" max="3" name="attr_demo_how_much_divisor" title="Macro: @{NAME|demo_how_much_divisor}" />
 									</div>
 									<div class="cell roll-damage">
-										<input type="number" value="0" min="0" step="1" name="attr_demo_how_much_target_distance" title="Macro name: demo_how_much_target_distance" />
+										<input type="number" value="0" min="0" step="1" name="attr_demo_how_much_target_distance" title="Macro: @{NAME|demo_how_much_target_distance}" />
 									</div>
 									<div class="cell roll-damage">
 										<input type="hidden" name="attr_demo_how_much_damage_dice_icon" class="thrust-damage-dice-icon" value="explode" />
@@ -13286,29 +13269,29 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 										</select>
 									</div>
 									<div class="cell text-box">
-										<input type="text" value="TNT" name="attr_demo_how_big_type" title="Macro name: demo_how_big_type" />
+										<input type="text" value="TNT" name="attr_demo_how_big_type" title="Macro: @{NAME|demo_how_big_type}" />
 									</div>
 									<div class="cell input">
-										<input type="number" value="1.0" min="0" step=".01" name="attr_demo_how_big_ref" title="Macro name: demo_how_big_ref" />
+										<input type="number" value="1.0" min="0" step=".01" name="attr_demo_how_big_ref" title="Macro: @{NAME|demo_how_big_ref}" />
 									</div>
 									<div class="cell input">
-										<input type="number" value="1" min=".01" step=".01" name="attr_demo_how_big_weight" title="Macro name: demo_how_big_weight" />
+										<input type="number" value="1" min=".01" step=".01" name="attr_demo_how_big_weight" title="Macro: @{NAME|demo_how_big_weight}" />
 									</div>
 									<div class="cell input">
-										<input type="text" value="6d6" name="attr_demo_how_big_base_damage" title="Macro name: demo_how_big_base_damage" />
+										<input type="text" value="6d6" name="attr_demo_how_big_base_damage" title="Macro: @{NAME|demo_how_big_base_damage}" />
 									</div>
 									<div class="cell six-d-spacer">X</div>
 									<div class="cell damage">
-										<input type="number" value="1" readonly="readonly" name="attr_demo_how_big_damage_multiplier" title="Macro name: demo_how_big_damage_multiplier" />
+										<input type="number" value="1" readonly="readonly" name="attr_demo_how_big_damage_multiplier" title="Macro: @{NAME|demo_how_big_damage_multiplier}" />
 									</div>
 									<div class="cell roll-damage">
-										<input type="text" readonly="readonly" value="12" name="attr_demo_how_big_radius" title="Macro name: demo_how_big_radius" />
+										<input type="text" readonly="readonly" value="12" name="attr_demo_how_big_radius" title="Macro: @{NAME|demo_how_big_radius}" />
 									</div>
 									<div class="cell roll-damage">
-										<input type="number" value="3" min="1" step="1" max="3" name="attr_demo_how_big_divisor" title="Macro name: demo_how_big_divisor" />
+										<input type="number" value="3" min="1" step="1" max="3" name="attr_demo_how_big_divisor" title="Macro: @{NAME|demo_how_big_divisor}" />
 									</div>
 									<div class="cell roll-damage">
-										<input type="number" value="0" min="0" step="1" name="attr_demo_how_big_target_distance" title="Macro name: demo_how_big_target_distance" />
+										<input type="number" value="0" min="0" step="1" name="attr_demo_how_big_target_distance" title="Macro: @{NAME|demo_how_big_target_distance}" />
 									</div>
 									<div class="cell roll-damage">
 										<input type="hidden" name="attr_demo_how_big_damage_dice_icon" class="thrust-damage-dice-icon" value="explode" />
@@ -13356,13 +13339,13 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 										<button type="roll" value="@{roll}&{template:skillRoll} {{sheetStyle=@{sheetstyle}}} {{type=Ranged Attack}} {{activeDefense=[[0]]}} {{isSkillRoll=[[1]]}} {{showHitLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=Fragmentation Damage}} {{rollResult=[[3d6cs<1cf>6]]}} {{effectiveSkill=[[@{fragmentation_skill} + @{modifier}]]}} {{notes=@{fragmentation_skill_notes}}} {{showNotes=[[1]]}} {{recoil=@{fragmentation_recoil}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}}" />
 									</div>
 									<div class="cell input">
-										<input type="text" value="1d6" name="attr_fragmentation_damage" title="Macro name: fragmentation_damage" />
+										<input type="text" value="1d6" name="attr_fragmentation_damage" title="Macro: @{NAME|fragmentation_damage}" />
 									</div>
 									<div class="cell six-d-spacer"></div>
 									<div class="cell damage">
 									</div>
 									<div class="cell roll-damage">
-										<input type="text" readonly="readonly" value="12" name="attr_fragmentation_radius" title="Macro name: fragmentation_radius" />
+										<input type="text" readonly="readonly" value="12" name="attr_fragmentation_radius" title="Macro: @{NAME|fragmentation_radius}" />
 									</div>
 									<div class="cell roll-damage">
 									</div>
@@ -13401,7 +13384,7 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 				<div class="cell col0"><span data-i18n="quick-inventory-label">Quick Inventory</span></div>
 			</div>
 			<div class="quick-inventory-textarea">
-				<textarea name="attr_quick_inventory" title="Macro name: quick_inventory"></textarea>
+				<textarea name="attr_quick_inventory" title="Macro: @{NAME|quick_inventory}"></textarea>
 			</div>
 		</div>
 
@@ -13456,39 +13439,39 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 					<span class="checkbox"></span>
 					<div class="row row-stats">
 						<div class="cell col0">
-							<input type="text" name="attr_name" title="Macro table name: repeating_item. Field name: name" />
+							<input type="text" name="attr_name" title="Macro: @{NAME|repeating_item_$[row #]_name}" />
 							<input type="hidden" name="attr_idkey" />
 						</div>
 						<div class="cell col-location">
-							<input type="text" name="attr_location" title="Macro table name: repeating_item. Field name: location" />
+							<input type="text" name="attr_location" title="Macro: @{NAME|repeating_item_$[row #]_location}" />
 						</div>
 						<div class="cell col1">
-							<input type="text" name="attr_tl" title="Macro table name: repeating_item. Field name: tl" />
+							<input type="text" name="attr_tl" title="Macro: @{NAME|repeating_item_$[row #]_tl}" />
 						</div>
 						<div class="cell col1">
-							<input type="number" step="1" min="0" max="4" name="attr_legality_class" title="Macro table name: repeating_item. Field name: legality_class" />
+							<input type="number" step="1" min="0" max="4" name="attr_legality_class" title="Macro: @{NAME|repeating_item_$[row #]_legality_class}" />
 						</div>
 						<div class="cell col2">
-							<input type="text" name="attr_ref" title="Macro table name: repeating_item. Field name: ref" />
+							<input type="text" name="attr_ref" title="Macro: @{NAME|repeating_item_$[row #]_ref}" />
 						</div>
 						<div class="cell col3">
-							<input class="boolean" type="checkbox" name="attr_carried" value="1" checked title="Macro table name: repeating_item. Field name: carried" />
+							<input class="boolean" type="checkbox" name="attr_carried" value="1" checked title="Macro: @{NAME|repeating_item_$[row #]_carried}" />
 						</div>
 						<div class="cell col4">
-							<input type="number" name="attr_count" value="1" title="Macro table name: repeating_item. Field name: count" />
+							<input type="number" name="attr_count" value="1" title="Macro: @{NAME|repeating_item_$[row #]_count}" />
 						</div>
 						<div class="cell col5">
-							<input type="number" name="attr_cost" value="0.00" step="0.01" title="Macro table name: repeating_item. Field name: cost" />
+							<input type="number" name="attr_cost" value="0.00" step="0.01" title="Macro: @{NAME|repeating_item_$[row #]_cost}" />
 						</div>
 						<div class="cell col6">
-							<input type="number" name="attr_weight" value="0.000" step="0.001" title="Macro table name: repeating_item. Field name: weight" />
+							<input type="number" name="attr_weight" value="0.000" step="0.001" title="Macro: @{NAME|repeating_item_$[row #]_weight}" />
 						</div>
 						<div class="cell col7" style="text-align: right;background-color: #c9c9c9;border-bottom: 1px solid white;border-right: 1px solid white;">
-							<span name="attr_costtotal" value="0.00" title="Macro table name: repeating_item. Field name: costtotal" />
+							<span name="attr_costtotal" value="0.00" title="Macro: @{NAME|repeating_item_$[row #]_costtotal}" />
 						</div>
 						<div class="cell col8" style="text-align: right;background-color: #c9c9c9;border-bottom: 1px solid white;border-right: 1px solid white;">
 							<input type="hidden" name="attr_inventory_item_carried" value="1" />
-							<span name="attr_weighttotal" value="0.000" class="item-weight-total" title="Macro table name: repeating_item. Field name: weighttotal" />
+							<span name="attr_weighttotal" value="0.000" class="item-weight-total" title="Macro: @{NAME|repeating_item_$[row #]_weighttotal}" />
 						</div>
 					</div> <!-- .row -->
 					<div class="row row-details notebox">
@@ -13498,7 +13481,7 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 									<span data-i18n="notes-label">Notes</span>
 								</span>
 							</div>
-							<textarea name="attr_notes" title="Macro table name: repeating_item. Field name: notes"></textarea>
+							<textarea name="attr_notes" title="Macro: @{NAME|repeating_item_$[row #]_notes}"></textarea>
 						</div>
 					</div> <!-- .row -->
 				</fieldset> <!-- .repeating_item -->
@@ -13527,7 +13510,7 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 						</div>
 					</div>
 					<div class="cell col2">
-						<input type="number" style="font-weight: bold;" step=".01" name="attr_total_value" value="0" readonly="readonly" title="Macro name: total_value" />
+						<input type="number" style="font-weight: bold;" step=".01" name="attr_total_value" value="0" readonly="readonly" title="Macro: @{NAME|total_value}" />
 					</div>
 					<div class="cell col3">
 						<div style="text-align: right; font-weight: bold;" class="popup">
@@ -13556,7 +13539,7 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 					</div>
 					<div class="cell col6">
 						<input type="hidden" name="attr_grand_total_weight" />
-						<input type="text" style="font-weight: bold; text-align: center;" name="attr_grand_total_weight_display" value="0" readonly="readonly" title="Macro name: grand_total_weight" />
+						<input type="text" style="font-weight: bold; text-align: center;" name="attr_grand_total_weight_display" value="0" readonly="readonly" title="Macro: @{NAME|grand_total_weight}" />
 
 					</div>					
 				</div> <!-- .row -->
@@ -13575,7 +13558,7 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 				<div class="header spell-stats-header">
 					<div class="cell"><span data-i18n="spells-based-on-label">Spells Based on:</span></div>
 					<div class="cell margin-right">
-						<select name="attr_spell_base" title="Macro name: spell_base">
+						<select name="attr_spell_base" title="Macro: @{NAME|spell_base}">
 							<option value="@{strength}"><span data-i18n="abbreviation-option-strength">ST</span></option>
 							<option value="@{dexterity}"><span data-i18n="abbreviation-option-dexterity">DX</span></option>
 							<option value="@{intelligence}" selected><span data-i18n="abbreviation-option-intelligence">IQ</span></option>
@@ -13587,7 +13570,7 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 					</div>
 					<div class="cell"><span data-i18n="magery-power-investiture-bonus-label">Magery/PI/Bonus Level:</span></div>
 					<div class="cell margin-right">
-						<input type="number" name="attr_spell_bonus" value="0" title="Macro name: spell_bonus" />
+						<input type="number" name="attr_spell_bonus" value="0" title="Macro: @{NAME|spell_bonus}" />
 					</div>
 					<div class="cell">
 						<div class="popup"><span data-formula="on-penalty-label">On Penalty</span></div>
@@ -13601,7 +13584,7 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 						</div>
 					</div>
 					<div class="cell margin-right">
-						<input type="number" name="attr_spell_on_penalty_total" value="0" title="Macro name: spell_on_penalty_total" readonly="readonly" />
+						<input type="number" name="attr_spell_on_penalty_total" value="0" title="Macro: @{NAME|spell_on_penalty_total}" readonly="readonly" />
 					</div>
 					<div class="cell">
 						<div class="popup"><span data-i18n="cencentration-penalty-label">Concentration Penalty</span></div>
@@ -13615,7 +13598,7 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 						</div>
 					</div>
 					<div class="cell margin-right">
-						<input type="number" name="attr_spell_maintained_penalty_total" value="0" title="Macro name: spell_maintained_penalty_total" readonly="readonly" />
+						<input type="number" name="attr_spell_maintained_penalty_total" value="0" title="Macro: @{NAME|spell_maintained_penalty_total}" readonly="readonly" />
 					</div>
 				</div>
 			</div>
@@ -13796,20 +13779,20 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 					<span class="checkbox"></span>
 					<div class="row row-stats">
 						<div class="cell col0">
-							<input type="text" name="attr_name" title="Macro: repeating_spells_{$1}_name. $1 = Row number OR the Row ID." />
+							<input type="text" name="attr_name" title="Macro: @{NAME|repeating_spells_$[row #]_name}" />
 							<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]]}} {{useModToll=[[@{use_spell_modifier_tool}]]}} {{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}}}" name="roll_vsSL" />
 						</div>
 						<div class="cell col2">
-							<input type="text" name="attr_level" title="Macro: repeating_spells_{$1}_level. $1 = Row number OR the Row ID." readonly="readonly" value="10"/>
+							<input type="text" name="attr_level" title="Macro: @{NAME|repeating_spells_$[row #]_level}" readonly="readonly" value="10"/>
 							<!-- TODO: replace this hidden field with a drop-down instead of using one drop-down for all spells!  -->
 							<input type="hidden" name="attr_base" value="new" />
 							<input type="hidden" name="attr_sync" value="0" />
 						</div>
 						<div class="cell col3">
-							<select name="attr_difficulty" title="Macro: repeating_spells_{$1}_difficulty. $1 = Row number OR the Row ID.">
+							<select name="attr_difficulty" title="Macro: @{NAME|repeating_spells_$[row #]_difficulty}">
 								<option value="-2"><span data-i18n="abbreviation-option-average">A</span></option>
 								<option value="-3" selected="selected"><span data-i18n="abbreviation-option-hard">H</span></option>
 								<option value="-4"><span data-i18n="abbreviation-option-very-hard">VH</span></option>
@@ -13818,10 +13801,10 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 						<div class="cell col4">
 							<!-- TODO: its possible that a character could have different types, maybe add drop-down for spell bonus -->
 							<input type="hidden" name="attr_bonus" value="0" title="Synced with attr_spell_bonus, reduces code" />
-							<input type="number" name="attr_spell_modifier" value="0" title="Macro table name: repeating_spells. Field name: spell_modifier" />
+							<input type="number" name="attr_spell_modifier" value="0" title="Macro: @{NAME|repeating_spells_$[row #]_spell_modifier}" />
 						</div>
 						<div class="cell col5">
-							<input type="number" name="attr_points" value="1" title="Macro: repeating_spells_{$1}_difficultpointsy. $1 = Row number OR the Row ID." />
+							<input type="number" name="attr_points" value="1" title="Macro: @{NAME|repeating_spells_$[row #]_points}" />
 						</div>
 						<div class="cell col12">
 							<input type="number" value="" min="0" max="20" step="1" title="Adjust to mark spell as on." name="attr_spell_on_checked" />
@@ -13830,19 +13813,19 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 							<input type="number" value="" min="0" max="20" step="1" title="Adjust to mark spell as on." name="attr_spell_maintained_checked" />
 						</div>
 						<div class="cell col7">
-							<input type="text" name="attr_spell_resisted_by" placeholder="Resist" title="Macro: repeating_spells_{$1}_spell_resisted_by. $1 = Row number OR the Row ID." />
+							<input type="text" name="attr_spell_resisted_by" placeholder="Resist" title="Macro: @{NAME|repeating_spells_$[row #]_spell_resisted_by}" />
 						</div>
 						<div class="cell col8">
-							<input type="text" name="attr_duration" placeholder="Duration" title="Macro: repeating_spells_{$1}_duration. $1 = Row number OR the Row ID." />
+							<input type="text" name="attr_duration" placeholder="Duration" title="Macro: @{NAME|repeating_spells_$[row #]_duration}" />
 						</div>
 						<div class="cell col9">
-							<input type="text" name="attr_cost" placeholder="Cost to Cast" title="Macro: repeating_spells_{$1}_cost. $1 = Row number OR the Row ID." />
+							<input type="text" name="attr_cost" placeholder="Cost to Cast" title="Macro: @{NAME|repeating_spells_$[row #]_cost}" />
 						</div>
 						<div class="cell col10">
-							<input type="text" name="attr_casttime" placeholder="Casting Time" title="Macro: repeating_spells_{$1}_casttime. $1 = Row number OR the Row ID." />
+							<input type="text" name="attr_casttime" placeholder="Casting Time" title="Macro: @{NAME|repeating_spells_$[row #]_casttime}" />
 						</div>
 						<div class="cell col11">
-							<input type="text" name="attr_maintain" placeholder="Cost to Maintain" title="Macro: repeating_spells_{$1}_maintain. $1 = Row number OR the Row ID." />
+							<input type="text" name="attr_maintain" placeholder="Cost to Maintain" title="Macro: @{NAME|repeating_spells_$[row #]_maintain}" />
 						</div>
 					</div> <!-- .row -->
 					
@@ -13865,7 +13848,7 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 								<input type="text" readonly="readonly" name="attr_row_id" value="" />
 							</div>
 							<div class="cell align-right col3">
-								<input type="text" name="attr_ref" title="Macro: repeating_spells_{$1}_ref. $1 = Row number OR the Row ID." />	
+								<input type="text" name="attr_ref" title="Macro: @{NAME|repeating_spells_$[row #]_ref}" />	
 							</div>
 							<div class="cell align-right ref-label">
 								<div class="popup"><span data-i18n="abbreviation-book-reference-label">Ref</span></div>
@@ -13885,7 +13868,7 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 								<span data-i18n="reason-for-modifier-label">Reason for MOD (Modifier):</span>
 							</div>
 							<div class="cell spell-mod-notes">
-								<input type="text" name="attr_spell_mod_notes" title="Macro: repeating_spells_{$1}_spell_mod_notes. $1 = Row number OR the Row ID." />
+								<input type="text" name="attr_spell_mod_notes" title="Macro: @{NAME|repeating_spells_$[row #]_spell_mod_notes}" />
 							</div>
 						</div> <!-- .row -->
 						
@@ -13902,19 +13885,19 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 								</div>
 							</div>
 							<div class="cell">
-								<input type="text" name="attr_spell_class" title="Macro: repeating_spells_{$1}_spell_class. $1 = Row number OR the Row ID." />
+								<input type="text" name="attr_spell_class" title="Macro: @{NAME|repeating_spells_$[row #]_spell_class}" />
 							</div>
 							<div class="cell label">
 								<span data-i18n="colleges-label">Primary College:</span>
 							</div>
 							<div class="cell text-college-width">
-								<input type="text" name="attr_spell_college" title="Macro: repeating_spells_{$1}_college. $1 = Row number OR the Row ID." />
+								<input type="text" name="attr_spell_college" title="Macro: @{NAME|repeating_spells_$[row #]_spell_college}" />
 							</div>
 							<div class="cell label">
 								<span data-i18n="colleges-secondary-label">Secondary College:</span>
 							</div>
 							<div class="cell text-college-width">
-								<input type="text" name="attr_spell_college_secondary" title="Macro: repeating_spells_{$1}_spell_college_secondary. $1 = Row number OR the Row ID." />
+								<input type="text" name="attr_spell_college_secondary" title="Macro: @{NAME|repeating_spells_$[row #]_spell_college_secondary}" />
 							</div>
 							
 						</div> <!-- .row -->
@@ -13938,7 +13921,7 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 									<span data-i18n="show-notes-below-label">Show notes below in roll template</span>
 								</span>
 							</div>
-							<textarea name="attr_notes" title="Macro: repeating_spells_{$1}_notes. $1 = Row number OR the Row ID."></textarea>
+							<textarea name="attr_notes" title="Macro: @{NAME|repeating_spells_$[row #]_notes}"></textarea>
 						</div>
 						
 						<div class="col-notebox">
@@ -13948,7 +13931,7 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 									<span data-i18n="show-spell-modifier-notes-label">Show Spell Modifier notes (see actual spell description)</span>
 								</span>
 							</div>
-							<textarea name="attr_spell_notes" title="Macro: repeating_spells_{$1}_spell_notes. $1 = Row number OR the Row ID."></textarea>
+							<textarea name="attr_spell_notes" title="Macro: @{NAME|repeating_spells_$[row #]_spell_notes}"></textarea>
 						</div>
 						
 						<div class="rolltable-result-notes">
@@ -13957,12 +13940,12 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 								<div class="note-title">
 									<span data-i18n="success-note-label">Success Note:</span>
 								</div>
-								<textarea name="attr_spell_success_note" title="Macro: repeating_spells_{$1}_spell_success_note. $1 = Row number OR the Row ID."></textarea>
+								<textarea name="attr_spell_success_note" title="Macro: @{NAME|repeating_spells_$[row #]_spell_success_note}"></textarea>
 							</div>
 							
 							<div class="note-input">
 								<div class="note-title"><span data-i18n="critical-success-note-label">Critical Success Note:</span></div>
-								<textarea name="attr_spell_critical_success_note" title="Macro: repeating_spells_{$1}_spell_critical_success_note. $1 = Row number OR the Row ID."></textarea>
+								<textarea name="attr_spell_critical_success_note" title="Macro: @{NAME|repeating_spells_$[row #]_spell_critical_success_note}"></textarea>
 							</div>
 							
 						</div>
@@ -13971,12 +13954,12 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 							
 							<div class="note-input">
 								<div class="note-title"><div data-i18n="fail-note-label">Fail Note:</div></div>
-								<textarea name="attr_spell_fail_note" title="Macro: repeating_spells_{$1}_spell_fail_note. $1 = Row number OR the Row ID."></textarea>
+								<textarea name="attr_spell_fail_note" title="Macro: @{NAME|repeating_spells_$[row #]_spell_fail_note}"></textarea>
 							</div>
 							
 							<div class="note-input">
 								<div class="note-title"><span data-i18n="critical-fail-note-label">Critical Fail Note:</span></div>
-								<textarea name="attr_spell_critical_fail_note" title="Macro: repeating_spells_{$1}_spell_critical_fail_note. $1 = Row number OR the Row ID."></textarea>
+								<textarea name="attr_spell_critical_fail_note" title="Macro: @{NAME|repeating_spells_$[row #]_spell_critical_fail_note}"></textarea>
 							</div>
 							
 						</div>
@@ -14009,29 +13992,6 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 				take advantage of these changes you will have to make some manual changes to your existing PCs.
 			</p>
 				
-			<p>
-				Under Traits:
-			</p>
-				
-			<ul>
-				<li>
-					Copy/Paste your current Perks that you have under Advantages and Quirks 
-					under Disadvantages, to their newly created Repeating Sections respectively.
-				</li>
-				<li>
-					Verify/Create or Copy/Paste your Racial Traits to its associate Repeating Section if you haven’t already.
-				</li>
-				<li>
-					Appearance has been moved to the Bio/Misc page. The drop down is still there 
-					BUT the points have been removed. You need to manually enter those points in 
-					the appropriate Traits Repeating Section.
-				</li>
-				<li>
-					Verify your Point Summary now under your chosen format of GCA4 or GCS. Those 
-					that do not use either application should use the format they like best.
-				</li>
-			</ul>
-			
 			<h3>Suggestions</h3>
 			
 			<ul>
@@ -14050,7 +14010,17 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 
 			<p>Pull Request: <span name="attr_latest_changes"></span></p>
 
-			<!-- current version notes: 2.9.0 -->
+			<!-- current version notes: 2.9.1 -->
+			
+			<ul>
+				<li>Updated all Macro Tooltips to use a standard, more useful naming convention.</li>
+				<li>templates are showing equipment also</li>
+			</ul>
+
+			<h4>Version: 2.9.0</h4>
+
+			<p>Pull Request: 10/12/2022</p>
+
 			<ul>
 				<li>Options -> Import subtab.
 					<ul>
@@ -14233,7 +14203,7 @@ Slam uses either DX, Brawling, or Sumo Wrestling. Note that the -4 to hit and ef
 			<p>Pull Request: 2/13/2022</p>
 
 			<ul>
-				<li>Updated the hover names for macro help to show the correct usage of the macro. Example change <i>Macro: @{hit_points_max}</i> or <i>Macro: @{NAME|hit_points_max}</i> </li>
+				<li>Updated the hover names for macro help to show the correct usage of the macro. Example change <i>Macro: @{hit_points|max}</i> or <i>Macro: @{NAME|hit_points|max}</i> </li>
 				<li>
 					Bio\Misc Tab. Apply Size Modifier checkbox. The apply modifier now works with Hit Points, Striking ST, and Lifting ST. 
 					Added some additional feedback by updating the tooltips for points per level and warning notes if you didn't spend the correct amount. 
@@ -15620,7 +15590,7 @@ Diffuse: Max 2HP (Exception: Area-effect, cone, and explosion attacks cause norm
 
 				<div class="instructions" style="width: 33%; float: left;">
 
-					<h3>Import Tool [DEPRACATED]</h3>
+					<h3>Import Tool [DEPRECATED]</h3>
 
 					<p>
 						Initial version is designed for a one time import. 
@@ -17413,9 +17383,9 @@ Diffuse: Max 2HP (Exception: Area-effect, cone, and explosion attacks cause norm
 	
 	const noop = function () { }; // do nothing callback function.
 	
-	const version = "2.9.0";
+	const version = "2.9.1";
 	
-	const latestChangesDate = "10/12/2022";
+	const latestChangesDate = "11/3/2022";
 	
 	let modCascade = true;