diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index 0be8fea97a..9393108e0b 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
@@ -688,9 +688,9 @@
 						<div class="sheet-col-1-8 sheet-center sheet-small-label-white sheet-vert-middle sheet-mar-l-lg"><span data-i18n="INITIATIVE">Initiative</span></div>						
 					<div class="sheet-col-1-9 sheet-mar-l-md">
 					<button type="roll" class="sheet-adv-buttonnpc sheet-roll3" name="Advantage" value="!token-mod --set statusmarkers|!2-Advantage[[@{selected|AdvantageNPC}]]">
-						<span data-i18n="ADVANTAGE">Advantage</span>
-					</div>	
+						<span data-i18n="ADVANTAGE">Advantage</span>	
 					</button>
+					</div>
 					
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="0" selected />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
@@ -1912,7 +1912,7 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[@{DeafenedMod}]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ (@{npc-cond}) [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
+								<button type="roll" class="sheet-roll" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[@{DeafenedMod}]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ (@{npc-cond}) [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
@@ -2036,9 +2036,9 @@
 						<div class="sheet-col-1-8 sheet-center sheet-small-label-white sheet-vert-middle sheet-mar-l-lg"><span data-i18n="INITIATIVE">Initiative</span></div>						
 					<div class="sheet-col-1-9 sheet-mar-l-md">
 					<button type="roll" class="sheet-adv-buttonnpc sheet-roll3" name="Advantage" value="!token-mod --set statusmarkers|!2-Advantage[[@{selected|AdvantageNPC}]]">
-						<span data-i18n="ADVANTAGE">Advantage</span>
+						<span data-i18n="ADVANTAGE">Advantage</span>	
 					</button>
-					</div>	
+					</div>
 					
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="0" selected />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
@@ -2056,8 +2056,6 @@
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
 					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 10px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{npc-cond})]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
-			
-
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
 					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 13px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond}) [COND] +@{WeaponSkillNPC} [SKILL] +@{NPCBonus} [BONUS] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
@@ -2510,7 +2508,7 @@
 						<div class="sheet-col-1-15 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="ABBREVIATE-ADVANCE">Adv</div>
 						<div class="sheet-col-1-15 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="ABBREVIATE-MISCELLANEOUS">Misc</div>
 						<div class="sheet-col-1-16 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="TARGET2">Target</div>
-						<div class="sheet-col-7-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="ROLL" data-i18n="CUSTOM-SKILL-NAME">Roll</div>
+						<div class="sheet-col-7-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="ROLL">Roll</div>
 
 						<div class="sheet-col-1-6 sheet-small-label sheet-vert-middle sheet-pad-r-sm" style="padding-left: 18px;" data-i18n="CUSTOM-SKILL-NAME"> Custom Skill Name</div>
 						<div class="sheet-col-1-15 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" style="padding-left: 15px;" data-i18n="ABBREVIATE-CHARACTERISTIC">Char</div>
@@ -2593,15 +2591,15 @@
 				<span style="color:#615c50; padding-left: 24px" data-i18n="MELEE">Melee</span>
 
 				<input type="radio" name="attr_NPCweapontab" class="sheet-tab-npc sheet-tab-npc93" value="0" checked>
-				<span class="sheet-tab-npc sheet-tab-npc93">
+				<span class="sheet-tab-npc sheet-tab-npc93 sheet-tab-npc1 sheet-tab-npc2 sheet-tab-npc3">
 						<span>0</span>
 				</span>
 				<input type="radio" name="attr_NPCweapontab" class="sheet-tab-npc sheet-tab-npc0 sheet-tab-npc1" value="1" />
-				<span class="sheet-tab-npc sheet-tab-npc1">
+				<span class="sheet-tab-npc sheet-tab-npc1 sheet-tab-npc2 sheet-tab-npc3">
 						<span>1</span>
 				</span>
 				<input type="radio" name="attr_NPCweapontab" class="sheet-tab-npc sheet-tab-npc0 sheet-tab-npc1 sheet-tab-npc2" value="2" />
-				<span class="sheet-tab-npc sheet-tab-npc2">
+				<span class="sheet-tab-npc sheet-tab-npc2 sheet-tab-npc3">
 						<span>2</span>
 				</span>
 				<input type="radio" name="attr_NPCweapontab" class="sheet-tab-npc sheet-tab-npc0 sheet-tab-npc1 sheet-tab-npc2 sheet-tab-npc3" value="3" />
@@ -2699,10 +2697,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="1" selected />
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond}) [COND] +@{WeaponSkillNPC} [SKILL] +@{NPCBonus} {BONUS} +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll" name="roll_NPCAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond}) [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond}) [COND] +@{WeaponSkillNPC} [SKILL] +@{NPCBonus} [BONUS] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll" name="roll_NPCOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond}) [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 
 						</div>
@@ -2767,10 +2765,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="2"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond})+@{WeaponSkillNPC2}+@{NPCBonus2}+(@{AdvantageNPC}*10)+?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll" name="roll_NPCAttack2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[(@{npc-cond})]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[(@{npc-cond})+@{WeaponSkillNPC2}+@{NPCBonus2}+(@{AdvantageNPC}*10)+?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll" name="roll_NPCOpposed2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{npc-cond})]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -3174,7 +3172,7 @@
 								<input type="text" class="sheet-center" name="attr_npc-spellname2" value="" placeholder="Spell Name" />
 							</div>
 							<div class="sheet-col-1-10t sheet-center sheet-vert-middle sheet-pad-l-sm sheet-pad-r-sm">
-								<input type="text" class="sheet-center" name="attr_npc-typemagic" value="Magick (Int)" disabled />	
+								<input type="text" class="sheet-center" name="attr_npc-typemagic" value="Magick (Int)" disabled />
 							</div>															
 							<div class="sheet-col-1-22 sheet-center sheet-vert-middle sheet-pad-l-sm sheet-pad-r-sm">
 								<input type="text" class="sheet-center" name="attr_npc-loremodmod2" value="0" />
@@ -3228,7 +3226,7 @@
 								<input type="text" class="sheet-center" name="attr_npc-spellname3" value="" placeholder="Spell Name" />
 							</div>
 							<div class="sheet-col-1-10t sheet-center sheet-vert-middle sheet-pad-l-sm sheet-pad-r-sm">
-								<input type="text" class="sheet-center" name="attr_npc-typemagic" value="Magick (Int)" disabled />	
+								<input type="text" class="sheet-center" name="attr_npc-typemagic" value="Magick (Int)" disabled />
 							</div>																		
 							<div class="sheet-col-1-22 sheet-center sheet-vert-middle sheet-pad-l-sm sheet-pad-r-sm">
 								<input type="text" class="sheet-center" name="attr_npc-loremodmod3" value="0" />
@@ -3262,7 +3260,7 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ (@{npc-cond}) [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
+								<button type="roll" class="sheet-roll" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[@{DeafenedMod}]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ (@{npc-cond}) [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
@@ -3364,7 +3362,6 @@
 </div>
 
 
-
 	<div class="sheet-inventory-page3 sheet-pad-b-md">				
 		<div class="sheet-npc-tab3">				
 			<fieldset class="repeating_npc-tab-page3">
@@ -3388,9 +3385,9 @@
 						<div class="sheet-col-1-8 sheet-center sheet-small-label-white sheet-vert-middle sheet-mar-l-lg"><span data-i18n="INITIATIVE">Initiative</span></div>						
 					<div class="sheet-col-1-9 sheet-mar-l-md">
 					<button type="roll" class="sheet-adv-buttonnpc sheet-roll3" name="Advantage" value="!token-mod --set statusmarkers|!2-Advantage[[@{selected|AdvantageNPC}]]">
-						<span data-i18n="ADVANTAGE">Advantage</span>
+						<span data-i18n="ADVANTAGE">Advantage</span>	
 					</button>
-					</div>	
+					</div>
 					
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="0" selected />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
@@ -3408,8 +3405,6 @@
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
 					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 10px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{npc-cond})]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
-			
-
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
 					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 13px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond}) [COND] +@{WeaponSkillNPC} [SKILL] +@{NPCBonus} [BONUS] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
@@ -3945,15 +3940,15 @@
 				<span style="color:#615c50; padding-left: 24px" data-i18n="MELEE">Melee</span>
 
 				<input type="radio" name="attr_NPCweapontab" class="sheet-tab-npc sheet-tab-npc93" value="0" checked>
-				<span class="sheet-tab-npc sheet-tab-npc93">
+				<span class="sheet-tab-npc sheet-tab-npc93 sheet-tab-npc1 sheet-tab-npc2 sheet-tab-npc3">
 						<span>0</span>
 				</span>
 				<input type="radio" name="attr_NPCweapontab" class="sheet-tab-npc sheet-tab-npc0 sheet-tab-npc1" value="1" />
-				<span class="sheet-tab-npc sheet-tab-npc1">
+				<span class="sheet-tab-npc sheet-tab-npc1 sheet-tab-npc2 sheet-tab-npc3">
 						<span>1</span>
 				</span>
 				<input type="radio" name="attr_NPCweapontab" class="sheet-tab-npc sheet-tab-npc0 sheet-tab-npc1 sheet-tab-npc2" value="2" />
-				<span class="sheet-tab-npc sheet-tab-npc2">
+				<span class="sheet-tab-npc sheet-tab-npc2 sheet-tab-npc3">
 						<span>2</span>
 				</span>
 				<input type="radio" name="attr_NPCweapontab" class="sheet-tab-npc sheet-tab-npc0 sheet-tab-npc1 sheet-tab-npc2 sheet-tab-npc3" value="3" />
@@ -4051,10 +4046,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="1" selected />
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond}) [COND] +@{WeaponSkillNPC} [SKILL] +@{NPCBonus} {BONUS} +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll" name="roll_NPCAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond}) [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond}) [COND] +@{WeaponSkillNPC} [SKILL] +@{NPCBonus} [BONUS] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll" name="roll_NPCOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond}) [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 
 						</div>
@@ -4119,10 +4114,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="2"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond})+@{WeaponSkillNPC2}+@{NPCBonus2}+(@{AdvantageNPC}*10)+?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll" name="roll_NPCAttack2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[(@{npc-cond})]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[(@{npc-cond})+@{WeaponSkillNPC2}+@{NPCBonus2}+(@{AdvantageNPC}*10)+?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll" name="roll_NPCOpposed2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{npc-cond})]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -4409,7 +4404,7 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[  ([[{[[@{PoisonedStat}*-10]],[[@{FatiguedStat}*-10]]}kl1]]) [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
+								<button type="roll" class="sheet-roll" name="roll_PrayCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ ([[{[[@{PoisonedStat}*-10]],[[@{FatiguedStat}*-10]]}kl1]]) [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -4455,7 +4450,7 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{spelltype=Prayer}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[  ([[{[[@{PoisonedStat}*-10]],[[@{FatiguedStat}*-10]]}kl1]]) [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
+								<button type="roll" class="sheet-roll" name="roll_PrayCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{spelltype=Prayer}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ ([[{[[@{PoisonedStat}*-10]],[[@{FatiguedStat}*-10]]}kl1]]) [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -4614,7 +4609,7 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ (@{npc-cond}) [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
+								<button type="roll" class="sheet-roll" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[@{DeafenedMod}]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ (@{npc-cond}) [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
@@ -4739,9 +4734,9 @@
 						<div class="sheet-col-1-8 sheet-center sheet-small-label-white sheet-vert-middle sheet-mar-l-lg"><span data-i18n="INITIATIVE">Initiative</span></div>						
 					<div class="sheet-col-1-9 sheet-mar-l-md">
 					<button type="roll" class="sheet-adv-buttonnpc sheet-roll3" name="Advantage" value="!token-mod --set statusmarkers|!2-Advantage[[@{selected|AdvantageNPC}]]">
-						<span data-i18n="ADVANTAGE">Advantage</span>
+						<span data-i18n="ADVANTAGE">Advantage</span>	
 					</button>
-					</div>	
+					</div>
 					
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="0" selected />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
@@ -4759,8 +4754,6 @@
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
 					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 10px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{npc-cond})]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
-			
-
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
 					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 13px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond}) [COND] +@{WeaponSkillNPC} [SKILL] +@{NPCBonus} [BONUS] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
@@ -5296,15 +5289,15 @@
 				<span style="color:#615c50; padding-left: 24px" data-i18n="MELEE">Melee</span>
 
 				<input type="radio" name="attr_NPCweapontab" class="sheet-tab-npc sheet-tab-npc93" value="0" checked>
-				<span class="sheet-tab-npc sheet-tab-npc93">
+				<span class="sheet-tab-npc sheet-tab-npc93 sheet-tab-npc1 sheet-tab-npc2 sheet-tab-npc3">
 						<span>0</span>
 				</span>
 				<input type="radio" name="attr_NPCweapontab" class="sheet-tab-npc sheet-tab-npc0 sheet-tab-npc1" value="1" />
-				<span class="sheet-tab-npc sheet-tab-npc1">
+				<span class="sheet-tab-npc sheet-tab-npc1 sheet-tab-npc2 sheet-tab-npc3">
 						<span>1</span>
 				</span>
 				<input type="radio" name="attr_NPCweapontab" class="sheet-tab-npc sheet-tab-npc0 sheet-tab-npc1 sheet-tab-npc2" value="2" />
-				<span class="sheet-tab-npc sheet-tab-npc2">
+				<span class="sheet-tab-npc sheet-tab-npc2 sheet-tab-npc3">
 						<span>2</span>
 				</span>
 				<input type="radio" name="attr_NPCweapontab" class="sheet-tab-npc sheet-tab-npc0 sheet-tab-npc1 sheet-tab-npc2 sheet-tab-npc3" value="3" />
@@ -5402,10 +5395,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="1" selected />
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond}) [COND] +@{WeaponSkillNPC} [SKILL] +@{NPCBonus} {BONUS} +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll" name="roll_NPCAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond}) [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond}) [COND] +@{WeaponSkillNPC} [SKILL] +@{NPCBonus} [BONUS] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll" name="roll_NPCOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond}) [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 
 						</div>
@@ -5470,10 +5463,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="2"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[(@{npc-cond})+@{WeaponSkillNPC2}+@{NPCBonus2}+(@{AdvantageNPC}*10)+?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll" name="roll_NPCAttack2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[(@{npc-cond})]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[(@{npc-cond})+@{WeaponSkillNPC2}+@{NPCBonus2}+(@{AdvantageNPC}*10)+?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll" name="roll_NPCOpposed2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{npc-cond})]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -5754,13 +5747,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[  ([[{[[@{PoisonedStat}*-10]],[[@{FatiguedStat}*-10]]}kl1]]) [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
+								<button type="roll" class="sheet-roll" name="roll_PrayCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ ([[{[[@{PoisonedStat}*-10]],[[@{FatiguedStat}*-10]]}kl1]]) [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[  ([[{[[@{PoisonedStat}*-10]],[[@{FatiguedStat}*-10]]}kl1]]) [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
+								<button type="roll" class="sheet-roll" name="roll_PrayCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ ([[{[[@{PoisonedStat}*-10]],[[@{FatiguedStat}*-10]]}kl1]]) [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -5965,7 +5958,7 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ (@{npc-cond}) [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
+								<button type="roll" class="sheet-roll" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[@{DeafenedMod}]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ (@{npc-cond}) [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
@@ -6023,7 +6016,7 @@
 							</div>	
 							
 							<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ (@{npc-cond}) [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">
+								<button type="roll" class="sheet-roll" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{DeafenedStat}]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ (@{npc-cond}) [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
 							</div>
 						</div>
 		</div>