From 451e8805fa6ec9c8d3af04ca6efa0bd958a48947 Mon Sep 17 00:00:00 2001
From: Chris B <chriswb71@gmail.com>
Date: Mon, 22 Aug 2016 09:31:54 -0400
Subject: [PATCH] html fixes, macro fixes, .64

---
 Pathfinder-Neceros/pathfinder-neceros.css  |  29 ++-
 Pathfinder-Neceros/pathfinder-neceros.html | 199 +++++++++++++--------
 2 files changed, 147 insertions(+), 81 deletions(-)

diff --git a/Pathfinder-Neceros/pathfinder-neceros.css b/Pathfinder-Neceros/pathfinder-neceros.css
index 7a71f4e433..2f9a5f4d61 100644
--- a/Pathfinder-Neceros/pathfinder-neceros.css
+++ b/Pathfinder-Neceros/pathfinder-neceros.css
@@ -492,11 +492,11 @@ input.sheet-tabinput {
 	margin-right:-14%;
 }
 .sheet-tab.sheet-tab99 {
-	width:10% !important;
+	width:10%;
 }
 .sheet-tabinput.sheet-tab99 {
-	width:10% !important;
-	margin-right:-10% !important;
+	width:10%;
+	margin-right:-10%;
 }
 
 
@@ -1050,7 +1050,7 @@ button[type="roll"].sheet-blank-roll-button::before {
 }
 
 .sheet-status-panel label b {
-	padding-left:.125em;
+	padding:0 0 0 .25em;
 }
 
 /* when a highlighted field is not showing error, put hidden 2px border so size doesn't change */
@@ -1603,6 +1603,9 @@ input[type="number"].sheet-entry-wide {
 .sheet-mythic-show:not(:checked) ~ div .sheet-section-mythic,
 .sheet-psionic-show:not(:checked) ~ .sheet-section-psionic,
 .sheet-psionic-show:not(:checked) ~ div .sheet-section-psionic,
+
+/********************************************** Skills ***************************************************************************/
+
 /* skills fill-in sections */
 .sheet-artistry-show:not(:checked)~.sheet-artistry,
 .sheet-craft-show:not(:checked)~.sheet-craft,
@@ -1675,7 +1678,7 @@ input[type="number"].sheet-entry-wide {
 	caption-side:top;
 	width:100%;
 	font-size: 1.1em;
-	padding:2px;
+
 	overflow:hidden;
 	vertical-align:bottom;
 	font-weight:bold;
@@ -1687,6 +1690,13 @@ input[type="number"].sheet-entry-wide {
 .sheet-rolltemplate-pf_block .sheet-roll-header a {
 	text-decoration: underline;
 }
+.sheet-rolltemplate-pf_generic .sheet-roll-header span.sheet-left,
+.sheet-rolltemplate-pf_defense .sheet-roll-header span.sheet-left,
+.sheet-rolltemplate-pf_attack .sheet-roll-header span.sheet-left,
+.sheet-rolltemplate-pf_spell .sheet-roll-header span.sheet-left,
+.sheet-rolltemplate-pf_block .sheet-roll-header span.sheet-left {
+	padding-left: 2px;
+}
 
 
 .sheet-rolltemplate-pf_generic div.sheet-roll-accessible,
@@ -1715,8 +1725,10 @@ input[type="number"].sheet-entry-wide {
 	font-variant:small-caps;
 	display:block;
 	width:100%;
-	clear:both;
-	margin: 2px 0 1px 0;
+	padding: 2px 0 0 2px;
+	word-break: break-word;
+
+
 }
 
 
@@ -1825,7 +1837,7 @@ input[type="number"].sheet-entry-wide {
 	/*border-bottom:1pt #999999 solid;*/
 	display:block;
 	border:none;
-	padding:0px;
+	padding:0 0 0 2px;
 }
 
 .sheet-rolltemplate-pf_generic .sheet-roll-accessible .sheet-subtitle,
@@ -1834,6 +1846,7 @@ input[type="number"].sheet-entry-wide {
 .sheet-rolltemplate-pf_spell .sheet-roll-accessible .sheet-subtitle,
 .sheet-rolltemplate-pf_block .sheet-roll-accessible .sheet-subtitle {
 	font-size:1.2em;
+	padding:0 0 0 2px;
 	/*border-bottom:1pt #CCCCCC solid;*/
 }
 
diff --git a/Pathfinder-Neceros/pathfinder-neceros.html b/Pathfinder-Neceros/pathfinder-neceros.html
index db6dfa881b..e8aaa0d660 100644
--- a/Pathfinder-Neceros/pathfinder-neceros.html
+++ b/Pathfinder-Neceros/pathfinder-neceros.html
@@ -1574,7 +1574,7 @@
 						<option value="3" data-i18n="none">None</option>
 					</select>
 				</span>
-				<span class="sheet-table-row-name" style="whitespace:nowrap;width:auto;">
+				<span class="sheet-table-row-name" style="white-space:nowrap;width:auto;">
 					<button class="sheet-text-button sheet-btn sheet-ui-draggable btn ui-draggable" type="roll" title="%{selected|Spell-Fail-Check}" name="roll_Spell-Fail-Check" style="vertical-align: text-bottom;width: auto; text-align: center;" value="@{PC-whisper} &amp;{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag} {{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Spell Failure}} {{Spell Fail Chance=[[ @{spell-fail} ]]&nbsp;%&nbsp;}} {{Check=[[ 1d100cf<[[ @{spell-fail} ]]cs>[[ @{spell-fail}+1 ]] ]]&nbsp;%&nbsp;}} {{lefttext_6=@{SpellFailureNote}}}">&nbsp;<span data-i18n="spell-failure">Spell Fail</span></button>
 				</span>
 				<span class="sheet-table-cell"><input title="@{spell-fail}" type="number" name="attr_spell-fail" value="0" class="sheet-calc sheet-entry-wide" readonly="readonly"></span>
@@ -2457,7 +2457,7 @@
 										<input type="number" name="attr_iterative_attack3_value" title="@{repeating_weapon_$X_iterative_attack3_value}" value="-10" max="0" />
 									</span>
 									<span class="sheet-table-cell">
-										<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack3_macro" title="@{repeating_weapon_$X_var_iterative_attack3_macro}">{{attack3=[[ 1d20cs>[[ @{crit-target} ]] + @{attack_macro} + [[ @{iterative_attack3_value} ]] [iterative] ]]}} {{damage3=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm3=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack3_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage3=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[@{crit-multiplier} - 1]]) ]]}} {{precision_dmg31=@{precision_dmg_macro}}} {{precision_dmg32=@{global_precision_dmg_macro}}} {{critical_dmg31=@{critical_dmg_macro}}} {{critical_dmg32=@{global_critical_dmg_macro}}} {{attack3name=@{iterative_attack3_name}}}</textarea>
+										<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack3_macro" title="@{repeating_weapon_$X_var_iterative_attack3_macro}">{{attack3=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{attack_macro} + @{iterative_attack3_value} ]] [iterative] ]]}} {{damage3=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm3=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack3_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage3=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[ @{crit-multiplier} - 1]]) ]]}} {{precision_dmg31=@{precision_dmg_macro}}} {{precision_dmg32=@{global_precision_dmg_macro}}} {{critical_dmg31=@{critical_dmg_macro}}} {{critical_dmg32=@{global_critical_dmg_macro}}} {{attack3name=@{iterative_attack3_name}}}</textarea>
 									</span>
 								</div>
 								<div class="sheet-table-row">
@@ -2474,7 +2474,7 @@
 										<input type="number" name="attr_iterative_attack4_value" title="@{repeating_weapon_$X_iterative_attack4_value}" value="-15" max="0" />
 									</span>
 									<span class="sheet-table-cell">
-										<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack4_macro" title="@{repeating_weapon_$X_var_iterative_attack4_macro}">{{attack4=[[ 1d20cs>[[ @{crit-target} ]] + @{attack_macro} + [[ @{iterative_attack4_value} ]] [iterative] ]]}} {{damage4=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm4=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack4_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage4=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[@{crit-multiplier} - 1]]) ]]}} {{precision_dmg41=@{precision_dmg_macro}}} {{precision_dmg42=@{global_precision_dmg_macro}}} {{critical_dmg41=@{critical_dmg_macro}}} {{critical_dmg42=@{global_critical_dmg_macro}}} {{attack4name=@{iterative_attack4_name}}}</textarea>
+										<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack4_macro" title="@{repeating_weapon_$X_var_iterative_attack4_macro}">{{attack4=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{attack_macro} + @{iterative_attack4_value} ]] [iterative] ]]}} {{damage4=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm4=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack4_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage4=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[ @{crit-multiplier} - 1 ]]) ]]}} {{precision_dmg41=@{precision_dmg_macro}}} {{precision_dmg42=@{global_precision_dmg_macro}}} {{critical_dmg41=@{critical_dmg_macro}}} {{critical_dmg42=@{global_critical_dmg_macro}}} {{attack4name=@{iterative_attack4_name}}}</textarea>
 									</span>
 								</div>
 								<div class="sheet-table-row">
@@ -2491,7 +2491,7 @@
 										<input type="number" name="attr_iterative_attack5_value" title="@{repeating_weapon_$X_iterative_attack5_value}" value="-20" max="0" />
 									</span>
 									<span class="sheet-table-cell">
-										<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack5_macro" title="@{repeating_weapon_$X_var_iterative_attack5_macro}">{{attack5=[[ 1d20cs>[[ @{crit-target} ]] + @{attack_macro} + [[ @{iterative_attack5_value} ]] [iterative] ]]}} {{damage5=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm5=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack5_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage5=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[@{crit-multiplier} - 1]]) ]]}} {{precision_dmg51=@{precision_dmg_macro}}} {{precision_dmg52=@{global_precision_dmg_macro}}} {{critical_dmg51=@{critical_dmg_macro}}} {{critical_dmg52=@{global_critical_dmg_macro}}} {{attack5name=@{iterative_attack5_name}}}</textarea>
+										<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack5_macro" title="@{repeating_weapon_$X_var_iterative_attack5_macro}">{{attack5=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{attack_macro} + @{iterative_attack5_value} ]] [iterative] ]]}} {{damage5=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm5=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack5_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage5=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[ @{crit-multiplier} - 1 ]]) ]]}} {{precision_dmg51=@{precision_dmg_macro}}} {{precision_dmg52=@{global_precision_dmg_macro}}} {{critical_dmg51=@{critical_dmg_macro}}} {{critical_dmg52=@{global_critical_dmg_macro}}} {{attack5name=@{iterative_attack5_name}}}</textarea>
 									</span>
 								</div>
 								<div class="sheet-table-row">
@@ -2508,7 +2508,7 @@
 										<input type="number" name="attr_iterative_attack6_value" title="@{repeating_weapon_$X_iterative_attack6_value}" value="-25" max="0" />
 									</span>
 									<span class="sheet-table-cell">
-										<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack6_macro" title="@{repeating_weapon_$X_var_iterative_attack6_macro}">{{attack6=[[ 1d20cs>[[ @{crit-target} ]] + @{attack_macro} + [[ @{iterative_attack6_value} ]] [iterative] ]]}} {{damage6=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm6=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack6_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage6=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[@{crit-multiplier} - 1]]) ]]}} {{precision_dmg61=@{precision_dmg_macro}}} {{precision_dmg62=@{global_precision_dmg_macro}}} {{critical_dmg61=@{critical_dmg_macro}}} {{critical_dmg62=@{global_critical_dmg_macro}}} {{attack6name=@{iterative_attack6_name}}}</textarea>
+										<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack6_macro" title="@{repeating_weapon_$X_var_iterative_attack6_macro}">{{attack6=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{attack_macro} + @{iterative_attack6_value} ]] [iterative] ]]}} {{damage6=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm6=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack6_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage6=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[ @{crit-multiplier} - 1 ]]) ]]}} {{precision_dmg61=@{precision_dmg_macro}}} {{precision_dmg62=@{global_precision_dmg_macro}}} {{critical_dmg61=@{critical_dmg_macro}}} {{critical_dmg62=@{global_critical_dmg_macro}}} {{attack6name=@{iterative_attack6_name}}}</textarea>
 									</span>
 								</div>
 								<div class="sheet-table-row">
@@ -2525,7 +2525,7 @@
 										<input type="number" name="attr_iterative_attack7_value" title="@{repeating_weapon_$X_iterative_attack7_value}" value="-30" max="0" />
 									</span>
 									<span class="sheet-table-cell">
-										<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack7_macro" title="@{repeating_weapon_$X_var_iterative_attack7_macro}">{{attack7=[[ 1d20cs>[[ @{crit-target} ]] + @{attack_macro} + [[ @{iterative_attack7_value} ]] [iterative] ]]}} {{damage7=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm7=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack7_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage7=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[@{crit-multiplier} - 1]]) ]]}} {{precision_dmg71=@{precision_dmg_macro}}} {{precision_dmg72=@{global_precision_dmg_macro}}} {{critical_dmg71=@{critical_dmg_macro}}} {{critical_dmg72=@{global_critical_dmg_macro}}} {{attack7name=@{iterative_attack7_name}}}</textarea>
+										<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack7_macro" title="@{repeating_weapon_$X_var_iterative_attack7_macro}">{{attack7=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{attack_macro} + @{iterative_attack7_value} ]] [iterative] ]]}} {{damage7=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm7=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack7_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage7=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[ @{crit-multiplier} - 1 ]]) ]]}} {{precision_dmg71=@{precision_dmg_macro}}} {{precision_dmg72=@{global_precision_dmg_macro}}} {{critical_dmg71=@{critical_dmg_macro}}} {{critical_dmg72=@{global_critical_dmg_macro}}} {{attack7name=@{iterative_attack7_name}}}</textarea>
 									</span>
 								</div>
 								<div class="sheet-table-row">
@@ -2542,7 +2542,7 @@
 										<input type="number" name="attr_iterative_attack8_value" title="@{repeating_weapon_$X_iterative_attack8_value}" value="-35" max="0" />
 									</span>
 									<span class="sheet-table-cell">
-										<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack8_macro" title="@{repeating_weapon_$X_var_iterative_attack8_macro}">{{attack8=[[ 1d20cs>[[ @{crit-target} ]] + @{attack_macro} + [[ @{iterative_attack8_value} ]] [iterative] ]]}} {{damage8=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm8=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack8_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage8=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[@{crit-multiplier} - 1]]) ]]}} {{precision_dmg81=@{precision_dmg_macro}}} {{precision_dmg82=@{global_precision_dmg_macro}}} {{critical_dmg81=@{critical_dmg_macro}}} {{critical_dmg82=@{global_critical_dmg_macro}}} {{attack8name=@{iterative_attack8_name}}}</textarea>
+										<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack8_macro" title="@{repeating_weapon_$X_var_iterative_attack8_macro}">{{attack8=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{attack_macro} + @{iterative_attack8_value} ]] [iterative] ]]}} {{damage8=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm8=[[ 1d20 + [[ @{attack_macro} + @{iterative_attack8_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage8=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[ @{crit-multiplier} - 1 ]]) ]]}} {{precision_dmg81=@{precision_dmg_macro}}} {{precision_dmg82=@{global_precision_dmg_macro}}} {{critical_dmg81=@{critical_dmg_macro}}} {{critical_dmg82=@{global_critical_dmg_macro}}} {{attack8name=@{iterative_attack8_name}}}</textarea>
 									</span>
 								</div>
 							</div>
@@ -2578,7 +2578,7 @@
 		<input class="sheet-showarrow sheet-h2arrow" type="checkbox" name="attr_skill-ranks-show"  data-i18n-aria-label="skill-rank-totals" title="Click to expand" data-i18n-title="showsect-cmd" value="1" checked="checked"/>
 		<h2 class="sheet-clickheader sheet-showsect"><label title="Click to expand" data-i18n-title="showsect-cmd" data-i18n="skill-rank-totals">Skill Rank Totals</label></h2>
 		<div class="sheet-h2-section sheet-table sheet-skill-totals">
-			<input type="checkbox" class="sheet-bg-show" name="attr_BG-Skill-Use" value="1" role="presentation"/>
+			<input type="checkbox" class="sheet-bg-show" name="attr_BG-Skill-Use" value="1" role="presentation" checked="checked" />
 			<input type="checkbox" class="sheet-unchained-show" name="attr_unchained_skills-show" value="1" role="presentation"/>
 			<span class="sheet-table-name" data-i18n="skill-ranks">Skill Ranks</span>
 			<div class="sheet-table-group-head"><div class="sheet-table-row">
@@ -2695,6 +2695,7 @@
 			<label role="menuitem" class="sheet-core-only sheet-tab sheet-tab99"   data-i18n-title="skills" title="Skills" data-i18n="skills">Skills</label>
 			<label role="menuitem" class="sheet-bg-only sheet-tab sheet-tab99"   data-i18n-title="all-skills" title="All Skills" data-i18n="all">All</label>
 
+
 			<span class="sheet-nontable-name">&nbsp;</span>
 			<div class="sheet-table sheet-skills sheet-medium-numbers">
 				<div class="sheet-table-row">
@@ -6248,7 +6249,9 @@
 					<span class="sheet-table-cell"><textarea class="sheet-skill-macro-text" title="@{CS-Survival-macro}" name="attr_CS-Survival-macro">@{PC-whisper} &{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}}  {{subtitle}} {{name=Survival}} {{Check=[[ @{skill-query} + [[ @{CS-Survival} ]] ]]}}</textarea></span>
 				</div>
 			</div>
-			<div class="sheet-table sheet-center"><b><span data-i18n="class-skill-abbrv">CS</span></b> = <span data-i18n="class-skill">Class Skill</span> | <b><span data-i18n="requires-training-abbrv">RT</span></b> = <span data-i18n="requires-training">Requires Training</span> | <b><span data-i18n="class skill-bonus|armor-check-penalty|size-mod|condition-penalty-abbrv">Cl/Ac/Sz/Co</span></b> = <span data-i18n="class skill-bonus|armor-check-penalty|size-mod|condition-penalty">Class Skill Bonus / Armor check penalty / Size mod / Condition penalty</span></div>
+			<div class="sheet-table sheet-center"><b><span data-i18n="class-skill-abbrv">CS</span></b> = <span data-i18n="class-skill">Class Skill</span><br>
+			<b><span data-i18n="requires-training-abbrv">RT</span></b> = <span data-i18n="requires-training">Requires Training</span><br>
+			<b><span data-i18n="class skill-bonus|armor-check-penalty|size-mod|condition-penalty-abbrv">Cl/Ac/Sz/Co</span></b> = <span data-i18n="class skill-bonus|armor-check-penalty|size-mod|condition-penalty">Class Skill Bonus / Armor check penalty / Size mod / Condition penalty</span></div>
 		</div>
 
 		<div class="sheet-cheat"></div>
@@ -6302,7 +6305,7 @@
 				<span class="sheet-table-header" style="width:5%;" title="The weight of the item" data-i18n-title="worn-equipment-weight-title" data-i18n="weight-abbrv">Wt</span>
 				<span class="sheet-table-header" style="width:5%;" title="The hardness of the item that helps prevent it from taking hit point damage" data-i18n-title="worn-equipment-hardness-title" data-i18n="hardness-abbrv">Hard</span>
 				<span class="sheet-table-header" style="width:5%;" title="The current hit points of the item" data-i18n-title="worn-equipment-hp-title" data-i18n="item-hit-points-abbrv">HP</span>
-				<span class="sheet-table-header sheet-divider-lg">/</span>
+				<span class="sheet-table-header sheet-divider-lg"><br>/</span>
 				<span class="sheet-table-header" style="width:5%; min-width:4em;" title="The maximum possible hit points of the item" data-i18n-title="worn-equipment-hp-max-title" data-i18n="maximum-abbrv">Max</span>
 				<span class="sheet-table-header" style="width:5%;" title="The value of the item measured in gold pieces" data-i18n-title="worn-equipment-value-title" data-i18n="value">Value</span>
 			</div>
@@ -7824,7 +7827,7 @@
 							</label>
 							<label class="sheet-small-label2 sheet-entry-12p-shrink sheet-sect">
 								<input type="text" value="" name="attr_range" title="@{range}" placeholder="Flat # or # /level" data-i18n-placeholder="range-custom-place" />
-								<span style="whitespace:nowrap;" data-i18n="range-custom">Custom Range</span>
+								<span style="white-space:nowrap;" data-i18n="range-custom">Custom Range</span>
 							</label>
 							<label class="sheet-small-label2 sheet-sect sheet-number">
 								<input title="@{repeating_spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly">
@@ -7885,10 +7888,10 @@
 		<h1 data-i18n="npc" class="sheet-offscreen">NPC</h1>
 		<div class="sheet-compendium-drop-target">
 			<div class="sheet-nontable-name" style="display: table;padding-left: 0;margin-bottom: 0;line-height: 1em;margin-top: 0;">
-				<span class="sheet-table-cell" style="width: 60%;text-align: left;"><input type="text" title="character_name" name="attr_character_name" style="background-color: black ; color: white ; font-weight: bold" accept="Name"></span>
-				<span class="sheet-table-cell sheet-right"><b data-i18n="is-npc-check-caps">IS NPC</b><b>:</b></span>
-				<span class="sheet-table-cell">
-					<input type="checkbox" title="@{is-npc}" name="attr_is_npc" value="1" style="background-color: black ; color: white ; font-weight: bold ; vertical-align: text-top">
+				<span class="sheet-table-cell" style="width:100%; text-align:left;"><input type="text" title="character_name" name="attr_character_name" style="background-color: black ; color: white ; font-weight: bold" accept="Name"></span>
+				<span class="sheet-table-cell sheet-right" style="white-space:nowrap;"><b data-i18n="is-npc-check-caps">IS NPC</b><b>:</b></span>
+				<span class="sheet-table-cell" style="padding-right:2em;">
+					<input type="checkbox" title="@{is-npc}" name="attr_is_npc" value="1" style="background-color:black; color:white; font-weight:bold; vertical-align:text-top;">
 				</span>
 				<span class="sheet-table-cell sheet-right" style=""><b data-i18n="challenge-rating-abbrv">CR</b></span>
 				<span class="sheet-table-cell" style=""><input type="text" title="@{npc-cr}" name="attr_npc-cr" style="background-color: black;color: white;font-weight: bold;vertical-align: text-top;"></span>
@@ -8034,7 +8037,7 @@
 				</div>
 				<div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-cell sheet-small-label"><button style="font-size:100%;" title="%{selected|NPC-Fort-Save}" type="roll" name="roll_NPC-Fort-Save" value="@{NPC-whisper} &{template:pf_defense} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_defense}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Fortitude}} {{Save=[[ 1d20 + [[ @{Fort} ]] ]]}} @{save_options}}}" data-i18n="fortitude-abbrv">Fort</button></span>
+						<span class="sheet-table-cell sheet-small-label"><button style="font-size:100%;" title="%{selected|NPC-Fort-Save}" type="roll" name="roll_NPC-Fort-Save" value="@{NPC-whisper} &{template:pf_defense} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_defense}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Fortitude}} {{Save=[[ 1d20 + [[ @{Fort} ]] ]]}} @{save_options}}}">&nbsp;<span data-i18n="fortitude-abbrv">Fort</span></button></span>
 						<span class="sheet-table-cell sheet-small-label"><input title="@{Fort}" type="number" name="attr_Fort" value="0" class="sheet-calc" readonly="readonly" /><br><span data-i18n="total">Total</span></span>
 						<span class="sheet-table-cell sheet-small-label">
 						<input type="hidden" name="attr_fort_compendium" accept="Fort" />
@@ -8042,14 +8045,14 @@
 						<span class="sheet-divider-lg">+<br>&nbsp;</span>
 						<span class="sheet-table-cell sheet-small-label"><input title="@{buff_Fort-total}" name="attr_buff_Fort-total" type="number" value="0"  class="sheet-calc" readonly="readonly" /><br><span data-i18n="buff">Buff</span></span>
 						<span class="sheet-divider-lg">;<br>&nbsp;</span>
-						<span class="sheet-table-cell sheet-small-label"><button style="font-size:100%;" title="%{selected|NPC-Ref-Save}" type="roll" name="roll_NPC-Ref-Save" value="@{NPC-whisper} &{template:pf_defense} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_defense}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Reflex}} {{Save=[[ 1d20 + [[ @{Ref} ]] ]]}} @{save_options}}}" data-i18n="reflex-abbrv">Ref</button></span>
+						<span class="sheet-table-cell sheet-small-label"><button style="font-size:100%;" title="%{selected|NPC-Ref-Save}" type="roll" name="roll_NPC-Ref-Save" value="@{NPC-whisper} &{template:pf_defense} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_defense}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Reflex}} {{Save=[[ 1d20 + [[ @{Ref} ]] ]]}} @{save_options}}}">&nbsp;<span data-i18n="reflex-abbrv">Ref</span></button></span>
 						<span class="sheet-table-cell sheet-small-label"><input title="@{Ref}" type="number" name="attr_Ref" value="0" class="sheet-calc" readonly="readonly" /><br><span data-i18n="total">Total</span></span>
 						<input type="hidden" name="attr_ref_compendium" accept="Ref" />
 						<span class="sheet-table-cell sheet-small-label"><input title="@{Ref-misc}" type="number" name="attr_Ref-misc" value="0" /><br><span data-i18n="miscellaneous-abbrv">Misc</span></span>
 						<span class="sheet-divider-lg">+<br>&nbsp;</span>
 						<span class="sheet-table-cell sheet-small-label"><input title="@{buff_Ref-total}" name="attr_buff_Ref-total" type="number" value="0" class="sheet-calc" readonly="readonly" /><br><span data-i18n="buff">Buff</span></span>
 						<span class="sheet-divider-lg">;<br>&nbsp;</span>
-						<span class="sheet-table-cell sheet-small-label"><button style="font-size:100%;" title="%{selected|NPC-Will-Save}" type="roll" name="roll_NPC-Will-Save" value="@{NPC-whisper} &{template:pf_defense} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_defense}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Will}} {{Save=[[ 1d20 + [[ @{Will} ]] ]]}} @{save_options}}}" data-i18n="willpower-abbrv">Will</button></span>
+						<span class="sheet-table-cell sheet-small-label"><button style="font-size:100%;" title="%{selected|NPC-Will-Save}" type="roll" name="roll_NPC-Will-Save" value="@{NPC-whisper} &{template:pf_defense} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_defense}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Will}} {{Save=[[ 1d20 + [[ @{Will} ]] ]]}} @{save_options}}}">&nbsp;<span data-i18n="willpower-abbrv">Will</span></button></span>
 						<span class="sheet-table-cell sheet-small-label"><input title="@{Will}" type="number" name="attr_Will" value="0" class="sheet-calc" readonly="readonly" /><br><span data-i18n="total">Total</span></span>
 						<input type="hidden" name="attr_will_compendium" accept="Will" />
 						<span class="sheet-table-cell sheet-small-label"><input title="@{Will-misc}" type="number" name="attr_Will-misc" value="0" /><br><span data-i18n="miscellaneous-abbrv">Misc</span></span>
@@ -8328,7 +8331,7 @@
 												<input type="number" name="attr_iterative_attack2_value" title="@{repeating_weapon_$X_iterative_attack2_value}" value="-5" max="0" />
 											</span>
 											<span class="sheet-table-cell">
-												<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack2_macro" title="@{repeating_weapon_$X_var_iterative_attack2_macro}">{{attack2=[[ 1d20cs>[[ @{crit-target} ]] + @{attack_macro} + [[ @{iterative_attack2_value} ]] [iterative] ]]}} {{damage2=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm2=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack2_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage2=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[@{crit-multiplier} - 1]]) ]]}} {{precision_dmg21=@{precision_dmg_macro}}} {{precision_dmg22=@{global_precision_dmg_macro}}} {{critical_dmg21=@{critical_dmg_macro}}} {{critical_dmg22=@{global_critical_dmg_macro}}} {{attack2name=@{iterative_attack2_name}}}</textarea>
+												<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack2_macro" title="@{repeating_weapon_$X_var_iterative_attack2_macro}">{{attack2=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{attack_macro} + @{iterative_attack2_value} ]] [iterative] ]]}} {{damage2=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm2=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack2_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage2=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[@{crit-multiplier} - 1]]) ]]}} {{precision_dmg21=@{precision_dmg_macro}}} {{precision_dmg22=@{global_precision_dmg_macro}}} {{critical_dmg21=@{critical_dmg_macro}}} {{critical_dmg22=@{global_critical_dmg_macro}}} {{attack2name=@{iterative_attack2_name}}}</textarea>
 											</span>
 										</div>
 										<div class="sheet-table-row">
@@ -8345,7 +8348,7 @@
 												<input type="number" name="attr_iterative_attack3_value" title="@{repeating_weapon_$X_iterative_attack3_value}" value="-10" max="0" />
 											</span>
 											<span class="sheet-table-cell">
-												<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack3_macro" title="@{repeating_weapon_$X_var_iterative_attack3_macro}">{{attack3=[[ 1d20cs>[[ @{crit-target} ]] + @{attack_macro} + [[ @{iterative_attack3_value} ]] [iterative] ]]}} {{damage3=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm3=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack3_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage3=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[@{crit-multiplier} - 1]]) ]]}} {{precision_dmg31=@{precision_dmg_macro}}} {{precision_dmg32=@{global_precision_dmg_macro}}} {{critical_dmg31=@{critical_dmg_macro}}} {{critical_dmg32=@{global_critical_dmg_macro}}} {{attack3name=@{iterative_attack3_name}}}</textarea>
+												<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack3_macro" title="@{repeating_weapon_$X_var_iterative_attack3_macro}">{{attack3=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{attack_macro} + @{iterative_attack3_value} ]] [iterative] ]]}} {{damage3=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm3=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack3_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage3=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[ @{crit-multiplier} - 1]]) ]]}} {{precision_dmg31=@{precision_dmg_macro}}} {{precision_dmg32=@{global_precision_dmg_macro}}} {{critical_dmg31=@{critical_dmg_macro}}} {{critical_dmg32=@{global_critical_dmg_macro}}} {{attack3name=@{iterative_attack3_name}}}</textarea>
 											</span>
 										</div>
 										<div class="sheet-table-row">
@@ -8362,7 +8365,7 @@
 												<input type="number" name="attr_iterative_attack4_value" title="@{repeating_weapon_$X_iterative_attack4_value}" value="-15" max="0" />
 											</span>
 											<span class="sheet-table-cell">
-												<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack4_macro" title="@{repeating_weapon_$X_var_iterative_attack4_macro}">{{attack4=[[ 1d20cs>[[ @{crit-target} ]] + @{attack_macro} + [[ @{iterative_attack4_value} ]] [iterative] ]]}} {{damage4=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm4=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack4_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage4=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[@{crit-multiplier} - 1]]) ]]}} {{precision_dmg41=@{precision_dmg_macro}}} {{precision_dmg42=@{global_precision_dmg_macro}}} {{critical_dmg41=@{critical_dmg_macro}}} {{critical_dmg42=@{global_critical_dmg_macro}}} {{attack4name=@{iterative_attack4_name}}}</textarea>
+												<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack4_macro" title="@{repeating_weapon_$X_var_iterative_attack4_macro}">{{attack4=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{attack_macro} + @{iterative_attack4_value} ]] [iterative] ]]}} {{damage4=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm4=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack4_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage4=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[ @{crit-multiplier} - 1 ]]) ]]}} {{precision_dmg41=@{precision_dmg_macro}}} {{precision_dmg42=@{global_precision_dmg_macro}}} {{critical_dmg41=@{critical_dmg_macro}}} {{critical_dmg42=@{global_critical_dmg_macro}}} {{attack4name=@{iterative_attack4_name}}}</textarea>
 											</span>
 										</div>
 										<div class="sheet-table-row">
@@ -8379,7 +8382,7 @@
 												<input type="number" name="attr_iterative_attack5_value" title="@{repeating_weapon_$X_iterative_attack5_value}" value="-20" max="0" />
 											</span>
 											<span class="sheet-table-cell">
-												<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack5_macro" title="@{repeating_weapon_$X_var_iterative_attack5_macro}">{{attack5=[[ 1d20cs>[[ @{crit-target} ]] + @{attack_macro} + [[ @{iterative_attack5_value} ]] [iterative] ]]}} {{damage5=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm5=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack5_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage5=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[@{crit-multiplier} - 1]]) ]]}} {{precision_dmg51=@{precision_dmg_macro}}} {{precision_dmg52=@{global_precision_dmg_macro}}} {{critical_dmg51=@{critical_dmg_macro}}} {{critical_dmg52=@{global_critical_dmg_macro}}} {{attack5name=@{iterative_attack5_name}}}</textarea>
+												<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack5_macro" title="@{repeating_weapon_$X_var_iterative_attack5_macro}">{{attack5=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{attack_macro} + @{iterative_attack5_value} ]] [iterative] ]]}} {{damage5=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm5=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack5_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage5=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[ @{crit-multiplier} - 1 ]]) ]]}} {{precision_dmg51=@{precision_dmg_macro}}} {{precision_dmg52=@{global_precision_dmg_macro}}} {{critical_dmg51=@{critical_dmg_macro}}} {{critical_dmg52=@{global_critical_dmg_macro}}} {{attack5name=@{iterative_attack5_name}}}</textarea>
 											</span>
 										</div>
 										<div class="sheet-table-row">
@@ -8396,7 +8399,7 @@
 												<input type="number" name="attr_iterative_attack6_value" title="@{repeating_weapon_$X_iterative_attack6_value}" value="-25" max="0" />
 											</span>
 											<span class="sheet-table-cell">
-												<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack6_macro" title="@{repeating_weapon_$X_var_iterative_attack6_macro}">{{attack6=[[ 1d20cs>[[ @{crit-target} ]] + @{attack_macro} + [[ @{iterative_attack6_value}]] [iterative] ]]}} {{damage6=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm6=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack6_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage6=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[@{crit-multiplier} - 1]]) ]]}} {{precision_dmg61=@{precision_dmg_macro}}} {{precision_dmg62=@{global_precision_dmg_macro}}} {{critical_dmg61=@{critical_dmg_macro}}} {{critical_dmg62=@{global_critical_dmg_macro}}} {{attack6name=@{iterative_attack6_name}}}</textarea>
+												<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack6_macro" title="@{repeating_weapon_$X_var_iterative_attack6_macro}">{{attack6=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{attack_macro} + @{iterative_attack6_value} ]] [iterative] ]]}} {{damage6=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm6=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack6_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage6=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[ @{crit-multiplier} - 1 ]]) ]]}} {{precision_dmg61=@{precision_dmg_macro}}} {{precision_dmg62=@{global_precision_dmg_macro}}} {{critical_dmg61=@{critical_dmg_macro}}} {{critical_dmg62=@{global_critical_dmg_macro}}} {{attack6name=@{iterative_attack6_name}}}</textarea>
 											</span>
 										</div>
 										<div class="sheet-table-row">
@@ -8413,7 +8416,7 @@
 												<input type="number" name="attr_iterative_attack7_value" title="@{repeating_weapon_$X_iterative_attack7_value}" value="-30" max="0" />
 											</span>
 											<span class="sheet-table-cell">
-												<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack7_macro" title="@{repeating_weapon_$X_var_iterative_attack7_macro}">{{attack7=[[ 1d20cs>[[ @{crit-target} ]] + @{attack_macro} + [[ @{iterative_attack7_value} ]] [iterative] ]]}} {{damage7=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm7=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack7_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage7=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[@{crit-multiplier} - 1]]) ]]}} {{precision_dmg71=@{precision_dmg_macro}}} {{precision_dmg72=@{global_precision_dmg_macro}}} {{critical_dmg71=@{critical_dmg_macro}}} {{critical_dmg72=@{global_critical_dmg_macro}}} {{attack7name=@{iterative_attack7_name}}}</textarea>
+												<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack7_macro" title="@{repeating_weapon_$X_var_iterative_attack7_macro}">{{attack7=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{attack_macro} + @{iterative_attack7_value} ]] [iterative] ]]}} {{damage7=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm7=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack7_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage7=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[ @{crit-multiplier} - 1 ]]) ]]}} {{precision_dmg71=@{precision_dmg_macro}}} {{precision_dmg72=@{global_precision_dmg_macro}}} {{critical_dmg71=@{critical_dmg_macro}}} {{critical_dmg72=@{global_critical_dmg_macro}}} {{attack7name=@{iterative_attack7_name}}}</textarea>
 											</span>
 										</div>
 										<div class="sheet-table-row">
@@ -8430,7 +8433,7 @@
 												<input type="number" name="attr_iterative_attack8_value" title="@{repeating_weapon_$X_iterative_attack8_value}" value="-35" max="0" />
 											</span>
 											<span class="sheet-table-cell">
-												<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack8_macro" title="@{repeating_weapon_$X_var_iterative_attack8_macro}">{{attack8=[[ 1d20cs>[[ @{crit-target} ]] + @{attack_macro} + [[ @{iterative_attack8_value} ]] [iterative] ]]}} {{damage8=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm8=[[ 1d20 + @{attack_macro} + [[ @{iterative_attack8_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage8=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[@{crit-multiplier} - 1]]) ]]}} {{precision_dmg81=@{precision_dmg_macro}}} {{precision_dmg82=@{global_precision_dmg_macro}}} {{critical_dmg81=@{critical_dmg_macro}}} {{critical_dmg82=@{global_critical_dmg_macro}}} {{attack8name=@{iterative_attack8_name}}}</textarea>
+												<textarea class="sheet-inline-textarea" data-i18n-placeholder="full-macro-place" name="attr_var_iterative_attack8_macro" title="@{repeating_weapon_$X_var_iterative_attack8_macro}">{{attack8=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{attack_macro} + @{iterative_attack8_value} ]] [iterative] ]]}} {{damage8=[[ @{damage-dice-num}d@{damage-die} + @{damage_macro} ]]}} {{crit_confirm8=[[ 1d20 + [[ @{attack_macro} + @{iterative_attack8_value} ]] [iterative] + [[ @{crit_conf_mod} ]] ]]}} {{crit_damage8=[[ [[ @{damage-dice-num} * [[@{crit-multiplier} - 1]] ]]d@{damage-die} + ((@{damage_macro}) * [[ @{crit-multiplier} - 1 ]]) ]]}} {{precision_dmg81=@{precision_dmg_macro}}} {{precision_dmg82=@{global_precision_dmg_macro}}} {{critical_dmg81=@{critical_dmg_macro}}} {{critical_dmg82=@{global_critical_dmg_macro}}} {{attack8name=@{iterative_attack8_name}}}</textarea>
 											</span>
 										</div>
 									</div>
@@ -8794,7 +8797,7 @@
 									</label>
 									<label class="sheet-small-label2 sheet-entry-10p-shrink sheet-sect">
 										<input type="text" value="" name="attr_range" title="@{range}" placeholder="Flat # or # /level" data-i18n-placeholder="range-custom-place" />
-										<span style="whitespace:nowrap;" data-i18n="range-custom">Custom Range</span>
+										<span style="white-space:nowrap;" data-i18n="range-custom">Custom Range</span>
 									</label>
 									<label class="sheet-small-label2 sheet-sect sheet-number">
 										<input title="@{repeating_spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly">
@@ -8872,12 +8875,12 @@
 			<div class="sheet-h2-section" style="text-align:left;" >
 				<div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-cell"><button style="font-size:100%;" title="%{selected|NPC-STR-Check}" type="roll" name="roll_NPC-STR-Check" value="@{NPC-whisper} &{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Strength}} {{Check=[[ 1d20 + [[ @{STR-mod} + @{checks-cond} ]] ]]}}"><span data-i18n="strength-abbrv">STR</span></button><input title="@{STR-base}" type="number" name="attr_STR-base" value="10" /></span>
-						<span class="sheet-table-cell"><button style="font-size:100%;" title="%{selected|NPC-DEX-Check}" type="roll" name="roll_NPC-DEX-Check" value="@{NPC-whisper} &{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Dexterity}} {{Check=[[ 1d20 + [[ @{DEX-mod} + @{checks-cond} ]] ]]}}"><span data-i18n="dexterity-abbrv">DEX</span></button><input title="@{DEX-base}" type="number" name="attr_DEX-base" value="10" /></span>
-						<span class="sheet-table-cell"><button style="font-size:100%;" title="%{selected|NPC-CON-Check}" type="roll" name="roll_NPC-CON-Check" value="@{NPC-whisper} &{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Constitution}} {{Check=[[ 1d20 + [[ @{CON-mod} + @{checks-cond} ]] ]]}}"><span data-i18n="constitution-abbrv">CON</span></button><input title="@{CON-base}" type="number" name="attr_CON-base" value="10" /></span>
-						<span class="sheet-table-cell"><button style="font-size:100%;" title="%{selected|NPC-INT-Check}" type="roll" name="roll_NPC-INT-Check" value="@{NPC-whisper} &{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Intellegence}} {{Check=[[ 1d20 + [[ @{INT-mod} + @{checks-cond} ]] ]]}}"><span data-i18n="intelligence-abbrv">INT</span></button><input title="@{INT-base}" type="number" name="attr_INT-base" value="10" /></span>
-						<span class="sheet-table-cell"><button style="font-size:100%;" title="%{selected|NPC-WIS-Check}" type="roll" name="roll_NPC-WIS-Check" value="@{NPC-whisper} &{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Wisdom}} {{Check=[[ 1d20 + [[ @{WIS-mod} + @{checks-cond} ]] ]]}}"><span data-i18n="wisdom-abbrv">WIS</span></button><input title="@{WIS-base}" type="number" name="attr_WIS-base" value="10" /></span>
-						<span class="sheet-table-cell"><button style="font-size:100%;" title="%{selected|NPC-CHA-Check}" type="roll" name="roll_NPC-CHA-Check" value="@{NPC-whisper} &{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Charisma}} {{Check=[[ 1d20 + [[ @{CHA-mod} + @{checks-cond} ]] ]]}}"><span data-i18n="charisma-abbrv">CHA</span></button><input title="@{CHA-base}" type="number" name="attr_CHA-base" value="10" /></span>
+						<span class="sheet-table-cell"><button style="font-size:100%;" title="%{selected|NPC-STR-Check}" type="roll" name="roll_NPC-STR-Check" value="@{NPC-whisper} &{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Strength}} {{Check=[[ 1d20 + [[ @{STR-mod} + @{checks-cond} ]] ]]}}">&nbsp;<span data-i18n="strength-abbrv">STR</span></button><input title="@{STR-base}" type="number" name="attr_STR-base" value="10" /></span>
+						<span class="sheet-table-cell"><button style="font-size:100%;" title="%{selected|NPC-DEX-Check}" type="roll" name="roll_NPC-DEX-Check" value="@{NPC-whisper} &{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Dexterity}} {{Check=[[ 1d20 + [[ @{DEX-mod} + @{checks-cond} ]] ]]}}">&nbsp;<span data-i18n="dexterity-abbrv">DEX</span></button><input title="@{DEX-base}" type="number" name="attr_DEX-base" value="10" /></span>
+						<span class="sheet-table-cell"><button style="font-size:100%;" title="%{selected|NPC-CON-Check}" type="roll" name="roll_NPC-CON-Check" value="@{NPC-whisper} &{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Constitution}} {{Check=[[ 1d20 + [[ @{CON-mod} + @{checks-cond} ]] ]]}}">&nbsp;<span data-i18n="constitution-abbrv">CON</span></button><input title="@{CON-base}" type="number" name="attr_CON-base" value="10" /></span>
+						<span class="sheet-table-cell"><button style="font-size:100%;" title="%{selected|NPC-INT-Check}" type="roll" name="roll_NPC-INT-Check" value="@{NPC-whisper} &{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Intellegence}} {{Check=[[ 1d20 + [[ @{INT-mod} + @{checks-cond} ]] ]]}}">&nbsp;<span data-i18n="intelligence-abbrv">INT</span></button><input title="@{INT-base}" type="number" name="attr_INT-base" value="10" /></span>
+						<span class="sheet-table-cell"><button style="font-size:100%;" title="%{selected|NPC-WIS-Check}" type="roll" name="roll_NPC-WIS-Check" value="@{NPC-whisper} &{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Wisdom}} {{Check=[[ 1d20 + [[ @{WIS-mod} + @{checks-cond} ]] ]]}}">&nbsp;<span data-i18n="wisdom-abbrv">WIS</span></button><input title="@{WIS-base}" type="number" name="attr_WIS-base" value="10" /></span>
+						<span class="sheet-table-cell"><button style="font-size:100%;" title="%{selected|NPC-CHA-Check}" type="roll" name="roll_NPC-CHA-Check" value="@{NPC-whisper} &{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Charisma}} {{Check=[[ 1d20 + [[ @{CHA-mod} + @{checks-cond} ]] ]]}}">&nbsp;<span data-i18n="charisma-abbrv">CHA</span></button><input title="@{CHA-base}" type="number" name="attr_CHA-base" value="10" /></span>
 					</div>
 				</div>
 
@@ -8886,7 +8889,7 @@
 						<span class="sheet-table-cell sheet-small-label"><input title="@{class-0-bab}" type="number" name="attr_class-0-bab" value="0" /><br><span data-i18n="base-attack-bonus-abbrv">BAB</span></span>
 						<span class="sheet-table-cell"><b>&nbsp;</b></span>
 						<span class="sheet-table-cell">
-							<button style="font-size:100%;" type="roll" title="%{selected|NPC-CMB-Check}" name="roll_NPC-CMB-Check" value="@{NPC-whisper} &{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=CMB}} {{Check=[[ 1d20 + [[ @{CMB} ]] ]]}}"><span data-i18n="combat-maneuver-bonus-abbrv">CMB</span></button>
+							<button style="font-size:100%;" type="roll" title="%{selected|NPC-CMB-Check}" name="roll_NPC-CMB-Check" value="@{NPC-whisper} &{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=CMB}} {{Check=[[ 1d20 + [[ @{CMB} ]] ]]}}">&nbsp;<span data-i18n="combat-maneuver-bonus-abbrv">CMB</span></button>
 							<input title="@{CMB}" type="number" name="attr_CMB" value="0" class="sheet-calc" readonly="readonly" />
 						</span>
 						<span class="sheet-table-cell sheet-small-label"><input title="@{attk-CMB-misc}" type="number" name="attr_attk-CMB-misc" value="0" /><br><span data-i18n="miscellaneous-abbrv">Misc</span></span>
@@ -9457,28 +9460,29 @@
 							<input type="checkbox" title="@{unchained_skills-show}" name="attr_unchained_skills-show" value="1" /><span data-i18n="toggle-unchained-skills"> Display/Enable Unchained Skills</span>
 						</span>
 					</label>
+				</span>
+				<input type="checkbox" class="sheet-nextitem-show" name="attr_unchained_skills-show" value="1"/>
+				<span class="sheet-table-cell sheet-left">
+					<label>
+						<span title="Background skills ranks are awarded at a rate of two per level and can be spent on any background skill.">
+							<input type="radio" title="@{BG-Skill-Use}" name="attr_BG-Skill-Use" value="1" checked="checked" /><span data-i18n="toggle-background-skills"> Enable Background Skills.</span>
+						</span>
+					</label>
+					<label>
+						<span title="Consolidated skills ranks are awarded at 1/2 normal skill points.">
+							<input type="radio" title="@{BG-Skill-Use}" name="attr_BG-Skill-Use" value="0" /><span data-i18n="toggle-consolidated-skills"> Enable Consolidated Skills.</span>
+						</span>
+					</label>
+				</span>
+				<span class="sheet-table-cell sheet-left">
 					<label>
 						<span title="In the wound thresholds variant, a character divides her hit point total into four quarters, and takes penalties whenever she's not in her top quarter.">
 							<input type="checkbox" title="@{wound_threshold-show}" name="attr_wound_threshold-show" value="1" /><span data-i18n="toggle-wound-threshold"> Display Wound Thresholds.</span>
 						</span>
 					</label>
 				</span>
-				<input type="checkbox" class="sheet-nextitem-show" name="attr_unchained_skills-show" value="1"/>
-				<span class="sheet-table-cell sheet-left">
-					<label>
-						<span title="Consolidated skills ranks are awarded at 1/2 normal skill points.">
-							<input type="radio" title="@{BG-Skill-Use}" name="attr_BG-Skill-Use" value="0" /><span data-i18n="toggle-consolidated-skills"> Enable Consolidated Skills.</span>
-						</span>
-					</label>
-					<label>
-						<span title="Background skills ranks are awarded at a rate of two per level and can be spent on any background skill.">
-							<input type="radio" title="@{BG-Skill-Use}" name="attr_BG-Skill-Use" value="1" checked="checked" /><span data-i18n="toggle-background-skills"> Enable Background Skills.</span>
-						</span>
-					</label>
-				</span>
 			</div>
 		</div>
-
 		<div class="sheet-cheat"></div>
 		<input class="sheet-showarrow sheet-h2arrow" type="checkbox" name="attr_pathfinder-mythic-adventures-show"  data-i18n-aria-label="pathfinder-mythic-adventures" title="Click to expand" data-i18n-title="showsect-cmd" value="1" checked="checked"/>
 		<h2 class="sheet-clickheader sheet-showsect"><label   title="Click to expand" data-i18n-title="showsect-cmd" data-i18n="pathfinder-mythic-adventures">Pathfinder Mythic Adventures</label></h2>
@@ -10641,7 +10645,7 @@
 <div role="contentinfo" aria-label="Help links and footer information" data-i18n-aria-label="footer-aria" class="sheet-footer" style="margin-top:2em;" >
 	<div class="sheet-table">
 		<div class="sheet-table-row">
-			<span class="sheet-table-cell"><span data-i18n="footer-info">Created by Samuel Marino w/contributions by Vince, Chris Buchholz, Magik, James W. | Last updated:</span> <i>08.13.2016&nbsp;&nbsp;</i>v.<input type="text" style="width:2.5em; height:1.4em; vertical-align:top; padding:0px 2px 0 2px; border:none;" name="attr_PFSheet_Version" value="0" class="sheet-calc" readonly="readonly" title="A non-blank version indicates attributes have been successfully recalculated."></span>
+			<span class="sheet-table-cell"><span data-i18n="footer-info">Created by Samuel Marino w/contributions by Vince, Chris Buchholz, Magik, James W. | Last updated:</span> <i>08.22.2016&nbsp;&nbsp;</i>v.<input type="text" style="width:2.5em; height:1.4em; vertical-align:top; padding:0px 2px 0 2px; border:none;" name="attr_PFSheet_Version" value="0" class="sheet-calc" readonly="readonly" title="A non-blank version indicates attributes have been successfully recalculated."></span>
 		</div>
 		<div class="sheet-table-row" style="font-size:.8em;">
 			<label style="font-weight:inherit;"><b data-i18n="questions-feedback">Questions/Feedback?:</b><span class="sheet-selectable" style="padding-left:1em;">http://tinyurl.com/PF-Thread</span></label>
@@ -10655,7 +10659,7 @@
 	<rolltemplate class="sheet-rolltemplate-pf_spell">
 		{{^accessible}}
 		<div class="sheet-roll-table sheet-rolltemplate-pf_spell {{#color}}color-{{color}}{{/color}} {{#rounded}}rounded{{/rounded}}" role="presentation">
-			<div class="sheet-roll-header" style="width:100%">
+			<div class="sheet-roll-header" style="width:100%;">
 				{{#header_image}}<span class="sheet-header-image">{{header_image}}</span>{{/header_image}}
 				<span class="sheet-left">
 					{{#character_name}}
@@ -10899,7 +10903,7 @@
 	<rolltemplate class="sheet-rolltemplate-pf_attack">
 		{{^accessible}}
 		<div class="sheet-roll-table {{#color}}color-{{color}}{{/color}} {{#rounded}}rounded{{/rounded}}" role="presentation">
-			<div class="sheet-roll-header" style="width:100%">
+			<div class="sheet-roll-header" style="width:100%;">
 				{{#header_image}}<span class="sheet-header-image">{{header_image}}</span>{{/header_image}}
 				<span class="sheet-left">
 					{{#character_name}}
@@ -10939,9 +10943,7 @@
 				</div>
 				<div class="sheet-roll-groupc">
 					{{#rollWasCrit() attack2}}
-						{{#crit_confirm2}}<div class="sheet-roll-row sheet-crit-row"><div class="sheet-roll-cell sheet-confirm">**<span data-i18n="critical-confirm">Crit Confirm</span>**</div><div class="sheet-roll-cell sheet-left" >{{crit_confirm2}}
-						{{#vs}}&nbsp;{{#vsac}}<span class="sheet-vs" data-i18n="versus-armor-class">vs AC</span>{{/vsac}}{{#vstouch}}<span class="sheet-vs" data-i18n="versus-touch">vs Touch</span>{{/vstouch}}{{#vsff}}<span class="sheet-vs" data-i18n="versus-flat-footed">vs FF</span>{{/vsff}}{{#vsfft}}<span class="sheet-vs" data-i18n="versus-flat-footed-touch">vs FF Touch</span>{{/vsfft}}{{#vscmd}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-defense">vs CMD</span>{{/vscmd}}{{#vscmb}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-bonus">vs CMB</span>{{/vscmb}}{{/vs}}
-						</div></div>{{/crit_confirm2}}
+						{{#crit_confirm2}}<div class="sheet-roll-row sheet-crit-row"><div class="sheet-roll-cell sheet-confirm">**<span data-i18n="critical-confirm">Crit Confirm</span>**</div><div class="sheet-roll-cell sheet-left">{{crit_confirm2}}{{#vs}}&nbsp;{{#vsac}}<span class="sheet-vs" data-i18n="versus-armor-class">vs AC</span>{{/vsac}}{{#vstouch}}<span class="sheet-vs" data-i18n="versus-touch">vs Touch</span>{{/vstouch}}{{#vsff}}<span class="sheet-vs" data-i18n="versus-flat-footed">vs FF</span>{{/vsff}}{{#vsfft}}<span class="sheet-vs" data-i18n="versus-flat-footed-touch">vs FF Touch</span>{{/vsfft}}{{#vscmd}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-defense">vs CMD</span>{{/vscmd}}{{#vscmb}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-bonus">vs CMB</span>{{/vscmb}}{{/vs}}</div></div>{{/crit_confirm2}}
 						{{#crit_damage2}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg">**<span data-i18n="critical-damage">Crit damage</span>**</div><div class="sheet-roll-cell">+{{crit_damage2}}</div></div>{{/crit_damage2}}
 						{{#critical_dmg21}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg-x" data-i18n-title="extra-critical-damage">{{#critical_dmg1_type}}**{{critical_dmg1_type}}**{{/critical_dmg1_type}}{{^critical_dmg1_type}}**<span data-i18n="extra-critical-damage">Extra Crit Dmg</span>**{{/critical_dmg1_type}}</div><div class="sheet-roll-cell">+{{critical_dmg21}}</div></div>{{/critical_dmg21}}
 						{{#critical_dmg22}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg-x" data-i18n-title="extra-critical-damage">{{#critical_dmg2_type}}**{{critical_dmg2_type}}**{{/critical_dmg2_type}}{{^critical_dmg2_type}}**<span data-i18n="extra-critical-damage">Extra Crit Dmg</span>**{{/critical_dmg2_type}}</div><div class="sheet-roll-cell">+{{critical_dmg22}}</div></div>{{/critical_dmg22}}
@@ -10956,7 +10958,7 @@
 				</div>
 				<div class="sheet-roll-groupc">
 					{{#rollWasCrit() attack3}}
-						{{#crit_confirm3}}<div class="sheet-roll-row sheet-crit-row"><div class="sheet-roll-cell sheet-confirm">**{{^attack4name}}<span data-i18n="attack-4-ordinal">4nd attack</span>{{/attack4name}}{{#attack4name}}{{attack4name}}{{/attack4name}}**</div><div class="sheet-roll-cell">{{crit_confirm3}}{{#vs}}&nbsp;{{#vsac}}<span class="sheet-vs" data-i18n="versus-armor-class">vs AC</span>{{/vsac}}{{#vstouch}}<span class="sheet-vs" data-i18n="versus-touch">vs Touch</span>{{/vstouch}}{{#vsff}}<span class="sheet-vs" data-i18n="versus-flat-footed">vs FF</span>{{/vsff}}{{#vsfft}}<span class="sheet-vs" data-i18n="versus-flat-footed-touch">vs FF Touch</span>{{/vsfft}}{{#vscmd}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-defense">vs CMD</span>{{/vscmd}}{{#vscmb}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-bonus">vs CMB</span>{{/vscmb}}{{/vs}}</div></div>{{/crit_confirm3}}
+						{{#crit_confirm3}}<div class="sheet-roll-row sheet-crit-row"><div class="sheet-roll-cell sheet-confirm">**<span data-i18n="critical-confirm">Crit Confirm</span>**</div><div class="sheet-roll-cell sheet-left">{{crit_confirm3}}{{#vs}}&nbsp;{{#vsac}}<span class="sheet-vs" data-i18n="versus-armor-class">vs AC</span>{{/vsac}}{{#vstouch}}<span class="sheet-vs" data-i18n="versus-touch">vs Touch</span>{{/vstouch}}{{#vsff}}<span class="sheet-vs" data-i18n="versus-flat-footed">vs FF</span>{{/vsff}}{{#vsfft}}<span class="sheet-vs" data-i18n="versus-flat-footed-touch">vs FF Touch</span>{{/vsfft}}{{#vscmd}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-defense">vs CMD</span>{{/vscmd}}{{#vscmb}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-bonus">vs CMB</span>{{/vscmb}}{{/vs}}</div></div>{{/crit_confirm3}}
 						{{#crit_damage3}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg">**<span data-i18n="critical-damage">Crit damage</span>**</div><div class="sheet-roll-cell">+{{crit_damage3}}</div></div>{{/crit_damage3}}
 						{{#critical_dmg31}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg-x" data-i18n-title="extra-critical-damage">{{#critical_dmg1_type}}**{{critical_dmg1_type}}**{{/critical_dmg1_type}}{{^critical_dmg1_type}}**<span data-i18n="extra-critical-damage">Extra Crit Dmg</span>**{{/critical_dmg1_type}}</div><div class="sheet-roll-cell">+{{critical_dmg31}}</div></div>{{/critical_dmg31}}
 						{{#critical_dmg32}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg-x" data-i18n-title="extra-critical-damage">{{#critical_dmg2_type}}**{{critical_dmg2_type}}**{{/critical_dmg2_type}}{{^critical_dmg2_type}}**<span data-i18n="extra-critical-damage">Extra Crit Dmg</span>**{{/critical_dmg2_type}}</div><div class="sheet-roll-cell">+{{critical_dmg32}}</div></div>{{/critical_dmg32}}
@@ -10971,7 +10973,7 @@
 				</div>
 				<div class="sheet-roll-groupc">
 					{{#rollWasCrit() attack4}}
-						{{#crit_confirm4}}<div class="sheet-roll-row sheet-crit-row"><div class="sheet-roll-cell sheet-confirm">**<span data-i18n="critical-confirm">Crit Confirm</span>**</div><div class="sheet-roll-cell">{{crit_confirm4}}{{#vs}}&nbsp;{{#vsac}}<span class="sheet-vs" data-i18n="versus-armor-class">vs AC</span>{{/vsac}}{{#vstouch}}<span class="sheet-vs" data-i18n="versus-touch">vs Touch</span>{{/vstouch}}{{#vsff}}<span class="sheet-vs" data-i18n="versus-flat-footed">vs FF</span>{{/vsff}}{{#vsfft}}<span class="sheet-vs" data-i18n="versus-flat-footed-touch">vs FF Touch</span>{{/vsfft}}{{#vscmd}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-defense">vs CMD</span>{{/vscmd}}{{#vscmb}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-bonus">vs CMB</span>{{/vscmb}}{{/vs}}</div></div>{{/crit_confirm4}}
+						{{#crit_confirm4}}<div class="sheet-roll-row sheet-crit-row"><div class="sheet-roll-cell sheet-confirm">**<span data-i18n="critical-confirm">Crit Confirm</span>**</div><div class="sheet-roll-cell sheet-left">{{crit_confirm4}}{{#vs}}&nbsp;{{#vsac}}<span class="sheet-vs" data-i18n="versus-armor-class">vs AC</span>{{/vsac}}{{#vstouch}}<span class="sheet-vs" data-i18n="versus-touch">vs Touch</span>{{/vstouch}}{{#vsff}}<span class="sheet-vs" data-i18n="versus-flat-footed">vs FF</span>{{/vsff}}{{#vsfft}}<span class="sheet-vs" data-i18n="versus-flat-footed-touch">vs FF Touch</span>{{/vsfft}}{{#vscmd}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-defense">vs CMD</span>{{/vscmd}}{{#vscmb}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-bonus">vs CMB</span>{{/vscmb}}{{/vs}}</div></div>{{/crit_confirm4}}
 						{{#crit_damage4}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg">**<span data-i18n="critical-damage">Crit damage</span>**</div><div class="sheet-roll-cell">+{{crit_damage4}}</div></div>{{/crit_damage4}}
 						{{#critical_dmg41}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg-x" data-i18n-title="extra-critical-damage">{{#critical_dmg1_type}}**{{critical_dmg1_type}}**{{/critical_dmg1_type}}{{^critical_dmg1_type}}**<span data-i18n="extra-critical-damage">Extra Crit Dmg</span>**{{/critical_dmg1_type}}</div><div class="sheet-roll-cell">+{{critical_dmg41}}</div></div>{{/critical_dmg41}}
 						{{#critical_dmg42}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg-x" data-i18n-title="extra-critical-damage">{{#critical_dmg2_type}}**{{critical_dmg2_type}}**{{/critical_dmg2_type}}{{^critical_dmg2_type}}**<span data-i18n="extra-critical-damage">Extra Crit Dmg</span>**{{/critical_dmg2_type}}</div><div class="sheet-roll-cell">+{{critical_dmg42}}</div></div>{{/critical_dmg42}}
@@ -10986,7 +10988,7 @@
 				</div>
 				<div class="sheet-roll-groupc">
 					{{#rollWasCrit() attack5}}
-						{{#crit_confirm5}}<div class="sheet-roll-row sheet-crit-row"><div class="sheet-roll-cell sheet-confirm">**<span data-i18n="critical-confirm">Crit Confirm</span>**</div><div class="sheet-roll-cell">{{crit_confirm5}}{{#vs}}&nbsp;{{#vsac}}<span class="sheet-vs" data-i18n="versus-armor-class">vs AC</span>{{/vsac}}{{#vstouch}}<span class="sheet-vs" data-i18n="versus-touch">vs Touch</span>{{/vstouch}}{{#vsff}}<span class="sheet-vs" data-i18n="versus-flat-footed">vs FF</span>{{/vsff}}{{#vsfft}}<span class="sheet-vs" data-i18n="versus-flat-footed-touch">vs FF Touch</span>{{/vsfft}}{{#vscmd}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-defense">vs CMD</span>{{/vscmd}}{{#vscmb}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-bonus">vs CMB</span>{{/vscmb}}{{/vs}}</div></div>{{/crit_confirm5}}
+						{{#crit_confirm5}}<div class="sheet-roll-row sheet-crit-row"><div class="sheet-roll-cell sheet-confirm">**<span data-i18n="critical-confirm">Crit Confirm</span>**</div><div class="sheet-roll-cell sheet-left">{{crit_confirm5}}{{#vs}}&nbsp;{{#vsac}}<span class="sheet-vs" data-i18n="versus-armor-class">vs AC</span>{{/vsac}}{{#vstouch}}<span class="sheet-vs" data-i18n="versus-touch">vs Touch</span>{{/vstouch}}{{#vsff}}<span class="sheet-vs" data-i18n="versus-flat-footed">vs FF</span>{{/vsff}}{{#vsfft}}<span class="sheet-vs" data-i18n="versus-flat-footed-touch">vs FF Touch</span>{{/vsfft}}{{#vscmd}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-defense">vs CMD</span>{{/vscmd}}{{#vscmb}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-bonus">vs CMB</span>{{/vscmb}}{{/vs}}</div></div>{{/crit_confirm5}}
 						{{#crit_damage5}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg">**<span data-i18n="critical-damage">Crit damage</span>**</div><div class="sheet-roll-cell">+{{crit_damage5}}</div></div>{{/crit_damage5}}
 						{{#critical_dmg51}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg-x" data-i18n-title="extra-critical-damage">{{#critical_dmg1_type}}**{{critical_dmg1_type}}**{{/critical_dmg1_type}}{{^critical_dmg1_type}}**<span data-i18n="extra-critical-damage">Extra Crit Dmg</span>**{{/critical_dmg1_type}}</div><div class="sheet-roll-cell">+{{critical_dmg51}}</div></div>{{/critical_dmg51}}
 						{{#critical_dmg52}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg-x" data-i18n-title="extra-critical-damage">{{#critical_dmg2_type}}**{{critical_dmg2_type}}**{{/critical_dmg2_type}}{{^critical_dmg2_type}}**<span data-i18n="extra-critical-damage">Extra Crit Dmg</span>**{{/critical_dmg2_type}}</div><div class="sheet-roll-cell">+{{critical_dmg52}}</div></div>{{/critical_dmg52}}
@@ -11001,7 +11003,7 @@
 				</div>
 				<div class="sheet-roll-groupc">
 					{{#rollWasCrit() attack6}}
-						{{#crit_confirm6}}<div class="sheet-roll-row sheet-crit-row"><div class="sheet-roll-cell sheet-confirm">**<span data-i18n="critical-confirm">Crit Confirm</span>**</div><div class="sheet-roll-cell">{{crit_confirm6}}{{#vs}}&nbsp;{{#vsac}}<span class="sheet-vs" data-i18n="versus-armor-class">vs AC</span>{{/vsac}}{{#vstouch}}<span class="sheet-vs" data-i18n="versus-touch">vs Touch</span>{{/vstouch}}{{#vsff}}<span class="sheet-vs" data-i18n="versus-flat-footed">vs FF</span>{{/vsff}}{{#vsfft}}<span class="sheet-vs" data-i18n="versus-flat-footed-touch">vs FF Touch</span>{{/vsfft}}{{#vscmd}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-defense">vs CMD</span>{{/vscmd}}{{#vscmb}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-bonus">vs CMB</span>{{/vscmb}}{{/vs}}</div></div>{{/crit_confirm6}}
+						{{#crit_confirm6}}<div class="sheet-roll-row sheet-crit-row"><div class="sheet-roll-cell sheet-confirm">**<span data-i18n="critical-confirm">Crit Confirm</span>**</div><div class="sheet-roll-cell sheet-left">{{crit_confirm6}}{{#vs}}&nbsp;{{#vsac}}<span class="sheet-vs" data-i18n="versus-armor-class">vs AC</span>{{/vsac}}{{#vstouch}}<span class="sheet-vs" data-i18n="versus-touch">vs Touch</span>{{/vstouch}}{{#vsff}}<span class="sheet-vs" data-i18n="versus-flat-footed">vs FF</span>{{/vsff}}{{#vsfft}}<span class="sheet-vs" data-i18n="versus-flat-footed-touch">vs FF Touch</span>{{/vsfft}}{{#vscmd}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-defense">vs CMD</span>{{/vscmd}}{{#vscmb}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-bonus">vs CMB</span>{{/vscmb}}{{/vs}}</div></div>{{/crit_confirm6}}
 						{{#crit_damage6}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg">**<span data-i18n="critical-damage">Crit damage</span>**</div><div class="sheet-roll-cell">+{{crit_damage6}}</div></div>{{/crit_damage6}}
 						{{#critical_dmg61}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg-x" data-i18n-title="extra-critical-damage">{{#critical_dmg1_type}}**{{critical_dmg1_type}}**{{/critical_dmg1_type}}{{^critical_dmg1_type}}**<span data-i18n="extra-critical-damage">Extra Crit Dmg</span>**{{/critical_dmg1_type}}</div><div class="sheet-roll-cell">+{{critical_dmg61}}</div></div>{{/critical_dmg61}}
 						{{#critical_dmg62}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg-x" data-i18n-title="extra-critical-damage">{{#critical_dmg2_type}}**{{critical_dmg2_type}}**{{/critical_dmg2_type}}{{^critical_dmg2_type}}**<span data-i18n="extra-critical-damage">Extra Crit Dmg</span>**{{/critical_dmg2_type}}</div><div class="sheet-roll-cell">+{{critical_dmg62}}</div></div>{{/critical_dmg62}}
@@ -11016,7 +11018,7 @@
 				</div>
 				<div class="sheet-roll-groupc">
 					{{#rollWasCrit() attack7}}
-						{{#crit_confirm7}}<div class="sheet-roll-row sheet-crit-row"><div class="sheet-roll-cell sheet-confirm">**<span data-i18n="critical-confirm">Crit Confirm</span>**</div><div class="sheet-roll-cell">{{crit_confirm7}}{{#vs}}&nbsp;{{#vsac}}<span class="sheet-vs" data-i18n="versus-armor-class">vs AC</span>{{/vsac}}{{#vstouch}}<span class="sheet-vs" data-i18n="versus-touch">vs Touch</span>{{/vstouch}}{{#vsff}}<span class="sheet-vs" data-i18n="versus-flat-footed">vs FF</span>{{/vsff}}{{#vsfft}}<span class="sheet-vs" data-i18n="versus-flat-footed-touch">vs FF Touch</span>{{/vsfft}}{{#vscmd}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-defense">vs CMD</span>{{/vscmd}}{{#vscmb}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-bonus">vs CMB</span>{{/vscmb}}{{/vs}}</div></div>{{/crit_confirm7}}
+						{{#crit_confirm7}}<div class="sheet-roll-row sheet-crit-row"><div class="sheet-roll-cell sheet-confirm">**<span data-i18n="critical-confirm">Crit Confirm</span>**</div><div class="sheet-roll-cell sheet-left">{{crit_confirm7}}{{#vs}}&nbsp;{{#vsac}}<span class="sheet-vs" data-i18n="versus-armor-class">vs AC</span>{{/vsac}}{{#vstouch}}<span class="sheet-vs" data-i18n="versus-touch">vs Touch</span>{{/vstouch}}{{#vsff}}<span class="sheet-vs" data-i18n="versus-flat-footed">vs FF</span>{{/vsff}}{{#vsfft}}<span class="sheet-vs" data-i18n="versus-flat-footed-touch">vs FF Touch</span>{{/vsfft}}{{#vscmd}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-defense">vs CMD</span>{{/vscmd}}{{#vscmb}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-bonus">vs CMB</span>{{/vscmb}}{{/vs}}</div></div>{{/crit_confirm7}}
 						{{#crit_damage7}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg">**<span data-i18n="critical-damage">Crit damage</span>**</div><div class="sheet-roll-cell">+{{crit_damage7}}</div></div>{{/crit_damage7}}
 						{{#critical_dmg71}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg-x" data-i18n-title="extra-critical-damage">{{#critical_dmg1_type}}**{{critical_dmg1_type}}**{{/critical_dmg1_type}}{{^critical_dmg1_type}}**<span data-i18n="extra-critical-damage">Extra Crit Dmg</span>**{{/critical_dmg1_type}}</div><div class="sheet-roll-cell">+{{critical_dmg71}}</div></div>{{/critical_dmg71}}
 						{{#critical_dmg72}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg-x" data-i18n-title="extra-critical-damage">{{#critical_dmg2_type}}**{{critical_dmg2_type}}**{{/critical_dmg2_type}}{{^critical_dmg2_type}}**<span data-i18n="extra-critical-damage">Extra Crit Dmg</span>**{{/critical_dmg2_type}}</div><div class="sheet-roll-cell">+{{critical_dmg72}}</div></div>{{/critical_dmg72}}
@@ -11031,7 +11033,7 @@
 				</div>
 				<div class="sheet-roll-groupc">
 					{{#rollWasCrit() attack8}}
-						{{#crit_confirm8}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-confirm">**<span data-i18n="critical-confirm">Crit Confirm</span>**</div><div class="sheet-roll-cell">{{crit_confirm8}}{{#vs}}&nbsp;{{#vsac}}<span class="sheet-vs" data-i18n="versus-armor-class">vs AC</span>{{/vsac}}{{#vstouch}}<span class="sheet-vs" data-i18n="versus-touch">vs Touch</span>{{/vstouch}}{{#vsff}}<span class="sheet-vs" data-i18n="versus-flat-footed">vs FF</span>{{/vsff}}{{#vsfft}}<span class="sheet-vs" data-i18n="versus-flat-footed-touch">vs FF Touch</span>{{/vsfft}}{{#vscmd}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-defense">vs CMD</span>{{/vscmd}}{{#vscmb}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-bonus">vs CMB</span>{{/vscmb}}{{/vs}}</div></div>{{/crit_confirm8}}
+						{{#crit_confirm8}}<div class="sheet-roll-row sheet-crit-row"><div class="sheet-roll-cell sheet-confirm">**<span data-i18n="critical-confirm">Crit Confirm</span>**</div><div class="sheet-roll-cell sheet-left">{{crit_confirm8}}{{#vs}}&nbsp;{{#vsac}}<span class="sheet-vs" data-i18n="versus-armor-class">vs AC</span>{{/vsac}}{{#vstouch}}<span class="sheet-vs" data-i18n="versus-touch">vs Touch</span>{{/vstouch}}{{#vsff}}<span class="sheet-vs" data-i18n="versus-flat-footed">vs FF</span>{{/vsff}}{{#vsfft}}<span class="sheet-vs" data-i18n="versus-flat-footed-touch">vs FF Touch</span>{{/vsfft}}{{#vscmd}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-defense">vs CMD</span>{{/vscmd}}{{#vscmb}}<span class="sheet-vs" data-i18n="versus-combat-maneuver-bonus">vs CMB</span>{{/vscmb}}{{/vs}}</div></div>{{/crit_confirm8}}
 						{{#crit_damage8}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg">**<span data-i18n="critical-damage">Crit damage</span>**</div><div class="sheet-roll-cell">+{{crit_damage8}}</div></div>{{/crit_damage8}}
 						{{#critical_dmg81}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg-x" data-i18n-title="extra-critical-damage">{{#critical_dmg1_type}}**{{critical_dmg1_type}}**{{/critical_dmg1_type}}{{^critical_dmg1_type}}**<span data-i18n="extra-critical-damage">Extra Crit Dmg</span>**{{/critical_dmg1_type}}</div><div class="sheet-roll-cell">+{{critical_dmg81}}</div></div>{{/critical_dmg81}}
 						{{#critical_dmg82}}<div class="sheet-roll-row"><div class="sheet-roll-cell sheet-crit-dmg-x" data-i18n-title="extra-critical-damage">{{#critical_dmg2_type}}**{{critical_dmg2_type}}**{{/critical_dmg2_type}}{{^critical_dmg2_type}}**<span data-i18n="extra-critical-damage">Extra Crit Dmg</span>**{{/critical_dmg2_type}}</div><div class="sheet-roll-cell">+{{critical_dmg82}}</div></div>{{/critical_dmg82}}
@@ -11040,7 +11042,6 @@
 			</div>
 			<div style="display:table;width:100%;">
 				<div class="sheet-roll-group2">
-
 					{{#type}}<div class="sheet-roll-row"><div class="sheet-roll-cell">**<span data-i18n="type">Type</span>**:</div><div class="sheet-roll-cell">{{type}}</div></div>{{/type}}
 					{{#allprops() color accessible rounded header_image character_name character_id name_link subtitle attack damage crit_confirm crit_damage description attack2 damage2 crit_confirm2 crit_damage2 attack3 damage3 crit_confirm3 crit_damage3 attack4 damage4 crit_confirm4 crit_damage4 attack5 damage5 crit_confirm5 crit_damage5 attack6 damage6 crit_confirm6 crit_damage6 attack7 damage7 crit_confirm7 crit_damage7 attack8 damage8 crit_confirm8 crit_damage8 melee_notes ranged_notes CMB_notes attack_notes type weapon_notes precision_dmg1 precision_dmg1_type precision_dmg2 precision_dmg2_type critical_dmg1 critical_dmg1_type critical_dmg2 critical_dmg2_type precision_dmg21 critical_dmg21 precision_dmg22 critical_dmg22 precision_dmg31 critical_dmg31 precision_dmg32 critical_dmg32 precision_dmg41 critical_dmg41 precision_dmg42 critical_dmg42 precision_dmg51 critical_dmg51 precision_dmg52 critical_dmg52 precision_dmg61 critical_dmg61 precision_dmg62 critical_dmg62 precision_dmg71 critical_dmg71 precision_dmg72 critical_dmg72 precision_dmg81 critical_dmg81 precision_dmg82 critical_dmg82 attack2name attack3name attack4name attack5name attack6name attack7name attack8name vs vsac vstouch vsff vsfft vscmd vscmb }}
 						<div class="sheet-roll-row"><div class="sheet-roll-cell">**{{key}}**:</div><div class="sheet-roll-cell">{{value}}</div></div>
@@ -11174,7 +11175,7 @@
 	<rolltemplate class="sheet-rolltemplate-pf_defense">
 		{{^accessible}}
 		<div class="sheet-roll-table sheet-rolltemplate-pf_defense {{#color}}color-{{color}}{{/color}} {{#rounded}}rounded{{/rounded}}" role="presentation">
-			<div class="sheet-roll-header" style="width:100%">
+			<div class="sheet-roll-header" style="width:100%;">
 				{{#header_image}}<span class="sheet-header-image">{{header_image}}</span>{{/header_image}}
 				<span class="sheet-left">
 					{{#character_name}}
@@ -11335,7 +11336,7 @@
 	<rolltemplate class="sheet-rolltemplate-pf_block">
 		{{^accessible}}
 		<div class="sheet-roll-table sheet-rolltemplate-pf_block {{#color}}color-{{color}}{{/color}} {{#rounded}}rounded{{/rounded}}" role="presentation">
-			<div class="sheet-roll-header" style="width:100%">
+			<div class="sheet-roll-header" style="width:100%;">
 				{{#header_image}}<span class="sheet-header-image">{{header_image}}</span>{{/header_image}}
 				<span class="sheet-left">
 					{{#character_name}}
@@ -13554,7 +13555,7 @@ var SWUtils = SWUtils || (function () {
 var PFSheet = PFSheet || (function () {
     'use strict';
 
-    var version = 0.63,
+    var version = 0.64,
 
 	/* isOptionTemplateReversed - for dropdowns in templates where value is before equals */
 	isOptionTemplateReversed = function(spellOptionKey){
@@ -13648,6 +13649,7 @@ var PFSheet = PFSheet || (function () {
 	//NEW skills for background in Unchained
 	backgroundOnlySkills = ["Artistry", "Artistry2", "Artistry3", "Artistry4", "Artistry5", "Artistry6", "Artistry7", "Artistry8", "Artistry9", "Artistry10"
 		, "Lore", "Lore2", "Lore3", "Lore4", "Lore5", "Lore6", "Lore7", "Lore8", "Lore9", "Lore10"],
+	skillsWithFillInNames = ["Artistry","Craft","Lore","Misc-Skill","Perform","Profession"],
 	adventureSkills = [
 		"Acrobatics", "Bluff", "Climb", "Diplomacy", "Disable-Device"
 		, "Disguise", "Escape-Artist", "Fly", "Heal", "Intimidate"
@@ -13886,7 +13888,8 @@ var PFSheet = PFSheet || (function () {
 	compiledBadIds = new RegExp("spell|weapon|class|ability|feat|attack|damage|trait|racial|mythic|psionic","i"),
 
     isBadRowId = function (section, id, nullok) {
-        if (!nullok && (id === null || id === undefined || typeof id === "undefined" )) {
+		//for some reason typeof does not catch them.
+        if (!nullok && ( id === null || id === undefined )) {
             return true;
         }
         if (id === section) {
@@ -14068,6 +14071,7 @@ var PFSheet = PFSheet || (function () {
     },
 
 
+
     updateSpellbookMacros = function () {
         //TAS.debug("at updateSpellbookMacros");
         var class0BaseMacro = "/w \"@{character_name}\" &{template:pf_generic} @{toggle_spell_accessible} @{toggle_rounded_flag}{{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_block}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=@{spellclass-0-name} Spells}}"
@@ -15637,10 +15641,56 @@ var PFSheet = PFSheet || (function () {
 		return currText;
 	},
 	
-	
-	fixRepeatingAttackMacros = function(){
+
+	fixRepeatingAttackMacros = function(version){
+		TAS.notice("at fixRepeatingAttackMacros" );
+		getAttrs(["migrated_attack_macros64"],function(vm){
+			var migrateMacros =  parseInt(vm["migrated_attack_macros64"],10)||0;
+			if (!migrateMacros) {
+				getSectionIDs("repeating_weapon", function(ids){
+					var macroFieldsList = _.reduce(ids,function(memo,id){
+							var i=0;
+							for (i=2;i<9;i++){memo.push("repeating_weapon_"+id+"_var_iterative_attack"+i+"_macro");}
+							return memo;
+						},[]);
+					getAttrs(macroFieldsList,function(v){
+						var setter = _.reduce(ids,function(memo,id){
+							var prefix = "repeating_weapon_"+ getRepeatingIDStr(id), i=0, fieldname="",tempmacro="",update=false;
+							try {
+								for (i=2;i<9;i++){
+									update=false;
+									fieldname = prefix + "var_iterative_attack"+i+"_macro";
+									tempmacro=v[fieldname];
+									TAS.debug("at id "+id+"  iterative "+ i +" looking for "+ fieldname +", macro is:"+ tempmacro );
+									if (/\s*\+\s*@\{attack_macro\}\s*\+\s*\[\[\s*@\{iterative/i.test(tempmacro)){
+										TAS.notice("it contains the string! move the brackets!");
+										tempmacro= tempmacro.replace(/\s*\+\s*@\{attack_macro\}\s*\+\s*\[\[\s*@\{iterative/ig,' + [[ @{attack_macro} + @{iterative');
+										update=true;
+									}
+									if (/\[\[@/.test(tempmacro)){
+										tempmacro=tempmacro.replace(/\[\[@/,'[[ @');
+										update=true;
+									}
+									if (update){
+										memo[fieldname]=tempmacro;
+									}
+									
+								}
+							} catch (err){
+								TAS.error("error trying to fix iterative on "+id, err);
+							} finally {
+								return memo;
+							}
+						},{});
+						setter["migrated_attack_macros64"]="1";
+						setAttrs(setter,{silent:true});
+					});
+				});
+			}		
+		});
+
 		getAttrs(["migrated_attack_macros2"],function(vm){
-			var migrateMacros =  parseInt(vm["migrated_attack_macros"],10)||0;
+			var migrateMacros =  parseInt(vm["migrated_attack_macros2"],10)||0;
 			if (!migrateMacros) {
 				getSectionIDs("repeating_weapon", function(ids){
 					var macroFieldsList = _.reduce(ids,function(memo,id){
@@ -15657,13 +15707,13 @@ var PFSheet = PFSheet || (function () {
 								, pcMacroField = prefix+"macro-text"
 								, npcMacroField = prefix+"NPC-macro-text"
 								, pcMacro = v[pcMacroField] , npcMacro =v[npcMacroField];
-							if (pcMacro.indexOf('@{damage-dice-num}d@{damage-die} @{damage_macro}')>0){
-								pcMacro = pcMacro.replace('@{damage-dice-num}d@{damage-die} @{damage_macro}','@{damage-dice-num}d@{damage-die} + @{damage_macro}');
+							if (/@\{damage-dice-num\}d@\{damage-die\}\s*@\{damage_macro\}/i.test(pcMacro)){
+								pcMacro = pcMacro.replace(/@\{damage-dice-num\}d@\{damage-die\}\s*@\{damage_macro\}/ig,'@{damage-dice-num}d@{damage-die} + @{damage_macro}');
 								memo[pcMacroField]=pcMacro;
 							}
-							if (npcMacro.indexOf('@{damage-dice-num}d@{damage-die} @{damage_macro}')>0){
-								npcMacro = npcMacro.replace('@{damage-dice-num}d@{damage-die} @{damage_macro}','@{damage-dice-num}d@{damage-die} + @{damage_macro}');
-								memo[npcMacroField]=npcMacro;
+							if (/@\{damage-dice-num\}d@\{damage-die\}\s*@\{damage_macro\}/i.test(npcMacro)){
+								npcMacro = pcMacro.replace(/@\{damage-dice-num\}d@\{damage-die\}\s*@\{damage_macro\}/ig,'@{damage-dice-num}d@{damage-die} + @{damage_macro}');
+								memo[npcMacroField]=pcMacro;
 							}
 							return memo;
 						},{});
@@ -18985,6 +19035,9 @@ var PFSheet = PFSheet || (function () {
 			fixRepeatingAttackMacros();
 			updateDefenses();
 		}
+		if (oldversion < 0.64) {
+			fixRepeatingAttackMacros(0.64);
+		}
     },
 
 
@@ -19001,7 +19054,7 @@ var PFSheet = PFSheet || (function () {
 
             if (currVer !== version) {
 				if (currVer > 0) {
-	console.log('%cס§₪₪₪₪§|(Ξ≥≤≥≤≥≤ΞΞΞΞΞΞΞΞΞΞ>   Upgrading Pathfinder character sheet to '+ version+' <ΞΞΞΞΞΞΞΞΞΞ≥≤≥≤≥≤Ξ)|§₪₪₪₪§ס', 'background: linear-gradient(to right,red,white,white,green); color:black;text-shadow: 0 0 8px white;');
+	console.log('%cס§₪₪₪₪§|(Ξ≥≤≥≤≥≤ΞΞΞΞΞΞΞΞΞΞ>   Upgrading Pathfinder character sheet to '+ version+' <ΞΞΞΞΞΞΞΞΞΞ≥≤≥≤≥≤Ξ)|§₪₪₪₪§ס', 'background: linear-gradient(to right,red,white,white,red); color:black;text-shadow: 0 0 8px white;');
 					
 				}
                 recalc = true;