diff --git a/Warhammer 4e Character Sheet/README.md b/Warhammer 4e Character Sheet/README.md
index 1fdcc9a6a4..29bffa5ed6 100644
--- a/Warhammer 4e Character Sheet/README.md	
+++ b/Warhammer 4e Character Sheet/README.md	
@@ -58,12 +58,12 @@ The sheet should work on latest version of Firefox, MS Egde & Chrome.
 
 This sheet has TokenMod integrated (TokenMod API needs to be install in the game!) buttons which can set/unset conditions, it does requires my custom WFRP4e Tokens v2 (download @ https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/markers/WFRP4eset2.0.zip) due to naming convention. 
 
-Condition effects are currently hard coded as follows (updated May 24th 2021): 
+Condition effects are currently hard coded as follows (updated June 15th 2021): 
 
 Broken/Fatigued/Poisoned/Stunned = Effects all roll tests (this excludes non test rolls and roll tables like Initiative/Miscast/Crit/Oops etc.). 
-Entangled/Prone = Effects all combat/spell cast, and any skill that would require movement like dodge/athletics/climb etc. Includes WS/BS/S/AGI/DEX rolls 
-Blinded = Effects all combat/magic, and any skill that would require sight like art/dodge/drive/perception etc. including WS/BS/S/AGI/DEX rolls. 
-Deafened = Not included in automated conditions due to being too circumstantial. GM should determine when penalty apply. 
+Entangled/Prone = Effects WS/BS/I/AGI/DEX characteristic rolls, all combat, and any skill that would require movement like dodge/athletics/climb etc.
+Blinded = Effects WS/BS/AGI/DEX characteristic rolls, all combat/magic, and any skill that would require sight like art/dodge/drive/perception etc. 
+Deafened = Effects I characteristic rolls, and any skill that would require hearing Perception/Intuition.
 Unconscious = Effects all rolls except endurance (Blocks rolling actions essentially) 
 
 Multiple conditions: You can be subject to the same Condition more than once; indeed, sometimes you will receive multiples of the same Condition from a single event. If this occurs, any penalties suffered are stacked. So, if you have three Bleeding Conditions, you’re losing a worrying 3 Wounds per Round; or if you have 3 Fatigued Conditions, you suffer –30 to all Tests. You can also be subject to multiple, different Conditions at once. When this occurs, the effects do not stack; you suffer the highest of the two penalties and apply it. So, if you had 3 Fatigued and 2 Broken Conditions, you would suffer a –30 penalty to all active Tests, not –20. 
@@ -73,10 +73,10 @@ Note conditions are not intended for out of combat situations, GM simply makes t
  
 ///// ============ Change Log ============ /////  
 
-
 June 14th 2021 v1.41 
 
 - Vastly improved performance of Target value re-calculations due to condition changes, by moving them to the sheet worker. This was particularly bad on Firefox, while MS Edge(Chromium) and Chrome were less impacted but also benefit from the changes. No actual changes in functionality just faster!
+- Deafened = Effects Initiative characteristic rolls, and any skill that would require hearing Perception/Intuition.
  
 
 June 14th 2021 v1.4 
diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index 7874b7a471..351c008aa2 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
@@ -455,14 +455,14 @@
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Intuition" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}} {{reroll=@{RT-reroll}Intuition)}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Intuition" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}} {{reroll=@{RT-reroll}Intuition)}}">
 						<span style="white-space: pre;" data-i18n="INTUITION">Intuition</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Perception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}-@{armorcoifpenalty}-@{armoropenpenalty}-@{armorhelmpenalty}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}} {{reroll=@{RT-reroll}Perception)}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Perception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}-@{armorcoifpenalty}-@{armoropenpenalty}-@{armorhelmpenalty}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}} {{reroll=@{RT-reroll}Perception)}}">
 						<span data-i18n="PERCEPTION">Perception</span>
 					</button>
 				</div>
@@ -6382,7 +6382,7 @@
 							<input class="sheet-center" type="number" name="attr_ToughnessP" value="(@{condgen}*-1)" disabled />
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<input class="sheet-center" type="number" name="attr_InitiativeP" value="(@{condgen_see}*-1)" disabled />
+							<input class="sheet-center" type="number" name="attr_InitiativeP" value="(@{condgen_see_hear}*-1)" disabled />
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 							<input class="sheet-center" type="number" name="attr_AgilityP" value="(@{condgen_see_move}*-1)+(@{encpenalty}*-10)" disabled />
@@ -6422,7 +6422,7 @@
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 							<input class="sheet-center" type="hidden" name="attr_Initiative" value="0" readonly />
-							<input class="sheet-center" type="number" name="attr_InitiativeD" value="@{Initiative}+@{InitiativeMod}+(@{condgen_see}*-1)" disabled />
+							<input class="sheet-center" type="number" name="attr_InitiativeD" value="@{Initiative}+@{InitiativeMod}+(@{condgen_see_hear}*-1)" disabled />
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 							<input class="sheet-center" type="hidden" name="attr_Agility" value="0" readonly />
@@ -6464,7 +6464,7 @@
 							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{ToughnessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Toughness} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{ToughnessSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Toughness)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{InitiativeMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + @{Initiative} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{InitiativeSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Initiative)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{InitiativeMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + @{Initiative} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{InitiativeSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Initiative)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{AgilityMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_move}*-1]] [COND] + @{Agility} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{AgilitySL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Agility)}}"></button>
@@ -8475,10 +8475,10 @@
 							<input class="sheet-center" type="number" name="attr_IntuitionMisc" value="0" />
 						</div>
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<input class="sheet-center" type="number" name="attr_Intuition" value="@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}+(@{condgen_see}*-1)" disabled="true" />
+							<input class="sheet-center" type="number" name="attr_Intuition" value="@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}+(@{condgen_see_hear}*-1)" disabled="true" />
 						</div>
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Intuition" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}} {{reroll=@{RT-reroll}Intuition)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Intuition" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}} {{reroll=@{RT-reroll}Intuition)}}"></button>
 						</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
@@ -9593,10 +9593,10 @@
 							<input class="sheet-center" type="number" name="attr_OutdoorSurvivalMisc" value="0" />
 						</div>
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<input class="sheet-center" type="number" name="attr_OutdoorSurvival" value="@{OutdoorSurvivalChar}+@{OutdoorSurvivalAdv}+@{OutdoorSurvivalMisc}+(@{condall}*-1)" disabled="true" />
+							<input class="sheet-center" type="number" name="attr_OutdoorSurvival" value="@{OutdoorSurvivalChar}+@{OutdoorSurvivalAdv}+@{OutdoorSurvivalMisc}+(@{condgen_see_move}*-1)" disabled="true" />
 						</div>
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_OutdoorSurvival" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condall}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{OUTDOOR-SURVIVAL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condall}*-1]] [COND] + [[@{OutdoorSurvival}]] [SKILL] +?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{OutdoorSurvival_modtype1}]]}} {{mod1=@{OutdoorSurvival_mod1}}} {{mod2type=[[@{OutdoorSurvival_modtype2}]]}} {{mod2=@{OutdoorSurvival_mod2}}} {{mod3type=[[@{OutdoorSurvival_modtype3}]]}} {{mod3=@{OutdoorSurvival_mod3}}} {{reroll=@{RT-reroll}OutdoorSurvival)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_OutdoorSurvival" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{OUTDOOR-SURVIVAL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{OutdoorSurvival}]] [SKILL] +?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{OutdoorSurvival_modtype1}]]}} {{mod1=@{OutdoorSurvival_mod1}}} {{mod2type=[[@{OutdoorSurvival_modtype2}]]}} {{mod2=@{OutdoorSurvival_mod2}}} {{mod3type=[[@{OutdoorSurvival_modtype3}]]}} {{mod3=@{OutdoorSurvival_mod3}}} {{reroll=@{RT-reroll}OutdoorSurvival)}}"></button>
 						</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
@@ -9684,10 +9684,10 @@
 							<input class="sheet-center" type="number" name="attr_PerceptionMisc" value="0" />
 						</div>
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<input class="sheet-center" type="number" name="attr_Perception" value="@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}-@{armorcoifpenalty}-@{armoropenpenalty}-@{armorhelmpenalty}+(@{condgen_see}*-1)" disabled="true" />
+							<input class="sheet-center" type="number" name="attr_Perception" value="@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}-@{armorcoifpenalty}-@{armoropenpenalty}-@{armorhelmpenalty}+(@{condgen_see_hear}*-1)" disabled="true" />
 						</div>
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Perception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}-@{armorcoifpenalty}-@{armoropenpenalty}-@{armorhelmpenalty}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}} {{reroll=@{RT-reroll}Perception)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Perception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}-@{armorcoifpenalty}-@{armoropenpenalty}-@{armorhelmpenalty}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}} {{reroll=@{RT-reroll}Perception)}}"></button>
 						</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
@@ -10055,10 +10055,10 @@
 								<input class="sheet-center" type="number" name="attr_StealthMisc" value="0" />
 							</div>
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<input class="sheet-center" type="number" name="attr_Stealth" value="@{StealthChar}+@{StealthAdv}+@{StealthMisc}-@{armormailpenalty}-@{armorplatepenalty}+(@{condall}*-1)" disabled="true" />
+								<input class="sheet-center" type="number" name="attr_Stealth" value="@{StealthChar}+@{StealthAdv}+@{StealthMisc}-@{armormailpenalty}-@{armorplatepenalty}+(@{condgen_see_move}*-1)" disabled="true" />
 							</div>
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_Stealth" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condall}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{STEALTH}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condall}*-1]] [COND] + [[@{StealthChar}+@{StealthAdv}+@{StealthMisc}-@{armormailpenalty}-@{armorplatepenalty}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Stealth_modtype1}]]}} {{mod1=@{Stealth_mod1}}} {{mod2type=[[@{Stealth_modtype2}]]}} {{mod2=@{Stealth_mod2}}} {{mod3type=[[@{Stealth_modtype3}]]}} {{mod3=@{Stealth_mod3}}} {{reroll=@{RT-reroll}Stealth)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_Stealth" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{STEALTH}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{StealthChar}+@{StealthAdv}+@{StealthMisc}-@{armormailpenalty}-@{armorplatepenalty}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Stealth_modtype1}]]}} {{mod1=@{Stealth_mod1}}} {{mod2type=[[@{Stealth_modtype2}]]}} {{mod2=@{Stealth_mod2}}} {{mod3type=[[@{Stealth_modtype3}]]}} {{mod3=@{Stealth_mod3}}} {{reroll=@{RT-reroll}Stealth)}}"></button>
 						</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
@@ -10150,10 +10150,10 @@
 										<input class="sheet-center" type="number" name="attr_StealthSpecializationMisc" value="0" />
 									</div>
 									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<input class="sheet-center" type="number" name="attr_StealthSpecialization" value="@{StealthSpecializationChar}+@{StealthSpecializationAdv}+@{StealthSpecializationMisc}-@{armormailpenalty}-@{armorplatepenalty}+(@{condall}*-1)" disabled="true" />
+										<input class="sheet-center" type="number" name="attr_StealthSpecialization" value="@{StealthSpecializationChar}+@{StealthSpecializationAdv}+@{StealthSpecializationMisc}-@{armormailpenalty}-@{armorplatepenalty}+(@{condgen_see_move}*-1)" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_StealthSpecialization" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condall}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{StealthSpecializationName}}} {{skill=^{STEALTH}}} {{character_name=@{character_name}}} {{target=[[ [[@{condall}*-1]] [COND] + [[@{StealthSpecializationChar}+@{StealthSpecializationAdv}+@{StealthSpecializationMisc}-@{armormailpenalty}-@{armorplatepenalty}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Stealth_Custom_modtype1}]]}} {{mod1=@{Stealth_Custom_mod1}}} {{mod2type=[[@{Stealth_Custom_modtype2}]]}} {{mod2=@{Stealth_Custom_mod2}}} {{mod3type=[[@{Stealth_Custom_modtype3}]]}} {{mod3=@{Stealth_Custom_mod3}}} {{reroll=@{RT-rep}StealthSpecialization)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_StealthSpecialization" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{StealthSpecializationName}}} {{skill=^{STEALTH}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{StealthSpecializationChar}+@{StealthSpecializationAdv}+@{StealthSpecializationMisc}-@{armormailpenalty}-@{armorplatepenalty}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Stealth_Custom_modtype1}]]}} {{mod1=@{Stealth_Custom_mod1}}} {{mod2type=[[@{Stealth_Custom_modtype2}]]}} {{mod2=@{Stealth_Custom_mod2}}} {{mod3type=[[@{Stealth_Custom_modtype3}]]}} {{mod3=@{Stealth_Custom_mod3}}} {{reroll=@{RT-rep}StealthSpecialization)}}"></button>
 						</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
@@ -12292,10 +12292,10 @@
 										<input class="sheet-center" type="number" name="attr_PerformMisc" value="0" />
 									</div>
 									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<input class="sheet-center" type="number" name="attr_Perform" value="(@{PerformSpecializationChar}+@{PerformAdv}+@{PerformMisc}+(@{condall}*-1))*@{PerformTaken}" disabled="true" />
+										<input class="sheet-center" type="number" name="attr_Perform" value="(@{PerformSpecializationChar}+@{PerformAdv}+@{PerformMisc}+(@{condgen_see_move}*-1))*@{PerformTaken}" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_Perform" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condall}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{PerformSpecialization}}} {{title=@{PerformSpecialization}}} {{skill=^{PERFORM}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condall}*-1]] [COND] + [[@{Perform}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perform_modtype1}]]}} {{mod1=@{Perform_mod1}}} {{mod2type=[[@{Perform_modtype2}]]}} {{mod2=@{Perform_mod2}}} {{mod3type=[[@{Perform_modtype3}]]}} {{mod3=@{Perform_mod3}}} {{reroll=@{RT-rep}Perform)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_Perform" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{PerformSpecialization}}} {{title=@{PerformSpecialization}}} {{skill=^{PERFORM}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Perform}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perform_modtype1}]]}} {{mod1=@{Perform_mod1}}} {{mod2type=[[@{Perform_modtype2}]]}} {{mod2=@{Perform_mod2}}} {{mod3type=[[@{Perform_modtype3}]]}} {{mod3=@{Perform_mod3}}} {{reroll=@{RT-rep}Perform)}}"></button>
 						</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_PerformTaken" value="1" />