diff --git a/Eclipse Phase V2/Eclipse Phase V2.html b/Eclipse Phase V2/Eclipse Phase V2.html
index c2fd21489d..627283adde 100644
--- a/Eclipse Phase V2/Eclipse Phase V2.html	
+++ b/Eclipse Phase V2/Eclipse Phase V2.html	
@@ -1,4 +1,4 @@
-<div class="identity-img"><img src="images/EPlogo.png" /></div>
+<div class="identity-img"><img src="http://nsa39.casimages.com/img/2018/01/16/180116022211839129.png" /></div>
 <div class="sheet-header" style="width:557px;display:inline-block;margin-left:26px;">
 	<div class="block-title" data-i18n="identity">Identity</div>
 	<div class="block">
@@ -59,71 +59,169 @@
 <input type="radio" name="attr_tab" class="tab tab-130px tab8" value="8" /><span data-i18n-title="psi" title="Psi"></span>
 
 <div class="sheet-hidden sheet-tab1Show" style="width:820px;">
-	<div style="width:727px;margin:auto;">
+	<div style="width:759px;margin:auto;">
 		<div style="width:710px;" class="sheet-first-row">
-			<div style="width:680px;" class="block-title" data-i18n="aptitudes">Aptitudes</div>
-			<div style="width:680px;" class="block">
-				<div class="sheet-line">
-					<input type="number" name="attr_cognition" class="sheet-lower-input apt-title" style="width:100px;" value="5" min="5">
-					<input type="number" name="attr_intuition" class="sheet-lower-input apt-title" style="width:100px;" value="5" min="5">
-					<input type="number" name="attr_reflexes" class="sheet-lower-input apt-title" style="width:100px;" value="5" min="5">
-					<input type="number" name="attr_savvy" class="sheet-lower-input apt-title" style="width:100px;" value="5" min="5">
-					<input type="number" name="attr_somatics" class="sheet-lower-input apt-title" style="width:100px;" value="5" min="5">
-					<input type="number" name="attr_willpower" class="sheet-lower-input apt-title" style="width:100px;" value="5" min="5">
+			<div style="width:690px;" class="block-title" data-i18n="aptitudes">Aptitudes</div>
+			<div style="width:690px;" class="block">
+				<div style="display:inline-block;">
+					<div class="sheet-line">
+						<input type="checkbox" name="attr_cognition-expand" style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"><span style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"></span>
+						<div class="sheet-expandHide" style="width:100px;">
+							<input type="number" name="attr_cognition" class="sheet-lower-input apt-title" style="width:87px;" value="5" min="5">
+						</div>
+						<div class="sheet-expand" style="width:100px;">
+							<div class="sheet-line">
+								<input type="number" name="attr_bCheckCOG" class="sheet-lower-input apt-title" style="width:87px;" value="0">
+							</div>
+							<div class="sheet-line">
+								<div class="subtitle apt-title center" style="width:100px;margin-left:-13px;" data-i18n="bonus check">Bonus Check</div>
+							</div>
+						</div>
+					</div>
+					<div class="sheet-line">
+						<button type="roll" name="roll_apt-cog" style="width:100px;" class="apt-title apt-check" value="
+						@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{cognition}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{cognition}*3]]-[[@{malus}]]+@{bCheckCOG}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
+							<div class="center apt-title" data-i18n="cognition">Cognition</div>
+						</button>
+					</div>
 				</div>
-				<div class="sheet-line">
-					<button type="roll" name="roll_apt-cog" style="width:100px;" class="apt-title apt-check" value="
-					@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{cognition}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{cognition}*3]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
-						<div class="center apt-title" data-i18n="cognition">Cognition</div>
-					</button>
-					<button type="roll" name="roll_apt-int" style="width:100px;" class="apt-title apt-check" value="
-					@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{intuition}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{intuition}*3]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
-						<div class="center apt-title" data-i18n="intuition">Intuition</div>
-					</button>
-					<button type="roll" name="roll_apt-ref" style="width:100px;" class="apt-title apt-check" value="
-					@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{reflexes}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{reflexes}*3]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
-						<div class="center apt-title" data-i18n="reflexes">Reflexes</div>
-					</button>
-					<button type="roll" name="roll_apt-sav" style="width:100px;" class="apt-title apt-check" value="
-					@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{savvy}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{savvy}*3]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
-						<div class="center apt-title" data-i18n="savvy">Savvy</div>
-					</button>
-					<button type="roll" name="roll_apt-som" style="width:100px;" class="apt-title apt-check" value="
-					@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{somatics}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{somatics}*3]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
-						<div class="center apt-title" data-i18n="somatics">Somatics</div>
-					</button>
-					<button type="roll" name="roll_apt-wil" style="width:100px;" class="apt-title apt-check" value="
-					@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{willpower}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{willpower}*3]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
-						<div class="center apt-title" data-i18n="willpower">Willpower</div>
-					</button>
+				<div style="display:inline-block;">
+					<div class="sheet-line">
+						<input type="checkbox" name="attr_intuition-expand" style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"><span style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"></span>
+						<div class="sheet-expandHide" style="width:100px;">
+							<input type="number" name="attr_intuition" class="sheet-lower-input apt-title" style="width:87px;" value="5" min="5">
+						</div>
+						<div class="sheet-expand" style="width:100px;">
+							<div class="sheet-line">
+								<input type="number" name="attr_bCheckINT" class="sheet-lower-input apt-title" style="width:87px;" value="0">
+							</div>
+							<div class="sheet-line">
+								<div class="subtitle apt-title center" style="width:100px;margin-left:-13px;" data-i18n="bonus check">Bonus Check</div>
+							</div>
+						</div>
+					</div>
+					<div class="sheet-line">
+						<button type="roll" name="roll_apt-int" style="width:100px;" class="apt-title apt-check" value="
+						@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{intuition}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{intuition}*3]]-[[@{malus}]]+@{bCheckINT}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
+							<div class="center apt-title" data-i18n="intuition">Intuition</div>
+						</button>
+					</div>
+				</div>
+				<div style="display:inline-block;">
+					<div class="sheet-line">
+						<input type="checkbox" name="attr_reflexes-expand" style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"><span style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"></span>
+						<div class="sheet-expandHide" style="width:100px;">
+							<input type="number" name="attr_reflexes" class="sheet-lower-input apt-title" style="width:87px;" value="5" min="5">
+						</div>
+						<div class="sheet-expand" style="width:100px;">
+							<div class="sheet-line">
+								<input type="number" name="attr_bCheckREF" class="sheet-lower-input apt-title" style="width:87px;" value="0">
+							</div>
+							<div class="sheet-line">
+								<div class="subtitle apt-title center" style="width:100px;margin-left:-13px;" data-i18n="bonus check">Bonus Check</div>
+							</div>
+						</div>
+					</div>
+					<div class="sheet-line">
+						<button type="roll" name="roll_apt-ref" style="width:100px;" class="apt-title apt-check" value="
+						@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{reflexes}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{reflexes}*3]]-[[@{malus}]]+@{bCheckREF}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
+							<div class="center apt-title" data-i18n="reflexes">Reflexes</div>
+						</button>
+					</div>
+				</div>
+				<div style="display:inline-block;">
+					<div class="sheet-line">
+						<input type="checkbox" name="attr_savvy-expand" style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"><span style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"></span>
+						<div class="sheet-expandHide" style="width:100px;">
+							<input type="number" name="attr_savvy" class="sheet-lower-input apt-title" style="width:87px;" value="5" min="5">
+						</div>
+						<div class="sheet-expand" style="width:100px;">
+							<div class="sheet-line">
+								<input type="number" name="attr_bCheckSAV" class="sheet-lower-input apt-title" style="width:87px;" value="0">
+							</div>
+							<div class="sheet-line">
+								<div class="subtitle apt-title center" style="width:100px;margin-left:-13px;" data-i18n="bonus check">Bonus Check</div>
+							</div>
+						</div>
+					</div>
+					<div class="sheet-line">
+						<button type="roll" name="roll_apt-sav" style="width:100px;" class="apt-title apt-check" value="
+						@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{savvy}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{savvy}*3]]-[[@{malus}]]+@{bCheckSAV}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
+							<div class="center apt-title" data-i18n="savvy">Savvy</div>
+						</button>
+					</div>
+				</div>
+				<div style="display:inline-block;">
+					<div class="sheet-line">
+						<input type="checkbox" name="attr_somatics-expand" style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"><span style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"></span>
+						<div class="sheet-expandHide" style="width:100px;">
+							<input type="number" name="attr_somatics" class="sheet-lower-input apt-title" style="width:87px;" value="5" min="5">
+						</div>
+						<div class="sheet-expand" style="width:100px;">
+							<div class="sheet-line">
+								<input type="number" name="attr_bCheckSOM" class="sheet-lower-input apt-title" style="width:87px;" value="0">
+							</div>
+							<div class="sheet-line">
+								<div class="subtitle apt-title center" style="width:100px;margin-left:-13px;" data-i18n="bonus check">Bonus Check</div>
+							</div>
+						</div>
+					</div>
+					<div class="sheet-line">
+						<button type="roll" name="roll_apt-som" style="width:100px;" class="apt-title apt-check" value="
+						@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{somatics}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{somatics}*3]]-[[@{malus}]]+@{bCheckSOM}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
+							<div class="center apt-title" data-i18n="somatics">Somatics</div>
+						</button>
+					</div>
+				</div>
+				<div style="display:inline-block;">
+					<div class="sheet-line">
+						<input type="checkbox" name="attr_willpower-expand" style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"><span style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"></span>
+						<div class="sheet-expandHide" style="width:87px;">
+							<input type="number" name="attr_willpower" class="sheet-lower-input apt-title" style="width:87px;" value="5" min="5">
+						</div>
+						<div class="sheet-expand" style="width:87px;">
+							<div class="sheet-line">
+								<input type="number" name="attr_bCheckWIL" class="sheet-lower-input apt-title" style="width:87px;" value="0">
+							</div>
+							<div class="sheet-line">
+								<div class="subtitle apt-title center" style="width:100px;margin-left:-13px;" data-i18n="bonus check">Bonus Check</div>
+							</div>
+						</div>
+					</div>
+					<div class="sheet-line">
+						<button type="roll" name="roll_apt-wil" style="width:100px;" class="apt-title apt-check" value="
+						@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{willpower}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{willpower}*3]]-[[@{malus}]]+@{bCheckSOM}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
+							<div class="center apt-title" data-i18n="willpower">Willpower</div>
+						</button>
+					</div>
 				</div>
 			</div>
 		</div>
 
-		<div class="sheet-column sheet-margin-col">
+		<div class="sheet-column" style="margin-right:12px">
 			<div style="margin-bottom:20px;" class="sheet-line">
-				<div style="width:218px;display:inline-block">
+				<div style="width:258px;display:inline-block">
 					<div class="block-title" data-i18n="mental">Mental</div>
 					<div class="block">
 						<div class="sheet-line">
-							<input type="number" name="attr_TT" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="trauma treshold" title="Trauma Treshold" value="floor(@{LUC}/5)" disabled>
-							<input type="number" name="attr_LUC" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="lucidity" title="Lucidity" value="(@{willpower}*2)" disabled>
-							<input type="number" name="attr_IR" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="insanity rating" title="Insanity Rating" value="@{LUC}*2" disabled>
+							<input type="number" name="attr_TT" class="sheet-lower-input apt-title" style="width:63.33px;" data-i18n-title="trauma treshold" title="Trauma Treshold" value="floor(@{LUC}/5)" disabled>
+							<input type="number" name="attr_LUC" class="sheet-lower-input apt-title" style="width:63.33px;" data-i18n-title="lucidity" title="Lucidity" value="(@{willpower}*2)" disabled>
+							<input type="number" name="attr_IR" class="sheet-lower-input apt-title" style="width:63.33px;" data-i18n-title="insanity rating" title="Insanity Rating" value="@{LUC}*2" disabled>
 						</div>
 						<div class="sheet-line">
-							<div class="subtitle apt-title center" style="width:50px;" data-i18n="trauma treshold short">TT</div>
-							<div class="subtitle apt-title center" style="width:50px;" data-i18n="lucidity short">LUC</div>
-							<div class="subtitle apt-title center" style="width:50px;" data-i18n="insanity rating short">IR</div>
+							<div class="subtitle apt-title center" style="width:63.33px;" data-i18n="trauma treshold short">TT</div>
+							<div class="subtitle apt-title center" style="width:63.33px;" data-i18n="lucidity short">LUC</div>
+							<div class="subtitle apt-title center" style="width:63.33px;" data-i18n="insanity rating short">IR</div>
 						</div>
 						<div class="sheet-line">
-							<input type="number" name="attr_stress" class="sheet-lower-input apt-title" style="width:75px;" value="0">
-							<div style="width:10px;display:inline-block"></div>
-							<input type="number" name="attr_traumas" class="sheet-lower-input apt-title" style="width:75px;" value="0">
+							<input type="number" name="attr_stress" class="sheet-lower-inputWMargin center" style="width:70px;" value="0">
+							<input type="number" name="attr_traumas" class="sheet-lower-inputWMargin center" style="width:70px;" value="0">
+							<input type="number" name="attr_mentMalus" class="sheet-lower-inputWMargin center" style="width:70px;" value="0">
 						</div>
 						<div class="sheet-line">
-							<div class="subtitle apt-title center" style="width:75px;" data-i18n="stress">Stress</div>
-							<div style="width:10px;display:inline-block"></div>
-							<div class="subtitle apt-title center" style="width:75px;" data-i18n="traumas">Traumas</div>
+							<div class="subtitle apt-title center" style="width:70px;margin-right:0px;" data-i18n="stress">Stress</div>
+							<div class="subtitle apt-title center" style="width:70px;margin-right:0px;" data-i18n="traumas">Traumas</div>
+							<div class="subtitle apt-title center" style="width:70px;" data-i18n="malus">Malus</div>
 						</div>
 					</div>
 				</div>
@@ -173,25 +271,25 @@
 						<div class="sheet-line">
 							<div style="width:100px;margin-right:10px;" class="sheet-column">
 								<button type="roll" name="roll_initiative" style="width:100px;" class="default-btn center" value="
-								@{gm} &{template:EPdefault} {{name=^{initiative}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{initiative}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
+								@{gm} &{template:EPdefault} {{name=^{initiative}}} {{subname=^{score}}} {{roll=[[1D10+[[@{initiative}]] ]]}} {{title-roll=^{roll}}}">
 									<div class="apt-title center" data-i18n="initiative">Initiative</div>
 								</button>
 							</div>
 							<div style="width:100px;margin-right:10px;" class="sheet-column">
 								<button type="roll" name="roll_basic-perception" style="width:100px;" class="default-btn center" value="
-								@{gm} &{template:EPdefault} {{name=^{basic perception}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{basicPerception}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+								@{gm} &{template:EPdefault} {{name=^{basic perception}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{basicPerception}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 									<div class="apt-title center" data-i18n="basic perception">Basic Perception</div>
 								</button>
 							</div>
 							<div style="width:100px;margin-right:10px;" class="sheet-column">
 								<button type="roll" name="roll_combat-fray-melee" style="width:100px;" class="default-btn center" value="
-								@{gm} &{template:EPdefault} {{name=^{fray vs melee}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{fray}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+								@{gm} &{template:EPdefault} {{name=^{fray vs melee}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{fray}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 									<div class="apt-title center" data-i18n="fray vs melee">Fray VS Melee</div>
 								</button>
 							</div>
 							<div style="width:100px;" class="sheet-column">
 								<button type="roll" name="roll_combat-fray-ranged" style="width:100px;" class="default-btn center" value="
-								@{gm} &{template:EPdefault} {{name=^{fray vs ranged}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{frayRanged}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+								@{gm} &{template:EPdefault} {{name=^{fray vs ranged}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{frayRanged}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 									<div class="apt-title center" data-i18n="fray vs ranged">Fray VS Ranged</div>
 								</button>
 							</div>
@@ -276,7 +374,7 @@
 			<div class="hidden">
 				<div class="sheet-line">
 					<button type="roll" name="roll_skill-know" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{know}}} {{subname=^{score}}} {{subskill=@{spe-know}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-know}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{know}}} {{subname=^{score}}} {{subskill=@{spe-know}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-know}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="know">Know</div>
 					</button>
 					<input type="text" name="attr_spe-know" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -291,7 +389,7 @@
 				<fieldset class="repeating_know">
 					<div class="sheet-line">
 						<button type="roll" name="roll_skill-repeating-know" class="sheet-skills-btn" value="
-						@{gm} &{template:EPdefault} {{name=^{know}}} {{subname=^{score}}} {{subskill=@{spe-repeating-know}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-repeating-know}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+						@{gm} &{template:EPdefault} {{name=^{know}}} {{subname=^{score}}} {{subskill=@{spe-repeating-know}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-repeating-know}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 							<div class="name-skills" data-i18n="know">Know</div>
 						</button>
 						<input type="text" name="attr_spe-repeating-know" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -320,7 +418,7 @@
 			<div data-i18n-list="active-skills-list" class="hidden">
 				<div class="sheet-line" data-i18n-list-item="athletics">
 					<button type="roll" name="roll_skill-athletics" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{athletics}}} {{subname=^{score}}} {{subskill=@{spe-athletics}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-athletics}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{athletics}}} {{subname=^{score}}} {{subskill=@{spe-athletics}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-athletics}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="athletics">Athletics</div>
 					</button>
 					<input type="text" name="attr_spe-athletics" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -333,7 +431,7 @@
 				</div>
 				<div class="sheet-line" data-i18n-list-item="deceive">
 					<button type="roll" name="roll_skill-deceive" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{deceive}}} {{subname=^{score}}} {{subskill=@{spe-deceive}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-deceive}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{deceive}}} {{subname=^{score}}} {{subskill=@{spe-deceive}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-deceive}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="deceive">Deceive</div>
 					</button>
 					<input type="text" name="attr_spe-deceive" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -347,7 +445,7 @@
 				<div data-i18n-list-item="exotic skill">
 					<div class="sheet-line">
 						<button type="roll" name="roll_skill-exotic-skill" class="sheet-skills-btn" value="
-						@{gm} &{template:EPdefault} {{name=^{exotic skill}}} {{subname=^{score}}} {{subskill=@{spe-exotic-skill}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-exotic-skill}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+						@{gm} &{template:EPdefault} {{name=^{exotic skill}}} {{subname=^{score}}} {{subskill=@{spe-exotic-skill}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-exotic-skill}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 							<div class="name-skills" data-i18n="exotic skill">Exotic Skill</div>
 						</button>
 						<input type="text" name="attr_spe-exotic-skill" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -367,7 +465,7 @@
 					<fieldset class="repeating_exotic-skill">
 						<div class="sheet-line">
 							<button type="roll" name="roll_skill-repeating-exotic-skill" class="sheet-skills-btn" value="
-							@{gm} &{template:EPdefault} {{name=^{exotic skill}}} {{subname=^{score}}} {{subskill=@{spe-repeating-exotic-skill}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-repeating-exotic-skill}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+							@{gm} &{template:EPdefault} {{name=^{exotic skill}}} {{subname=^{score}}} {{subskill=@{spe-repeating-exotic-skill}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-repeating-exotic-skill}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 								<div class="name-skills" data-i18n="exotic skill">Exotic Skill</div>
 							</button>
 							<input type="text" name="attr_spe-repeating-exotic-skill" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -388,7 +486,7 @@
 				</div>
 				<div class="sheet-line" data-i18n-list-item="fray">
 					<button type="roll" name="roll_skill-fray" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{fray}}} {{subname=^{score}}} {{subskill=@{spe-fray}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-fray}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{fray}}} {{subname=^{score}}} {{subskill=@{spe-fray}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-fray}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="fray">Fray</div>
 					</button>
 					<input type="text" name="attr_spe-fray" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -401,7 +499,7 @@
 				</div>
 				<div class="sheet-line" data-i18n-list-item="free fall">
 					<button type="roll" name="roll_skill-free-fall" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{free fall}}} {{subname=^{score}}} {{subskill=@{spe-free-fall}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-free-fall}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{free fall}}} {{subname=^{score}}} {{subskill=@{spe-free-fall}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-free-fall}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="free fall">Free Fall</div>
 					</button>
 					<input type="text" name="attr_spe-free-fall" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -414,7 +512,7 @@
 				</div>
 				<div class="sheet-line" data-i18n-list-item="guns">
 					<button type="roll" name="roll_skill-guns" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{guns}}} {{subname=^{score}}} {{subskill=@{spe-guns}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-guns}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{guns}}} {{subname=^{score}}} {{subskill=@{spe-guns}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-guns}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="guns">Guns</div>
 					</button>
 					<input type="text" name="attr_spe-guns" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -428,7 +526,7 @@
 				<div data-i18n-list-item="hardware">
 					<div class="sheet-line">
 						<button type="roll" name="roll_skill-hardware" class="sheet-skills-btn" value="
-						@{gm} &{template:EPdefault} {{name=^{hardware}}} {{subname=^{score}}} {{subskill=@{spe-hardware}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-hardware}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+						@{gm} &{template:EPdefault} {{name=^{hardware}}} {{subname=^{score}}} {{subskill=@{spe-hardware}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-hardware}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 							<div class="name-skills" data-i18n="hardware">Hardware</div>
 						</button>
 						<input type="text" name="attr_spe-hardware" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -442,7 +540,7 @@
 					<fieldset class="repeating_hardware">
 						<div class="sheet-line">
 							<button type="roll" name="roll_skill-repeating-hardware" class="sheet-skills-btn" value="
-							@{gm} &{template:EPdefault} {{name=^{hardware}}} {{subname=^{score}}} {{subskill=@{spe-repeating-hardware}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-repeating-hardware}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+							@{gm} &{template:EPdefault} {{name=^{hardware}}} {{subname=^{score}}} {{subskill=@{spe-repeating-hardware}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-repeating-hardware}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 								<div class="name-skills" data-i18n="hardware">Hardware</div>
 							</button>
 							<input type="text" name="attr_spe-repeating-hardware" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -457,7 +555,7 @@
 				</div>
 				<div class="sheet-line" data-i18n-list-item="infiltrate">
 					<button type="roll" name="roll_skill-infiltrate" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{infiltrate}}} {{subname=^{score}}} {{subskill=@{spe-infiltrate}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-infiltrate}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{infiltrate}}} {{subname=^{score}}} {{subskill=@{spe-infiltrate}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-infiltrate}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="infiltrate">Infiltrate</div>
 					</button>
 					<input type="text" name="attr_spe-infiltrate" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -470,7 +568,7 @@
 				</div>
 				<div class="sheet-line" data-i18n-list-item="infosec">
 					<button type="roll" name="roll_skill-infosec" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{infosec}}} {{subname=^{score}}} {{subskill=@{spe-infosec}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-infosec}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{infosec}}} {{subname=^{score}}} {{subskill=@{spe-infosec}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-infosec}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="infosec">Infosec</div>
 					</button>
 					<input type="text" name="attr_spe-infosec" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -483,7 +581,7 @@
 				</div>
 				<div class="sheet-line" data-i18n-list-item="interface">
 					<button type="roll" name="roll_skill-interface" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{interface}}} {{subname=^{score}}} {{subskill=@{spe-interface}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-interface}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{interface}}} {{subname=^{score}}} {{subskill=@{spe-interface}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-interface}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="interface">Interface</div>
 					</button>
 					<input type="text" name="attr_spe-interface" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -496,7 +594,7 @@
 				</div>
 				<div class="sheet-line" data-i18n-list-item="kinesics">
 					<button type="roll" name="roll_skill-kinesics" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{kinesics}}} {{subname=^{score}}} {{subskill=@{spe-kinesics}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-kinesics}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{kinesics}}} {{subname=^{score}}} {{subskill=@{spe-kinesics}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-kinesics}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="kinesics">Kinesics</div>
 					</button>
 					<input type="text" name="attr_spe-kinesics" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -510,7 +608,7 @@
 				<div data-i18n-list-item="medicine">
 					<div class="sheet-line">
 						<button type="roll" name="roll_skill-medicine" class="sheet-skills-btn" value="
-						@{gm} &{template:EPdefault} {{name=^{medicine}}} {{subname=^{score}}} {{subskill=@{spe-medicine}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-medicine}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+						@{gm} &{template:EPdefault} {{name=^{medicine}}} {{subname=^{score}}} {{subskill=@{spe-medicine}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-medicine}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 							<div class="name-skills" data-i18n="medicine">Medicine</div>
 						</button>
 						<input type="text" name="attr_spe-medicine" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -524,7 +622,7 @@
 					<fieldset class="repeating_medicine">
 						<div class="sheet-line">
 							<button type="roll" name="roll_skill-repeating-medicine" class="sheet-skills-btn" value="
-							@{gm} &{template:EPdefault} {{name=^{medicine}}} {{subname=^{score}}} {{subskill=@{spe-repeating-medicine}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-repeating-medicine}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+							@{gm} &{template:EPdefault} {{name=^{medicine}}} {{subname=^{score}}} {{subskill=@{spe-repeating-medicine}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-repeating-medicine}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 								<div class="name-skills" data-i18n="medicine">Medicine</div>
 							</button>
 							<input type="text" name="attr_spe-repeating-medicine" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -539,7 +637,7 @@
 				</div>
 				<div class="sheet-line" data-i18n-list-item="melee">
 					<button type="roll" name="roll_skill-melee" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{melee}}} {{subname=^{score}}} {{subskill=@{spe-melee}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-melee}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{melee}}} {{subname=^{score}}} {{subskill=@{spe-melee}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-melee}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="melee">Melee</div>
 					</button>
 					<input type="text" name="attr_spe-melee" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -552,7 +650,7 @@
 				</div>
 				<div class="sheet-line" data-i18n-list-item="perceive">
 					<button type="roll" name="roll_skill-perceive" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{perceive}}} {{subname=^{score}}} {{subskill=@{spe-perceive}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-perceive}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{perceive}}} {{subname=^{score}}} {{subskill=@{spe-perceive}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-perceive}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="perceive">Perceive</div>
 					</button>
 					<input type="text" name="attr_spe-perceive" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -565,7 +663,7 @@
 				</div>
 				<div class="sheet-line" data-i18n-list-item="persuade">
 					<button type="roll" name="roll_skill-persuade" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{persuade}}} {{subname=^{score}}} {{subskill=@{spe-persuade}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-persuade}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{persuade}}} {{subname=^{score}}} {{subskill=@{spe-persuade}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-persuade}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="persuade">Persuade</div>
 					</button>
 					<input type="text" name="attr_spe-persuade" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -579,7 +677,7 @@
 				<div data-i18n-list-item="pilot">
 					<div class="sheet-line">
 						<button type="roll" name="roll_skill-pilot" class="sheet-skills-btn" value="
-						@{gm} &{template:EPdefault} {{name=^{pilot}}} {{subname=^{score}}} {{subskill=@{spe-pilot}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-pilot}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+						@{gm} &{template:EPdefault} {{name=^{pilot}}} {{subname=^{score}}} {{subskill=@{spe-pilot}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-pilot}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 							<div class="name-skills" data-i18n="pilot">Pilot</div>
 						</button>
 						<input type="text" name="attr_spe-pilot" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -593,7 +691,7 @@
 					<fieldset class="repeating_pilot">
 						<div class="sheet-line">
 							<button type="roll" name="roll_skill-repeating-pilot" class="sheet-skills-btn" value="
-							@{gm} &{template:EPdefault} {{name=^{pilot}}} {{subname=^{score}}} {{subskill=@{spe-repeating-pilot}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-repeating-pilot}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+							@{gm} &{template:EPdefault} {{name=^{pilot}}} {{subname=^{score}}} {{subskill=@{spe-repeating-pilot}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-repeating-pilot}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 								<div class="name-skills" data-i18n="pilot">Pilot</div>
 							</button>
 							<input type="text" name="attr_spe-repeating-pilot" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -606,39 +704,9 @@
 						</div>
 					</fieldset>
 				</div>
-				<div data-i18n-list-item="profession">
-					<div class="sheet-line">
-						<button type="roll" name="roll_skill-profession" class="sheet-skills-btn" value="
-						@{gm} &{template:EPdefault} {{name=^{profession}}} {{subname=^{score}}} {{subskill=@{spe-profession}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-profession}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
-							<div class="name-skills" data-i18n="profession">Profession</div>
-						</button>
-						<input type="text" name="attr_spe-profession" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
-						<input type="number" name="attr_total-profession" class="center" style="width:65px;border-color:#ccc" value="(@{cognition}+@{rank-profession}+@{temp-profession})" disabled />
-						<input type="number" name="attr_rank-profession" class="center" style="width:65px;" value="0" />
-						<input type="number" name="attr_temp-profession" class="center" style="width:65px;" value="0" />
-						<select name="attr_apt-profession" style="width:65px;margin:0px;" disabled>
-							<option value="@{cognition}" data-i18n="cognition short" selected>COG</option>
-						</select>
-					</div>
-					<fieldset class="repeating_profession">
-						<div class="sheet-line">
-							<button type="roll" name="roll_skill-repeating-profession" class="sheet-skills-btn" value="
-							@{gm} &{template:EPdefault} {{name=^{profession}}} {{subname=^{score}}} {{subskill=@{spe-repeating-profession}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-repeating-profession}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
-								<div class="name-skills" data-i18n="profession">Profession</div>
-							</button>
-							<input type="text" name="attr_spe-repeating-profession" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
-							<input type="number" name="attr_total-repeating-profession" class="center" style="width:65px;border-color:#ccc" value="(@{cognition}+@{rank-repeating-profession}+@{temp-repeating-profession})" disabled />
-							<input type="number" name="attr_rank-repeating-profession" class="center" style="width:65px;" value="0" />
-							<input type="number" name="attr_temp-repeating-profession" class="center" style="width:65px;" value="0" />
-							<select name="attr_apt-repeating-profession" style="width:65px;margin:0px;" disabled>
-								<option value="@{cognition}" data-i18n="cognition short" selected>COG</option>
-							</select>
-						</div>
-					</fieldset>
-				</div>
 				<div class="sheet-line" data-i18n-list-item="program">
 					<button type="roll" name="roll_skill-program" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{program}}} {{subname=^{score}}} {{subskill=@{spe-program}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-program}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{program}}} {{subname=^{score}}} {{subskill=@{spe-program}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-program}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="program">Program</div>
 					</button>
 					<input type="text" name="attr_spe-program" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -651,7 +719,7 @@
 				</div>
 				<div class="sheet-line" data-i18n-list-item="provoke">
 					<button type="roll" name="roll_skill-provoke" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{provoke}}} {{subname=^{score}}} {{subskill=@{spe-provoke}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-provoke}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{provoke}}} {{subname=^{score}}} {{subskill=@{spe-provoke}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-provoke}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="provoke">Provoke</div>
 					</button>
 					<input type="text" name="attr_spe-provoke" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -664,7 +732,7 @@
 				</div>
 				<div class="sheet-line" data-i18n-list-item="psi">
 					<button type="roll" name="roll_skill-psi" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{psi}}} {{subname=^{score}}} {{subskill=@{spe-psi}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-psi}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{psi}}} {{subname=^{score}}} {{subskill=@{spe-psi}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-psi}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="psi">Psi</div>
 					</button>
 					<input type="text" name="attr_spe-psi" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -677,7 +745,7 @@
 				</div>
 				<div class="sheet-line" data-i18n-list-item="research">
 					<button type="roll" name="roll_skill-research" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{research}}} {{subname=^{score}}} {{subskill=@{spe-research}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-research}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{research}}} {{subname=^{score}}} {{subskill=@{spe-research}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-research}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="research">Research</div>
 					</button>
 					<input type="text" name="attr_spe-research" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -690,7 +758,7 @@
 				</div>
 				<div class="sheet-line" data-i18n-list-item="survival">
 					<button type="roll" name="roll_skill-survival" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{survival}}} {{subname=^{score}}} {{subskill=@{spe-survival}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-survival}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{survival}}} {{subname=^{score}}} {{subskill=@{spe-survival}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-survival}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="survival">Survival</div>
 					</button>
 					<input type="text" name="attr_spe-survival" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -759,7 +827,7 @@
 							<input type="checkbox" name="attr_weapon-ranged-expand" class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"><span class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"></span>
 							<div class="sheet-line sheet-expandHide" style="width:330px;">
 								<button type="roll" name="roll_ranged-weapon-btn" style="width:335px;" class="sheet-default-btn" value="
-								@{gm} &{template:EPcombat} {{name=@{ranged-weapon-name}}} {{subname=^{score}}} @{weapon-ranged-firing-modes} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-guns}]]-[[@{malus}*10]]]]}} {{title-range=^{range}}} {{range=@{ranged-weapon-range}}} {{title-damage=^{damage}}} {{damage=[[@{ranged-weapon-dv}]]}} {{title-reload=^{reload}}} {{title-type-reload=^{Semi Auto / Burst Fire / Full Auto short}}} {{reload=@{ranged-weapon-reload}}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}} {{notes=@{ranged-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-ranged_superior-result-dmg)}}">
+								@{gm} &{template:EPcombat} {{name=@{ranged-weapon-name}}} {{subname=^{score}}} @{weapon-ranged-firing-modes} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-guns}]]-[[@{malus}]]]]}} {{title-range=^{range}}} {{range=@{ranged-weapon-range}}} {{title-damage=^{damage}}} {{damage=[[@{ranged-weapon-dv}]]}} {{title-reload=^{reload}}} {{title-type-reload=^{Semi Auto / Burst Fire / Full Auto short}}} {{reload=@{ranged-weapon-reload}}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}} {{notes=@{ranged-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-ranged_superior-result-dmg)}}">
 									<span style="width:335px;" class="name-skills" name="attr_ranged-weapon-name"></span>
 								</button>
 							</div>
@@ -795,7 +863,7 @@
 							<input type="checkbox" name="attr_weapon-melee-expand" class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"><span class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"></span>
 							<div class="sheet-line sheet-expandHide" style="width:330px;">
 								<button type="roll" name="roll_melee-weapon-btn" style="width:335px;" class="sheet-default-btn" value="
-								@{gm} &{template:EPcombat} {{name=@{melee-weapon-name}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-melee}]]-[[@{malus}*10]]]]}} {{subname=^{score}}} {{title-damage=^{damage}}} {{damage=[[@{melee-weapon-dv}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}} {{notes=@{melee-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-melee_superior-result-dmg)}}">
+								@{gm} &{template:EPcombat} {{name=@{melee-weapon-name}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-melee}]]-[[@{malus}]]]]}} {{subname=^{score}}} {{title-damage=^{damage}}} {{damage=[[@{melee-weapon-dv}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}} {{notes=@{melee-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-melee_superior-result-dmg)}}">
 									<span style="width:335px;" class="name-skills" name="attr_melee-weapon-name"></span>
 								</button>
 							</div>
@@ -829,7 +897,7 @@
 							<input type="checkbox" name="attr_weapon-ranged-expand" class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"><span class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"></span>
 							<div class="sheet-line sheet-expandHide" style="width:330px;">
 								<button type="roll" name="roll_seeker-weapon-btn" style="width:335px;" class="sheet-default-btn" value="
-								@{gm} &{template:EPcombat} {{name=@{seeker-weapon-name}}} @{seeker-weapon-skill} {{roll=[[[[1D100-1]]]]}}  {{title-range=^{range}}} {{range=@{seeker-weapon-range}}} {{title-damage=^{damage}}} {{damage=[[@{seeker-weapon-dv}]]}} {{title-reload=^{reload}}} {{title-type-reload=^{Semi Auto / Burst Fire / Full Auto short}}} {{reload=@{seeker-weapon-reload}}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}} {{notes=@{seeker-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-seeker_superior-result-dmg)}}">
+								@{gm} &{template:EPcombat} {{name=@{seeker-weapon-name}}} @{seeker-weapon-skill} {{roll=[[[[1D100-1]]]]}}  {{title-range=^{range}}} {{range=@{seeker-weapon-range}}} {{title-damage=^{damage}}} {{damage=[[@{seeker-weapon-dv}]]}} {{title-reload=^{reload}}} {{title-type-reload=^{Semi Auto / Burst Fire / Full Auto short}}} {{reload=@{seeker-weapon-reload}}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}} {{notes=@{seeker-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-seeker_superior-result-dmg)}}">
 									<span style="width:335px;" class="name-skills" name="attr_seeker-weapon-name"></span>
 								</button>
 							</div>
@@ -849,8 +917,8 @@
 									<input type="text" name="attr_seeker-weapon-ammo-type" class="sheet-lower-input apt-title" style="width:95px;" data-i18n-placeholder="micro ex" placeholder="Micro, ..." value="">
 									<input type="text" name="attr_seeker-weapon-armor-used" class="sheet-lower-input apt-title" style="width:95px;" data-i18n-placeholder="emp gas ex" placeholder="EMP, Gas, ..." value="-">
 									<select name="attr_seeker-weapon-skill" class="center" style="width:95px;padding:0px;margin:0px;height:23px;">
-										<option value="{{target=[[[[@{total-guns}]]-[[@{malus}*10]]]]}} {{subname=^{guns}}}" data-i18n="guns" selected>Guns</option>
-										<option value="{{target=[[[[@{total-athletics}]]-[[@{malus}*10]]]]}} {{subname=^{athletics}}}" data-i18n="athletics">Athletics</option>
+										<option value="{{target=[[[[@{total-guns}]]-[[@{malus}]]]]}} {{subname=^{guns}}}" data-i18n="guns" selected>Guns</option>
+										<option value="{{target=[[[[@{total-athletics}]]-[[@{malus}]]]]}} {{subname=^{athletics}}}" data-i18n="athletics">Athletics</option>
 									</select>
 								</div>
 								<div class="sheet-line center" style="padding-left:10px;">
@@ -1045,7 +1113,7 @@
 					<input type="number" name="attr_rank-muse-deceive" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-deceive" class="center" style="width:65px;" value="0" />
 					<select name="attr_apt-muse-deceive" style="width:65px;margin:0px;" disabled>
-						<option value="@{savvyMuse}" data-i18n="savvyMuse short" selected>SAV</option>
+						<option value="@{savvyMuse}" data-i18n="savvy short" selected>SAV</option>
 					</select>
 				</div>
 				<div data-i18n-list-item="exotic skill">
@@ -1208,7 +1276,7 @@
 					<input type="number" name="attr_rank-muse-kinesics" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-kinesics" class="center" style="width:65px;" value="0" />
 					<select name="attr_apt-muse-kinesics" style="width:65px;margin:0px;" disabled>
-						<option value="@{savvyMuse}" data-i18n="savvyMuse short" selected>SAV</option>
+						<option value="@{savvyMuse}" data-i18n="savvy short" selected>SAV</option>
 					</select>
 				</div>
 				<div data-i18n-list-item="medicine">
@@ -1277,7 +1345,7 @@
 					<input type="number" name="attr_rank-muse-persuade" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-persuade" class="center" style="width:65px;" value="0" />
 					<select name="attr_apt-muse-persuade" style="width:65px;margin:0px;" disabled>
-						<option value="@{savvyMuse}" data-i18n="savvyMuse short" selected>SAV</option>
+						<option value="@{savvyMuse}" data-i18n="savvy short" selected>SAV</option>
 					</select>
 				</div>
 				<div data-i18n-list-item="pilot">
@@ -1363,7 +1431,7 @@
 					<input type="number" name="attr_rank-muse-provoke" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-provoke" class="center" style="width:65px;" value="0" />
 					<select name="attr_apt-muse-provoke" style="width:65px;margin:0px;" disabled>
-						<option value="@{savvyMuse}" data-i18n="savvyMuse short" selected>SAV</option>
+						<option value="@{savvyMuse}" data-i18n="savvy short" selected>SAV</option>
 					</select>
 				</div>
 				<div class="sheet-line" data-i18n-list-item="psi">
@@ -1410,10 +1478,10 @@
 	</div>
 </div>
 <div class="sheet-hidden sheet-tab5Show" style="width:820px;">
-	<input type="radio" name="attr_morphTab" class="morphTab morphTab-130px morphTab1" value="1" checked="checked"><span class="morphTab morphTab-130px" name="attr_nameM1"></span>
-	<input type="radio" name="attr_morphTab" class="morphTab morphTab-130px morphTab2" value="2"><span class="morphTab2 morphTab-130px" name="attr_nameM2"></span>
-	<input type="radio" name="attr_morphTab" class="morphTab morphTab-130px morphTab3" style="margin-left:-13px" value="3"><span class="morphTab2 morphTab-130px" name="attr_nameM3"></span>
-	<input type="radio" name="attr_morphTab" class="morphTab morphTab-130px morphTab4" style="margin-left:-13px" value="4"><span class="morphTab2 morphTab-130px" name="attr_nameM4"></span>
+	<input type="radio" name="attr_morphTab" class="morphTab morphTab-130px morphTab1" value="@{physMalusM1}" checked="checked"><span class="morphTab morphTab-130px" name="attr_nameM1"></span>
+	<input type="radio" name="attr_morphTab" class="morphTab morphTab-130px morphTab2" value="@{physMalusM2}"><span class="morphTab2 morphTab-130px" name="attr_nameM2"></span>
+	<input type="radio" name="attr_morphTab" class="morphTab morphTab-130px morphTab3" style="margin-left:-13px" value="@{physMalusM3}"><span class="morphTab2 morphTab-130px" name="attr_nameM3"></span>
+	<input type="radio" name="attr_morphTab" class="morphTab morphTab-130px morphTab4" style="margin-left:-13px" value="@{physMalusM4}"><span class="morphTab2 morphTab-130px" name="attr_nameM4"></span>
 	
 	<div class="hidden morphTab1Show morphBlock">
 		<div class="sheet-line" style="margin-bottom:-30px;">
@@ -1427,7 +1495,7 @@
 			</div>
 		</div>
 		<div class="sheet-line" style="margin-bottom:20px;">
-			<div class="sheet-column" style="width:545px;margin-right:53px">
+			<div class="sheet-column" style="width:545px;margin-right:3px">
 				<div class="block-title block-title-morph" data-i18n="pool">Pool</div>
 				<div class="block">
 					<div class="sheet-line">
@@ -1490,32 +1558,34 @@
 				</div>
 			</div>
 			
-			<div class="sheet-column">
+			<div class="sheet-column" style="width:268px;">
 				<div class="block-title block-title-morph" data-i18n="physique">Physique</div>
 				<div class="block">
 					<div class="sheet-line">
-						<input type="number" name="attr_durM1" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="durability" title="Durability" value="0">
-						<input type="number" name="attr_wtM1" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="wound treshold" title="Wound Treshold" value="0">
-						<input type="number" name="attr_drM1" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="death rating" title="Death Rating" value="0">
+						<input type="number" name="attr_durM1" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="durability" title="Durability" value="0">
+						<input type="number" name="attr_wtM1" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="wound treshold" title="Wound Treshold" value="0">
+						<input type="number" name="attr_drM1" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="death rating" title="Death Rating" value="0">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="durability short">DUR</div>
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="wound treshold short">WT</div>
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="death rating short">DR</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="durability short">DUR</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="wound treshold short">WT</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="death rating short">DR</div>
 					</div>
 					<div class="sheet-line">
-						<input type="number" name="attr_dmg" class="sheet-lower-input apt-title" style="width:82px;" data-i18n-title="damage" title="Damage" value="0">
-						<input type="number" name="attr_wnd" class="sheet-lower-input apt-title" style="width:82px;" data-i18n-title="wounds" title="Wounds" value="0">
+						<input type="number" name="attr_dmgM1" class="sheet-lower-inputWMargin center" style="width:70px;" data-i18n-title="damage" title="Damage" value="0">
+						<input type="number" name="attr_wndM1" class="sheet-lower-inputWMargin center" style="width:80px;" data-i18n-title="wounds" title="Wounds" value="0">
+						<input type="number" name="attr_physMalusM1" class="sheet-lower-input center" style="width:70px;" data-i18n-title="malus" title="Malus" value="0">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:82px;" data-i18n="damage">Damage</div>
-						<div class="subtitle apt-title center" style="width:82px;" data-i18n="wounds">Wounds</div>
+						<div class="subtitle apt-title center" style="width:70px;margin-right:0px;" data-i18n="damage">Damage</div>
+						<div class="subtitle apt-title center" style="width:80px;margin-right:0px;" data-i18n="wounds">Wounds</div>
+						<div class="subtitle apt-title center" style="width:70px;" data-i18n="malus">Malus</div>
 					</div>
 					<div class="sheet-line">
-						<input type="text" name="attr_moveM1" class="sheet-lower-input apt-title" style="width:177px;" value="">
+						<input type="text" name="attr_moveM1" class="sheet-lower-input apt-title" style="width:228px;" value="">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:177px;" data-i18n="movement rating">Movement Rating</div>
+						<div class="subtitle apt-title center" style="width:228px;" data-i18n="movement rating">Movement Rating</div>
 					</div>
 				</div>
 			</div>
@@ -1635,7 +1705,7 @@
 			</div>
 		</div>
 		<div class="sheet-line" style="margin-bottom:20px;">
-			<div class="sheet-column" style="width:545px;margin-right:53px">
+			<div class="sheet-column" style="width:545px;margin-right:3px">
 				<div class="block-title block-title-morph" data-i18n="pool">Pool</div>
 				<div class="block">
 					<div class="sheet-line">
@@ -1698,32 +1768,34 @@
 				</div>
 			</div>
 			
-			<div class="sheet-column">
+			<div class="sheet-column" style="width:268px;">
 				<div class="block-title block-title-morph" data-i18n="physique">Physique</div>
 				<div class="block">
 					<div class="sheet-line">
-						<input type="number" name="attr_durM2" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="durability" title="Durability" value="0">
-						<input type="number" name="attr_wtM2" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="wound treshold" title="Wound Treshold" value="0">
-						<input type="number" name="attr_drM2" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="death rating" title="Death Rating" value="0">
+						<input type="number" name="attr_durM2" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="durability" title="Durability" value="0">
+						<input type="number" name="attr_wtM2" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="wound treshold" title="Wound Treshold" value="0">
+						<input type="number" name="attr_drM2" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="death rating" title="Death Rating" value="0">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="durability short">DUR</div>
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="wound treshold short">WT</div>
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="death rating short">DR</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="durability short">DUR</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="wound treshold short">WT</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="death rating short">DR</div>
 					</div>
 					<div class="sheet-line">
-						<input type="number" name="attr_dmg" class="sheet-lower-input apt-title" style="width:82px;" data-i18n-title="damage" title="Damage" value="0">
-						<input type="number" name="attr_wnd" class="sheet-lower-input apt-title" style="width:82px;" data-i18n-title="wounds" title="Wounds" value="0">
+						<input type="number" name="attr_dmgM2" class="sheet-lower-inputWMargin center" style="width:70px;" data-i18n-title="damage" title="Damage" value="0">
+						<input type="number" name="attr_wndM2" class="sheet-lower-inputWMargin center" style="width:80px;" data-i18n-title="wounds" title="Wounds" value="0">
+						<input type="number" name="attr_physMalusM2" class="sheet-lower-input center" style="width:70px;" data-i18n-title="malus" title="Malus" value="0">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:82px;" data-i18n="damage">Damage</div>
-						<div class="subtitle apt-title center" style="width:82px;" data-i18n="wounds">Wounds</div>
+						<div class="subtitle apt-title center" style="width:70px;margin-right:0px;" data-i18n="damage">Damage</div>
+						<div class="subtitle apt-title center" style="width:80px;margin-right:0px;" data-i18n="wounds">Wounds</div>
+						<div class="subtitle apt-title center" style="width:70px;" data-i18n="malus">Malus</div>
 					</div>
 					<div class="sheet-line">
-						<input type="text" name="attr_moveM2" class="sheet-lower-input apt-title" style="width:177px;" value="">
+						<input type="text" name="attr_moveM2" class="sheet-lower-input apt-title" style="width:228px;" value="">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:177px;" data-i18n="movement rating">Movement Rating</div>
+						<div class="subtitle apt-title center" style="width:228px;" data-i18n="movement rating">Movement Rating</div>
 					</div>
 				</div>
 			</div>
@@ -1843,7 +1915,7 @@
 			</div>
 		</div>
 		<div class="sheet-line" style="margin-bottom:20px;">
-			<div class="sheet-column" style="width:545px;margin-right:53px">
+			<div class="sheet-column" style="width:545px;margin-right:3px">
 				<div class="block-title block-title-morph" data-i18n="pool">Pool</div>
 				<div class="block">
 					<div class="sheet-line">
@@ -1906,32 +1978,34 @@
 				</div>
 			</div>
 			
-			<div class="sheet-column">
+			<div class="sheet-column" style="width:268px;">
 				<div class="block-title block-title-morph" data-i18n="physique">Physique</div>
 				<div class="block">
 					<div class="sheet-line">
-						<input type="number" name="attr_durM3" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="durability" title="Durability" value="0">
-						<input type="number" name="attr_wtM3" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="wound treshold" title="Wound Treshold" value="0">
-						<input type="number" name="attr_drM3" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="death rating" title="Death Rating" value="0">
+						<input type="number" name="attr_durM3" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="durability" title="Durability" value="0">
+						<input type="number" name="attr_wtM3" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="wound treshold" title="Wound Treshold" value="0">
+						<input type="number" name="attr_drM3" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="death rating" title="Death Rating" value="0">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="durability short">DUR</div>
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="wound treshold short">WT</div>
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="death rating short">DR</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="durability short">DUR</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="wound treshold short">WT</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="death rating short">DR</div>
 					</div>
 					<div class="sheet-line">
-						<input type="number" name="attr_dmg" class="sheet-lower-input apt-title" style="width:82px;" data-i18n-title="damage" title="Damage" value="0">
-						<input type="number" name="attr_wnd" class="sheet-lower-input apt-title" style="width:82px;" data-i18n-title="wounds" title="Wounds" value="0">
+						<input type="number" name="attr_dmgM3" class="sheet-lower-inputWMargin center" style="width:70px;" data-i18n-title="damage" title="Damage" value="0">
+						<input type="number" name="attr_wndM3" class="sheet-lower-inputWMargin center" style="width:80px;" data-i18n-title="wounds" title="Wounds" value="0">
+						<input type="number" name="attr_physMalusM3" class="sheet-lower-input center" style="width:70px;" data-i18n-title="malus" title="Malus" value="0">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:82px;" data-i18n="damage">Damage</div>
-						<div class="subtitle apt-title center" style="width:82px;" data-i18n="wounds">Wounds</div>
+						<div class="subtitle apt-title center" style="width:70px;margin-right:0px;" data-i18n="damage">Damage</div>
+						<div class="subtitle apt-title center" style="width:80px;margin-right:0px;" data-i18n="wounds">Wounds</div>
+						<div class="subtitle apt-title center" style="width:70px;" data-i18n="malus">Malus</div>
 					</div>
 					<div class="sheet-line">
-						<input type="text" name="attr_moveM3" class="sheet-lower-input apt-title" style="width:177px;" value="">
+						<input type="text" name="attr_moveM3" class="sheet-lower-input apt-title" style="width:228px;" value="">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:177px;" data-i18n="movement rating">Movement Rating</div>
+						<div class="subtitle apt-title center" style="width:228px;" data-i18n="movement rating">Movement Rating</div>
 					</div>
 				</div>
 			</div>
@@ -2051,7 +2125,7 @@
 			</div>
 		</div>
 		<div class="sheet-line" style="margin-bottom:20px;">
-			<div class="sheet-column" style="width:545px;margin-right:53px">
+			<div class="sheet-column" style="width:545px;margin-right:3px">
 				<div class="block-title block-title-morph" data-i18n="pool">Pool</div>
 				<div class="block">
 					<div class="sheet-line">
@@ -2114,32 +2188,34 @@
 				</div>
 			</div>
 			
-			<div class="sheet-column">
+			<div class="sheet-column" style="width:268px;">
 				<div class="block-title block-title-morph" data-i18n="physique">Physique</div>
 				<div class="block">
 					<div class="sheet-line">
-						<input type="number" name="attr_durM4" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="durability" title="Durability" value="0">
-						<input type="number" name="attr_wtM4" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="wound treshold" title="Wound Treshold" value="0">
-						<input type="number" name="attr_drM4" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="death rating" title="Death Rating" value="0">
+						<input type="number" name="attr_durM4" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="durability" title="Durability" value="0">
+						<input type="number" name="attr_wtM4" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="wound treshold" title="Wound Treshold" value="0">
+						<input type="number" name="attr_drM4" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="death rating" title="Death Rating" value="0">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="durability short">DUR</div>
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="wound treshold short">WT</div>
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="death rating short">DR</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="durability short">DUR</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="wound treshold short">WT</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="death rating short">DR</div>
 					</div>
 					<div class="sheet-line">
-						<input type="number" name="attr_dmg" class="sheet-lower-input apt-title" style="width:82px;" data-i18n-title="damage" title="Damage" value="0">
-						<input type="number" name="attr_wnd" class="sheet-lower-input apt-title" style="width:82px;" data-i18n-title="wounds" title="Wounds" value="0">
+						<input type="number" name="attr_dmgM4" class="sheet-lower-inputWMargin center" style="width:70px;" data-i18n-title="damage" title="Damage" value="0">
+						<input type="number" name="attr_wndM4" class="sheet-lower-inputWMargin center" style="width:80px;" data-i18n-title="wounds" title="Wounds" value="0">
+						<input type="number" name="attr_physMalusM4" class="sheet-lower-input center" style="width:70px;" data-i18n-title="malus" title="Malus" value="0">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:82px;" data-i18n="damage">Damage</div>
-						<div class="subtitle apt-title center" style="width:82px;" data-i18n="wounds">Wounds</div>
+						<div class="subtitle apt-title center" style="width:70px;margin-right:0px;" data-i18n="damage">Damage</div>
+						<div class="subtitle apt-title center" style="width:80px;margin-right:0px;" data-i18n="wounds">Wounds</div>
+						<div class="subtitle apt-title center" style="width:70px;" data-i18n="malus">Malus</div>
 					</div>
 					<div class="sheet-line">
-						<input type="text" name="attr_moveM4" class="sheet-lower-input apt-title" style="width:177px;" value="">
+						<input type="text" name="attr_moveM4" class="sheet-lower-input apt-title" style="width:228px;" value="">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:177px;" data-i18n="movement rating">Movement Rating</div>
+						<div class="subtitle apt-title center" style="width:228px;" data-i18n="movement rating">Movement Rating</div>
 					</div>
 				</div>
 			</div>
@@ -2269,7 +2345,7 @@
 				</div>
 			</div>
 			<div class="sheet-line">
-				<button type="roll" name="roll_apt-cog" style="width:80px;" class="apt-check" value="
+				<button type="roll" name="roll_a-rep" style="width:80px;" class="apt-check" value="
 				@{gm} &{template:EPdefault} {{name=^{rep}}} {{subname=^{@-rep}}} {{target=[[[[@{@-rep}+?{Mod|0}]]]]}} {{title-modifiers=^{modifiers}}} {{modifiers=[[?{Mod|0}]]}} {{roll=[[[[1d100-1]]]]}} {{title-roll=^{roll}}}">
 					<div class="apt-title center" data-i18n="@-rep">@-Rep</div>
 				</button>
@@ -2292,12 +2368,35 @@
 				</div>
 			</div>
 			<div class="sheet-line">
-				<button type="roll" name="roll_apt-cog" style="width:80px;" class="apt-check" value="
+				<button type="roll" name="roll_c-rep" style="width:80px;" class="apt-check" value="
 				@{gm} &{template:EPdefault} {{name=^{rep}}} {{subname=^{c-rep}}} {{target=[[[[@{c-rep}+?{Mod|0}]]]]}} {{title-modifiers=^{modifiers}}} {{modifiers=[[?{Mod|0}]]}} {{roll=[[[[1d100-1]]]]}} {{title-roll=^{roll}}}">
 					<div class="apt-title center" data-i18n="c-rep">c-Rep</div>
 				</button>
 				<input type="number" class="center" name="attr_c-rep" style="width:30px;padding-top:1.5px;padding-bottom:1.5px;" value="0" />
 			</div>
+			<div class="sheet-line">
+				<div class="sheet-column" style="border-right:1px solid black;padding-right:3px;">
+					<span style="font-family:'pictos'">1</span>
+				</div>
+				<div class="sheet-column" style="border-right:1px solid black;padding-right:4px;">
+					<input type="checkbox" name="attr_e-rep-1" value="1" />
+					<input type="checkbox" name="attr_e-rep-2" value="1" />
+					<input type="checkbox" name="attr_e-rep-3" value="1" />
+				</div>
+				<div class="sheet-column" style="border-right:1px solid black;padding-right:4px;">
+					<input type="checkbox" name="attr_e-rep-4" value="1" />
+				</div>
+				<div class="sheet-column">
+					<input type="checkbox" name="attr_e-rep-5" value="1" />
+				</div>
+			</div>
+			<div class="sheet-line">
+				<button type="roll" name="roll_e-rep" style="width:80px;" class="apt-check" value="
+				@{gm} &{template:EPdefault} {{name=^{rep}}} {{subname=^{e-rep}}} {{target=[[[[@{e-rep}+?{Mod|0}]]]]}} {{title-modifiers=^{modifiers}}} {{modifiers=[[?{Mod|0}]]}} {{roll=[[[[1d100-1]]]]}} {{title-roll=^{roll}}}">
+					<div class="apt-title center" data-i18n="e-rep">e-Rep</div>
+				</button>
+				<input type="number" class="center" name="attr_e-rep" style="width:30px;padding-top:1.5px;padding-bottom:1.5px;" value="0" />
+			</div>
 			<div class="sheet-line">
 				<div class="sheet-column" style="border-right:1px solid black;padding-right:3px;">
 					<span style="font-family:'pictos'">1</span>
@@ -2315,7 +2414,7 @@
 				</div>
 			</div>
 			<div class="sheet-line">
-				<button type="roll" name="roll_apt-cog" style="width:80px;" class="apt-check" value="
+				<button type="roll" name="roll_f-rep" style="width:80px;" class="apt-check" value="
 				@{gm} &{template:EPdefault} {{name=^{rep}}} {{subname=^{f-rep}}} {{target=[[[[@{f-rep}+?{Mod|0}]]]]}} {{title-modifiers=^{modifiers}}} {{modifiers=[[?{Mod|0}]]}} {{roll=[[[[1d100-1]]]]}} {{title-roll=^{roll}}}">
 					<div class="apt-title center" data-i18n="f-rep">f-Rep</div>
 				</button>
@@ -2338,7 +2437,7 @@
 				</div>
 			</div>
 			<div class="sheet-line">
-				<button type="roll" name="roll_apt-cog" style="width:80px;" class="apt-check" value="
+				<button type="roll" name="roll_g-rep" style="width:80px;" class="apt-check" value="
 				@{gm} &{template:EPdefault} {{name=^{rep}}} {{subname=^{g-rep}}} {{target=[[[[@{g-rep}+?{Mod|0}]]]]}} {{title-modifiers=^{modifiers}}} {{modifiers=[[?{Mod|0}]]}} {{roll=[[[[1d100-1]]]]}} {{title-roll=^{roll}}}">
 					<div class="apt-title center" data-i18n="g-rep">g-Rep</div>
 				</button>
@@ -2361,7 +2460,7 @@
 				</div>
 			</div>
 			<div class="sheet-line">
-				<button type="roll" name="roll_apt-cog" style="width:80px;" class="apt-check" value="
+				<button type="roll" name="roll_i-rep" style="width:80px;" class="apt-check" value="
 				@{gm} &{template:EPdefault} {{name=^{rep}}} {{subname=^{i-rep}}} {{target=[[[[@{i-rep}+?{Mod|0}]]]]}} {{title-modifiers=^{modifiers}}} {{modifiers=[[?{Mod|0}]]}} {{roll=[[[[1d100-1]]]]}} {{title-roll=^{roll}}}">
 					<div class="apt-title center" data-i18n="i-rep">i-Rep</div>
 				</button>
@@ -2384,7 +2483,7 @@
 				</div>
 			</div>
 			<div class="sheet-line">
-				<button type="roll" name="roll_apt-cog" style="width:80px;" class="apt-check" value="
+				<button type="roll" name="roll_r-rep" style="width:80px;" class="apt-check" value="
 				@{gm} &{template:EPdefault} {{name=^{rep}}} {{subname=^{r-rep}}} {{target=[[[[@{r-rep}+?{Mod|0}]]]]}} {{title-modifiers=^{modifiers}}} {{modifiers=[[?{Mod|0}]]}} {{roll=[[[[1d100-1]]]]}} {{title-roll=^{roll}}}">
 					<div class="apt-title center" data-i18n="r-rep">r-Rep</div>
 				</button>
@@ -2407,7 +2506,7 @@
 				</div>
 			</div>
 			<div class="sheet-line">
-				<button type="roll" name="roll_apt-cog" style="width:80px;" class="apt-check" value="
+				<button type="roll" name="roll_x-rep" style="width:80px;" class="apt-check" value="
 				@{gm} &{template:EPdefault} {{name=^{rep}}} {{subname=^{x-rep}}} {{target=[[[[@{x-rep}+?{Mod|0}]]]]}} {{title-modifiers=^{modifiers}}} {{modifiers=[[?{Mod|0}]]}} {{roll=[[[[1d100-1]]]]}} {{title-roll=^{roll}}}">
 					<div class="apt-title center" data-i18n="x-rep">x-Rep</div>
 				</button>
@@ -2473,55 +2572,150 @@
 			<div class="block-title" data-i18n="aptitudes">Aptitudes</div>
 			<div class="block">
 				<div class="sheet-line">
-					<input type="number" name="attr_cognition" class="sheet-lower-inputWMargin center" style="width:100px;" value="5" min="5">
-					<input type="number" name="attr_intuition" class="sheet-lower-inputWMargin center" style="width:100px;" value="5" min="5">
+					<div style="display:inline-block;">
+						<div class="sheet-line">
+							<input type="checkbox" name="attr_cognition-expand" style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"><span style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"></span>
+							<div class="sheet-expandHide" style="width:87px;">
+								<input type="number" name="attr_cognition" class="sheet-lower-inputWMargin apt-title" style="width:87px;" value="5" min="5">
+							</div>
+							<div class="sheet-expand" style="width:87px;">
+								<div class="sheet-line">
+									<input type="number" name="attr_bCheckCOG" class="sheet-lower-inputWMargin apt-title" style="width:87px;" value="0">
+								</div>
+								<div class="sheet-line">
+									<div class="subtitle apt-title center" style="width:100px;margin-left:-13px;" data-i18n="bonus check">Bonus Check</div>
+								</div>
+							</div>
+						</div>
+						<div class="sheet-line">
+							<button type="roll" name="roll_apt-cog" style="width:100px;" class="center apt-check" value="
+							@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{cognition}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{cognition}*3]]-[[@{malus}]]+@{bCheckCOG}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
+								<div class="center apt-title" data-i18n="cognition">Cognition</div>
+							</button>
+						</div>
+					</div>
+					<div style="display:inline-block;">
+						<div class="sheet-line">
+							<input type="checkbox" name="attr_intuition-expand" style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"><span style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"></span>
+							<div class="sheet-expandHide" style="width:87px;">
+								<input type="number" name="attr_intuition" class="sheet-lower-inputWMargin apt-title" style="width:87px;" value="5" min="5">
+							</div>
+							<div class="sheet-expand" style="width:87px;">
+								<div class="sheet-line">
+									<input type="number" name="attr_bCheckINT" class="sheet-lower-inputWMargin apt-title" style="width:87px;" value="0">
+								</div>
+								<div class="sheet-line">
+									<div class="subtitle apt-title center" style="width:100px;margin-left:-13px;" data-i18n="bonus check">Bonus Check</div>
+								</div>
+							</div>
+						</div>
+						<div class="sheet-line">
+							<button type="roll" name="roll_apt-int" style="width:100px;" class="center apt-check" value="
+							@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{intuition}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{intuition}*3]]-[[@{malus}]]+@{bCheckINT}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
+								<div class="center apt-title" data-i18n="intuition">Intuition</div>
+							</button>
+						</div>
+					</div>
 				</div>
 				<div class="sheet-line">
-					<button type="roll" name="roll_apt-cog" style="width:100px;" class="center apt-check" value="
-					@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{cognition}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{cognition}*3]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
-						<div class="center apt-title" data-i18n="cognition">Cognition</div>
-					</button>
-					<button type="roll" name="roll_apt-int" style="width:100px;" class="center apt-check" value="
-					@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{intuition}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{intuition}*3]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
-						<div class="center apt-title" data-i18n="intuition">Intuition</div>
-					</button>
+					<div style="display:inline-block;">
+						<div class="sheet-line">
+							<input type="checkbox" name="attr_savvy-expand" style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"><span style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"></span>
+							<div class="sheet-expandHide" style="width:87px;">
+								<input type="number" name="attr_savvy" class="sheet-lower-inputWMargin apt-title" style="width:87px;" value="5" min="5">
+							</div>
+							<div class="sheet-expand" style="width:87px;">
+								<div class="sheet-line">
+									<input type="number" name="attr_bCheckSAV" class="sheet-lower-inputWMargin apt-title" style="width:87px;" value="0">
+								</div>
+								<div class="sheet-line">
+									<div class="subtitle apt-title center" style="width:100px;margin-left:-13px;" data-i18n="bonus check">Bonus Check</div>
+								</div>
+							</div>
+						</div>
+						<div class="sheet-line">
+							<button type="roll" name="roll_apt-sav" style="width:100px;" class="center apt-check" value="
+							@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{savvy}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{savvy}*3]]-[[@{malus}]]+@{bCheckSAV}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
+								<div class="center apt-title" data-i18n="savvy">Savvy</div>
+							</button>
+						</div>
+					</div>
+					<div style="display:inline-block;">
+						<div class="sheet-line">
+							<input type="checkbox" name="attr_somatics-expand" style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"><span style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"></span>
+							<div class="sheet-expandHide" style="width:87px;">
+								<input type="number" name="attr_somatics" class="sheet-lower-inputWMargin apt-title" style="width:87px;" value="5" min="5">
+							</div>
+							<div class="sheet-expand" style="width:87px;">
+								<div class="sheet-line">
+									<input type="number" name="attr_bCheckSOM" class="sheet-lower-inputWMargin apt-title" style="width:87px;" value="0">
+								</div>
+								<div class="sheet-line">
+									<div class="subtitle apt-title center" style="width:100px;margin-left:-13px;" data-i18n="bonus check">Bonus Check</div>
+								</div>
+							</div>
+						</div>
+						<div class="sheet-line">
+							<button type="roll" name="roll_apt-som" style="width:100px;" class="center apt-check" value="
+							@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{somatics}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{somatics}*3]]-[[@{malus}]]+@{bCheckSOM}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
+								<div class="center apt-title" data-i18n="somatics">Somatics</div>
+							</button>
+						</div>
+					</div>
 				</div>
 				<div class="sheet-line">
-					<input type="number" name="attr_savvy" class="sheet-lower-inputWMargin center" style="width:100px;" value="5" min="5">
-					<input type="number" name="attr_somatics" class="sheet-lower-inputWMargin center" style="width:100px;" value="5" min="5">
-				</div>
-				<div class="sheet-line">
-					<button type="roll" name="roll_apt-sav" style="width:100px;" class="center apt-check" value="
-					@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{savvy}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{savvy}*3]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
-						<div class="center apt-title" data-i18n="savvy">Savvy</div>
-					</button>
-					<button type="roll" name="roll_apt-som" style="width:100px;" class="center apt-check" value="
-					@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{somatics}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{somatics}*3]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
-						<div class="center apt-title" data-i18n="somatics">Somatics</div>
-					</button>
-				</div>
-				<div class="sheet-line">
-					<input type="number" name="attr_reflexes" class="sheet-lower-inputWMargin center" style="width:100px;" value="5" min="5">
-					<input type="number" name="attr_willpower" class="sheet-lower-inputWMargin center" style="width:100px;" value="5" min="5">
-				</div>
-				<div class="sheet-line">
-					<button type="roll" name="roll_apt-ref" style="width:100px;" class="center apt-check" value="
-					@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{reflexes}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{reflexes}*3]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
-						<div class="center apt-title" data-i18n="reflexes">Reflexes</div>
-					</button>
-					<button type="roll" name="roll_apt-wil" style="width:100px;" class="center apt-check" value="
-					@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{willpower}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{willpower}*3]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
-						<div class="center apt-title" data-i18n="willpower">Willpower</div>
-					</button>
+					<div style="display:inline-block;">
+						<div class="sheet-line">
+							<input type="checkbox" name="attr_reflexes-expand" style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"><span style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"></span>
+							<div class="sheet-expandHide" style="width:87px;">
+								<input type="number" name="attr_reflexes" class="sheet-lower-inputWMargin apt-title" style="width:87px;" value="5" min="5">
+							</div>
+							<div class="sheet-expand" style="width:87px;">
+								<div class="sheet-line">
+									<input type="number" name="attr_bCheckREF" class="sheet-lower-inputWMargin apt-title" style="width:87px;" value="0">
+								</div>
+								<div class="sheet-line">
+									<div class="subtitle apt-title center" style="width:100px;margin-left:-13px;" data-i18n="bonus check">Bonus Check</div>
+								</div>
+							</div>
+						</div>
+						<div class="sheet-line">
+							<button type="roll" name="roll_apt-ref" style="width:100px;" class="center apt-check" value="
+							@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{reflexes}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{reflexes}*3]]-[[@{malus}]]+@{bCheckREF}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
+								<div class="center apt-title" data-i18n="reflexes">Reflexes</div>
+							</button>
+						</div>
+					</div>
+					<div style="display:inline-block;">
+						<div class="sheet-line">
+							<input type="checkbox" name="attr_willpower-expand" style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"><span style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"></span>
+							<div class="sheet-expandHide" style="width:87px;">
+								<input type="number" name="attr_willpower" class="sheet-lower-inputWMargin apt-title" style="width:87px;" value="5" min="5">
+							</div>
+							<div class="sheet-expand" style="width:87px;">
+								<div class="sheet-line">
+									<input type="number" name="attr_bCheckWIL" class="sheet-lower-inputWMargin apt-title" style="width:87px;" value="0">
+								</div>
+								<div class="sheet-line">
+									<div class="subtitle apt-title center" style="width:100px;margin-left:-13px;" data-i18n="bonus check">Bonus Check</div>
+								</div>
+							</div>
+						</div>
+						<div class="sheet-line">
+							<button type="roll" name="roll_apt-wil" style="width:100px;" class="center apt-check" value="
+							@{gm} &{template:EPdefault} {{name=^{aptitudes}}} {{subname=^{willpower}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{willpower}*3]]-[[@{malus}]]+@{bCheckSOM}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
+								<div class="center apt-title" data-i18n="willpower">Willpower</div>
+							</button>
+						</div>
+					</div>
 				</div>
 			</div>
 		</div>
-		
 		<div class="sheet-column" style="width:555px;margin:auto;margin-bottom:10px;">
-			<input type="checkbox" name="attr_morphTab" class="sheet-M1Hidden" value="1" checked="checked">
-			<input type="checkbox" name="attr_morphTab" class="sheet-M2Hidden" value="2">
-			<input type="checkbox" name="attr_morphTab" class="sheet-M3Hidden" value="3">
-			<input type="checkbox" name="attr_morphTab" class="sheet-M4Hidden" value="4">
+			<input type="checkbox" name="attr_morphTab" class="sheet-M1Hidden" value="@{physMalusM1}" checked="checked">
+			<input type="checkbox" name="attr_morphTab" class="sheet-M2Hidden" value="@{physMalusM2}">
+			<input type="checkbox" name="attr_morphTab" class="sheet-M3Hidden" value="@{physMalusM3}">
+			<input type="checkbox" name="attr_morphTab" class="sheet-M4Hidden" value="@{physMalusM4}">
 			<div class="sheet-M1Hidden">
 				<div class="block-title block-title-morph" data-i18n="pool">Pool</div>
 				<div class="block">
@@ -2772,32 +2966,34 @@
 			</div>
 		</div>
 	</div>
-	<div class="sheet-line" style="width:727px;margin:auto;margin-bottom:10px;">
+	<div class="sheet-line" style="width:809px;margin:auto;margin-bottom:10px;">
 		
 		<div class="sheet-column" style="margin-right:10px;">
-			<div class="sheet-line" style="margin-bottom:10px;">
-				<div style="width:218px;">
-					<div class="block-title" data-i18n="mental">Mental</div>
-					<div class="block">
-						<div class="sheet-line">
-							<input type="number" name="attr_TT" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="trauma treshold" title="Trauma Treshold" value="floor(@{LUC}/5)" disabled>
-							<input type="number" name="attr_LUC" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="lucidity" title="Lucidity" value="(@{willpower}*2)" disabled>
-							<input type="number" name="attr_IR" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="insanity rating" title="Insanity Rating" value="@{LUC}*2" disabled>
-						</div>
-						<div class="sheet-line">
-							<div class="subtitle apt-title center" style="width:50px;" data-i18n="trauma treshold short">TT</div>
-							<div class="subtitle apt-title center" style="width:50px;" data-i18n="lucidity short">LUC</div>
-							<div class="subtitle apt-title center" style="width:50px;" data-i18n="insanity rating short">IR</div>
-						</div>
-						<div class="sheet-line">
-							<input type="number" name="attr_TT" class="sheet-lower-input apt-title" style="width:75px;" value="0">
-							<div style="width:10px;display:inline-block"></div>
-							<input type="number" name="attr_IR" class="sheet-lower-input apt-title" style="width:75px;" value="0">
-						</div>
-						<div class="sheet-line">
-							<div class="subtitle apt-title center" style="width:75px;" data-i18n="stress">Stress</div>
-							<div style="width:10px;display:inline-block"></div>
-							<div class="subtitle apt-title center" style="width:75px;" data-i18n="traumas">Traumas</div>
+			<div class="sheet-column">
+				<div class="sheet-line">
+					<div style="width:258px;display:inline-block">
+						<div class="block-title" data-i18n="mental">Mental</div>
+						<div class="block">
+							<div class="sheet-line">
+								<input type="number" name="attr_TT" class="sheet-lower-input apt-title" style="width:63.33px;" data-i18n-title="trauma treshold" title="Trauma Treshold" value="floor(@{LUC}/5)" disabled>
+								<input type="number" name="attr_LUC" class="sheet-lower-input apt-title" style="width:63.33px;" data-i18n-title="lucidity" title="Lucidity" value="(@{willpower}*2)" disabled>
+								<input type="number" name="attr_IR" class="sheet-lower-input apt-title" style="width:63.33px;" data-i18n-title="insanity rating" title="Insanity Rating" value="@{LUC}*2" disabled>
+							</div>
+							<div class="sheet-line">
+								<div class="subtitle apt-title center" style="width:63.33px;" data-i18n="trauma treshold short">TT</div>
+								<div class="subtitle apt-title center" style="width:63.33px;" data-i18n="lucidity short">LUC</div>
+								<div class="subtitle apt-title center" style="width:63.33px;" data-i18n="insanity rating short">IR</div>
+							</div>
+							<div class="sheet-line">
+								<input type="number" name="attr_stress" class="sheet-lower-inputWMargin center" style="width:70px;" value="0">
+								<input type="number" name="attr_traumas" class="sheet-lower-inputWMargin center" style="width:70px;" value="0">
+								<input type="number" name="attr_mentMalus" class="sheet-lower-inputWMargin center" style="width:70px;" value="0">
+							</div>
+							<div class="sheet-line">
+								<div class="subtitle apt-title center" style="width:70px;margin-right:0px;" data-i18n="stress">Stress</div>
+								<div class="subtitle apt-title center" style="width:70px;margin-right:0px;" data-i18n="traumas">Traumas</div>
+								<div class="subtitle apt-title center" style="width:70px;" data-i18n="malus">Malus</div>
+							</div>
 						</div>
 					</div>
 				</div>
@@ -2820,7 +3016,7 @@
 						<div class="sheet-line">
 							<div style="width:100px;" class="sheet-column">
 								<button type="roll" name="roll_combat-guns" style="width:100px;" class="default-btn center" value="
-								@{gm} &{template:EPdefault} {{name=^{guns}}} {{subname=^{score}}} {{subskill=@{spe-guns}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-guns}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+								@{gm} &{template:EPdefault} {{name=^{guns}}} {{subname=^{score}}} {{subskill=@{spe-guns}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-guns}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 									<div class="apt-title center"  data-i18n="guns">Guns</div>
 								</button>
 							</div>
@@ -2832,7 +3028,7 @@
 		<div class="sheet-column" style="margin-right:10px;">
 			<div class="sheet-line">
 				<div style="width:255px;">
-					<div class="block-title" data-i18n="derived stats">Derived Stats</div>
+					<div class="block-title" data-i18n="derived stats" style="margin-right:15px;">Derived Stats</div>
 					<div class="block">
 						<div class="sheet-line">
 							<div style="width:100px;margin-right:10px;" class="sheet-column">
@@ -2857,13 +3053,13 @@
 						<div class="sheet-line" style="margin-bottom:10px;">
 							<div style="width:100px;margin-right:10px;" class="sheet-column">
 								<button type="roll" name="roll_initiative" style="width:100px;" class="default-btn center" value="
-								@{gm} &{template:EPdefault} {{name=^{initiative}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{initiative}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
+								@{gm} &{template:EPdefault} {{name=^{initiative}}} {{subname=^{score}}} {{roll=[[1D10+[[@{initiative}]] ]]}} {{title-roll=^{roll}}}">
 									<div class="apt-title center" data-i18n="initiative">Initiative</div>
 								</button>
 							</div>
 							<div style="width:100px;margin-right:10px;" class="sheet-column">
 								<button type="roll" name="roll_basic-perception" style="width:100px;" class="default-btn center" value="
-								@{gm} &{template:EPdefault} {{name=^{basic perception}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{basicPerception}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+								@{gm} &{template:EPdefault} {{name=^{basic perception}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{basicPerception}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 									<div class="apt-title center" data-i18n="basic perception">Basic Perception</div>
 								</button>
 							</div>
@@ -2891,13 +3087,13 @@
 						<div class="sheet-line">
 							<div style="width:100px;margin-right:10px;" class="sheet-column">
 								<button type="roll" name="roll_combat-fray-melee" style="width:100px;" class="default-btn center" value="
-								@{gm} &{template:EPdefault} {{name=^{fray vs melee}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{fray}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+								@{gm} &{template:EPdefault} {{name=^{fray vs melee}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{fray}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 									<div class="apt-title center" data-i18n="fray vs melee">Fray VS Melee</div>
 								</button>
 							</div>
 							<div style="width:100px;" class="sheet-column">
 								<button type="roll" name="roll_combat-fray-ranged" style="width:100px;" class="default-btn center" value="
-								@{gm} &{template:EPdefault} {{name=^{fray vs ranged}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{frayRanged}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+								@{gm} &{template:EPdefault} {{name=^{fray vs ranged}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{frayRanged}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 									<div class="apt-title center" data-i18n="fray vs ranged">Fray VS Ranged</div>
 								</button>
 							</div>
@@ -2907,123 +3103,131 @@
 			</div>
 		</div>
 		<div class="sheet-column">
-			<input type="checkbox" name="attr_morphTab" class="sheet-M1Hidden" value="1" checked="checked">
-			<input type="checkbox" name="attr_morphTab" class="sheet-M2Hidden" value="2">
-			<input type="checkbox" name="attr_morphTab" class="sheet-M3Hidden" value="3">
-			<input type="checkbox" name="attr_morphTab" class="sheet-M4Hidden" value="4">
-			<div class="sheet-line sheet-M1Hidden" style="margin-bottom:10px;">
-				<div class="block-title" data-i18n="physique">Physique</div>
+			<input type="checkbox" name="attr_morphTab" class="sheet-M1Hidden" value="@{physMalusM1}" checked="checked">
+			<input type="checkbox" name="attr_morphTab" class="sheet-M2Hidden" value="@{physMalusM2}">
+			<input type="checkbox" name="attr_morphTab" class="sheet-M3Hidden" value="@{physMalusM3}">
+			<input type="checkbox" name="attr_morphTab" class="sheet-M4Hidden" value="@{physMalusM4}">
+			<div class="sheet-column sheet-M1Hidden" style="width:268px;margin-bottom:10px;">
+				<div class="block-title block-title-morph" data-i18n="physique">Physique</div>
 				<div class="block">
 					<div class="sheet-line">
-						<input type="number" name="attr_durM1" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="durability" title="Durability" value="0">
-						<input type="number" name="attr_wtM1" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="wound treshold" title="Wound Treshold" value="0">
-						<input type="number" name="attr_drM1" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="death rating" title="Death Rating" value="0">
+						<input type="number" name="attr_durM1" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="durability" title="Durability" value="0">
+						<input type="number" name="attr_wtM1" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="wound treshold" title="Wound Treshold" value="0">
+						<input type="number" name="attr_drM1" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="death rating" title="Death Rating" value="0">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="durability short">DUR</div>
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="wound treshold short">WT</div>
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="death rating short">DR</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="durability short">DUR</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="wound treshold short">WT</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="death rating short">DR</div>
 					</div>
 					<div class="sheet-line">
-						<input type="number" name="attr_dmg" class="sheet-lower-input apt-title" style="width:82px;" data-i18n-title="damage" title="Damage" value="0">
-						<input type="number" name="attr_wnd" class="sheet-lower-input apt-title" style="width:82px;" data-i18n-title="wounds" title="Wounds" value="0">
+						<input type="number" name="attr_dmgM1" class="sheet-lower-inputWMargin center" style="width:70px;" data-i18n-title="damage" title="Damage" value="0">
+						<input type="number" name="attr_wndM1" class="sheet-lower-inputWMargin center" style="width:80px;" data-i18n-title="wounds" title="Wounds" value="0">
+						<input type="number" name="attr_physMalusM1" class="sheet-lower-input center" style="width:70px;" data-i18n-title="malus" title="Malus" value="0">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:82px;" data-i18n="damage">Damage</div>
-						<div class="subtitle apt-title center" style="width:82px;" data-i18n="wounds">Wounds</div>
+						<div class="subtitle apt-title center" style="width:70px;margin-right:0px;" data-i18n="damage">Damage</div>
+						<div class="subtitle apt-title center" style="width:80px;margin-right:0px;" data-i18n="wounds">Wounds</div>
+						<div class="subtitle apt-title center" style="width:70px;" data-i18n="malus">Malus</div>
 					</div>
 					<div class="sheet-line">
-						<input type="text" name="attr_moveM1" class="sheet-lower-input apt-title" style="width:177px;" value="">
+						<input type="text" name="attr_moveM1" class="sheet-lower-input apt-title" style="width:228px;" value="">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:177px;" data-i18n="movement rating">Movement Rating</div>
+						<div class="subtitle apt-title center" style="width:228px;" data-i18n="movement rating">Movement Rating</div>
 					</div>
 				</div>
 			</div>
-			<div class="sheet-line sheet-M2Hidden" style="margin-bottom:10px;">
-				<div class="block-title" data-i18n="physique">Physique</div>
+			<div class="sheet-column sheet-M2Hidden" style="width:268px;margin-bottom:10px;">
+				<div class="block-title block-title-morph" data-i18n="physique">Physique</div>
 				<div class="block">
 					<div class="sheet-line">
-						<input type="number" name="attr_durM2" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="durability" title="Durability" value="0">
-						<input type="number" name="attr_wtM2" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="wound treshold" title="Wound Treshold" value="0">
-						<input type="number" name="attr_drM2" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="death rating" title="Death Rating" value="0">
+						<input type="number" name="attr_durM2" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="durability" title="Durability" value="0">
+						<input type="number" name="attr_wtM2" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="wound treshold" title="Wound Treshold" value="0">
+						<input type="number" name="attr_drM2" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="death rating" title="Death Rating" value="0">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="durability short">DUR</div>
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="wound treshold short">WT</div>
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="death rating short">DR</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="durability short">DUR</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="wound treshold short">WT</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="death rating short">DR</div>
 					</div>
 					<div class="sheet-line">
-						<input type="number" name="attr_dmg" class="sheet-lower-input apt-title" style="width:82px;" data-i18n-title="damage" title="Damage" value="0">
-						<input type="number" name="attr_wnd" class="sheet-lower-input apt-title" style="width:82px;" data-i18n-title="wounds" title="Wounds" value="0">
+						<input type="number" name="attr_dmgM2" class="sheet-lower-inputWMargin center" style="width:70px;" data-i18n-title="damage" title="Damage" value="0">
+						<input type="number" name="attr_wndM2" class="sheet-lower-inputWMargin center" style="width:80px;" data-i18n-title="wounds" title="Wounds" value="0">
+						<input type="number" name="attr_physMalusM2" class="sheet-lower-input center" style="width:70px;" data-i18n-title="malus" title="Malus" value="0">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:82px;" data-i18n="damage">Damage</div>
-						<div class="subtitle apt-title center" style="width:82px;" data-i18n="wounds">Wounds</div>
+						<div class="subtitle apt-title center" style="width:70px;margin-right:0px;" data-i18n="damage">Damage</div>
+						<div class="subtitle apt-title center" style="width:80px;margin-right:0px;" data-i18n="wounds">Wounds</div>
+						<div class="subtitle apt-title center" style="width:70px;" data-i18n="malus">Malus</div>
 					</div>
 					<div class="sheet-line">
-						<input type="text" name="attr_moveM2" class="sheet-lower-input apt-title" style="width:177px;" value="">
+						<input type="text" name="attr_moveM2" class="sheet-lower-input apt-title" style="width:228px;" value="">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:177px;" data-i18n="movement rating">Movement Rating</div>
+						<div class="subtitle apt-title center" style="width:228px;" data-i18n="movement rating">Movement Rating</div>
 					</div>
 				</div>
 			</div>
-			<div class="sheet-line sheet-M3Hidden" style="margin-bottom:10px;">
-				<div class="block-title" data-i18n="physique">Physique</div>
+			<div class="sheet-column sheet-M3Hidden" style="width:268px;margin-bottom:10px;">
+				<div class="block-title block-title-morph" data-i18n="physique">Physique</div>
 				<div class="block">
 					<div class="sheet-line">
-						<input type="number" name="attr_durM3" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="durability" title="Durability" value="0">
-						<input type="number" name="attr_wtM3" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="wound treshold" title="Wound Treshold" value="0">
-						<input type="number" name="attr_drM3" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="death rating" title="Death Rating" value="0">
+						<input type="number" name="attr_durM3" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="durability" title="Durability" value="0">
+						<input type="number" name="attr_wtM3" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="wound treshold" title="Wound Treshold" value="0">
+						<input type="number" name="attr_drM3" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="death rating" title="Death Rating" value="0">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="durability short">DUR</div>
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="wound treshold short">WT</div>
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="death rating short">DR</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="durability short">DUR</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="wound treshold short">WT</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="death rating short">DR</div>
 					</div>
 					<div class="sheet-line">
-						<input type="number" name="attr_dmg" class="sheet-lower-input apt-title" style="width:82px;" data-i18n-title="damage" title="Damage" value="0">
-						<input type="number" name="attr_wnd" class="sheet-lower-input apt-title" style="width:82px;" data-i18n-title="wounds" title="Wounds" value="0">
+						<input type="number" name="attr_dmgM3" class="sheet-lower-inputWMargin center" style="width:70px;" data-i18n-title="damage" title="Damage" value="0">
+						<input type="number" name="attr_wndM3" class="sheet-lower-inputWMargin center" style="width:80px;" data-i18n-title="wounds" title="Wounds" value="0">
+						<input type="number" name="attr_physMalusM3" class="sheet-lower-input center" style="width:70px;" data-i18n-title="malus" title="Malus" value="0">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:82px;" data-i18n="damage">Damage</div>
-						<div class="subtitle apt-title center" style="width:82px;" data-i18n="wounds">Wounds</div>
+						<div class="subtitle apt-title center" style="width:70px;margin-right:0px;" data-i18n="damage">Damage</div>
+						<div class="subtitle apt-title center" style="width:80px;margin-right:0px;" data-i18n="wounds">Wounds</div>
+						<div class="subtitle apt-title center" style="width:70px;" data-i18n="malus">Malus</div>
 					</div>
 					<div class="sheet-line">
-						<input type="text" name="attr_moveM3" class="sheet-lower-input apt-title" style="width:177px;" value="">
+						<input type="text" name="attr_moveM3" class="sheet-lower-input apt-title" style="width:228px;" value="">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:177px;" data-i18n="movement rating">Movement Rating</div>
+						<div class="subtitle apt-title center" style="width:228px;" data-i18n="movement rating">Movement Rating</div>
 					</div>
 				</div>
 			</div>
-			<div class="sheet-line sheet-M4Hidden" style="margin-bottom:10px;">
-				<div class="block-title" data-i18n="physique">Physique</div>
+			<div class="sheet-column sheet-M4Hidden" style="width:268px;margin-bottom:10px;">
+				<div class="block-title block-title-morph" data-i18n="physique">Physique</div>
 				<div class="block">
 					<div class="sheet-line">
-						<input type="number" name="attr_durM4" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="durability" title="Durability" value="0">
-						<input type="number" name="attr_wtM4" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="wound treshold" title="Wound Treshold" value="0">
-						<input type="number" name="attr_drM4" class="sheet-lower-input apt-title" style="width:50px;" data-i18n-title="death rating" title="Death Rating" value="0">
+						<input type="number" name="attr_durM4" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="durability" title="Durability" value="0">
+						<input type="number" name="attr_wtM4" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="wound treshold" title="Wound Treshold" value="0">
+						<input type="number" name="attr_drM4" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="death rating" title="Death Rating" value="0">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="durability short">DUR</div>
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="wound treshold short">WT</div>
-						<div class="subtitle apt-title center" style="width:50px;" data-i18n="death rating short">DR</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="durability short">DUR</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="wound treshold short">WT</div>
+						<div class="subtitle apt-title center" style="width:66.67px;" data-i18n="death rating short">DR</div>
 					</div>
 					<div class="sheet-line">
-						<input type="number" name="attr_dmg" class="sheet-lower-input apt-title" style="width:82px;" data-i18n-title="damage" title="Damage" value="0">
-						<input type="number" name="attr_wnd" class="sheet-lower-input apt-title" style="width:82px;" data-i18n-title="wounds" title="Wounds" value="0">
+						<input type="number" name="attr_dmgM4" class="sheet-lower-inputWMargin center" style="width:70px;" data-i18n-title="damage" title="Damage" value="0">
+						<input type="number" name="attr_wndM4" class="sheet-lower-inputWMargin center" style="width:80px;" data-i18n-title="wounds" title="Wounds" value="0">
+						<input type="number" name="attr_physMalusM4" class="sheet-lower-input center" style="width:70px;" data-i18n-title="malus" title="Malus" value="0">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:82px;" data-i18n="damage">Damage</div>
-						<div class="subtitle apt-title center" style="width:82px;" data-i18n="wounds">Wounds</div>
+						<div class="subtitle apt-title center" style="width:70px;margin-right:0px;" data-i18n="damage">Damage</div>
+						<div class="subtitle apt-title center" style="width:80px;margin-right:0px;" data-i18n="wounds">Wounds</div>
+						<div class="subtitle apt-title center" style="width:70px;" data-i18n="malus">Malus</div>
 					</div>
 					<div class="sheet-line">
-						<input type="text" name="attr_moveM4" class="sheet-lower-input apt-title" style="width:177px;" value="">
+						<input type="text" name="attr_moveM4" class="sheet-lower-input apt-title" style="width:228px;" value="">
 					</div>
 					<div class="sheet-line">
-						<div class="subtitle apt-title center" style="width:177px;" data-i18n="movement rating">Movement Rating</div>
+						<div class="subtitle apt-title center" style="width:228px;" data-i18n="movement rating">Movement Rating</div>
 					</div>
 				</div>
 			</div>
@@ -3045,7 +3249,7 @@
 						<div class="sheet-line">
 							<div style="width:100px;" class="sheet-column">
 								<button type="roll" name="roll_combat-melee" style="width:100px;" class="default-btn center" value="
-								@{gm} &{template:EPdefault} {{name=^{melee}}} {{subname=^{score}}} {{subskill=@{spe-melee}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-melee}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+								@{gm} &{template:EPdefault} {{name=^{melee}}} {{subname=^{score}}} {{subskill=@{spe-melee}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-melee}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 									<div class="apt-title center"  data-i18n="melee">Melee</div>
 								</button>
 							</div>
@@ -3078,7 +3282,7 @@
 							<input type="checkbox" name="attr_weapon-ranged-expand" class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"><span class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"></span>
 							<div class="sheet-line sheet-expandHide" style="width:330px;">
 								<button type="roll" name="roll_ranged-weapon-btn" style="width:335px;" class="sheet-default-btn" value="
-								@{gm} &{template:EPcombat} {{name=@{ranged-weapon-name}}} {{subname=^{score}}} @{weapon-ranged-firing-modes} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-guns}]]-[[@{malus}*10]]]]}} {{title-range=^{range}}} {{range=@{ranged-weapon-range}}} {{title-damage=^{damage}}} {{damage=[[@{ranged-weapon-dv}]]}} {{title-reload=^{reload}}} {{title-type-reload=^{Semi Auto / Burst Fire / Full Auto short}}} {{reload=@{ranged-weapon-reload}}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}} {{notes=@{ranged-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-ranged_superior-result-dmg)}}">
+								@{gm} &{template:EPcombat} {{name=@{ranged-weapon-name}}} {{subname=^{score}}} @{weapon-ranged-firing-modes} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-guns}]]-[[@{malus}]]]]}} {{title-range=^{range}}} {{range=@{ranged-weapon-range}}} {{title-damage=^{damage}}} {{damage=[[@{ranged-weapon-dv}]]}} {{title-reload=^{reload}}} {{title-type-reload=^{Semi Auto / Burst Fire / Full Auto short}}} {{reload=@{ranged-weapon-reload}}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}} {{notes=@{ranged-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-ranged_superior-result-dmg)}}">
 									<span style="width:335px;" class="name-skills" name="attr_ranged-weapon-name"></span>
 								</button>
 							</div>
@@ -3114,7 +3318,7 @@
 							<input type="checkbox" name="attr_weapon-melee-expand" class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"><span class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"></span>
 							<div class="sheet-line sheet-expandHide" style="width:330px;">
 								<button type="roll" name="roll_melee-weapon-btn" style="width:335px;" class="sheet-default-btn" value="
-								@{gm} &{template:EPcombat} {{name=@{melee-weapon-name}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-melee}]]-[[@{malus}*10]]]]}} {{subname=^{score}}} {{title-damage=^{damage}}} {{damage=[[@{melee-weapon-dv}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}} {{notes=@{melee-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-melee_superior-result-dmg)}}">
+								@{gm} &{template:EPcombat} {{name=@{melee-weapon-name}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-melee}]]-[[@{malus}]]]]}} {{subname=^{score}}} {{title-damage=^{damage}}} {{damage=[[@{melee-weapon-dv}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}} {{notes=@{melee-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-melee_superior-result-dmg)}}">
 									<span style="width:335px;" class="name-skills" name="attr_melee-weapon-name"></span>
 								</button>
 							</div>
@@ -3147,7 +3351,7 @@
 							<input type="checkbox" name="attr_weapon-ranged-expand" class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"><span class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"></span>
 							<div class="sheet-line sheet-expandHide" style="width:330px;">
 								<button type="roll" name="roll_seeker-weapon-btn" style="width:335px;" class="sheet-default-btn" value="
-								@{gm} &{template:EPcombat} {{name=@{seeker-weapon-name}}} @{seeker-weapon-skill} {{roll=[[[[1D100-1]]]]}}  {{title-range=^{range}}} {{range=@{seeker-weapon-range}}} {{title-damage=^{damage}}} {{damage=[[@{seeker-weapon-dv}]]}} {{title-reload=^{reload}}} {{title-type-reload=^{Semi Auto / Burst Fire / Full Auto short}}} {{reload=@{seeker-weapon-reload}}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}} {{notes=@{seeker-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-seeker_superior-result-dmg)}}">
+								@{gm} &{template:EPcombat} {{name=@{seeker-weapon-name}}} @{seeker-weapon-skill} {{roll=[[[[1D100-1]]]]}}  {{title-range=^{range}}} {{range=@{seeker-weapon-range}}} {{title-damage=^{damage}}} {{damage=[[@{seeker-weapon-dv}]]}} {{title-reload=^{reload}}} {{title-type-reload=^{Semi Auto / Burst Fire / Full Auto short}}} {{reload=@{seeker-weapon-reload}}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}} {{notes=@{seeker-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-seeker_superior-result-dmg)}}">
 									<span style="width:335px;" class="name-skills" name="attr_seeker-weapon-name"></span>
 								</button>
 							</div>
@@ -3167,8 +3371,8 @@
 									<input type="text" name="attr_seeker-weapon-ammo-type" class="sheet-lower-input apt-title" style="width:95px;" data-i18n-placeholder="micro ex" placeholder="Micro, ..." value="">
 									<input type="text" name="attr_seeker-weapon-armor-used" class="sheet-lower-input apt-title" style="width:95px;" data-i18n-placeholder="emp gas ex" placeholder="EMP, Gas, ..." value="-">
 									<select name="attr_seeker-weapon-skill" class="center" style="width:95px;padding:0px;margin:0px;height:23px;">
-										<option value="{{target=[[[[@{total-guns}]]-[[@{malus}*10]]]]}} {{subname=^{guns}}}" data-i18n="guns" selected>Guns</option>
-										<option value="{{target=[[[[@{total-athletics}]]-[[@{malus}*10]]]]}} {{subname=^{athletics}}}" data-i18n="athletics">Athletics</option>
+										<option value="{{target=[[[[@{total-guns}]]-[[@{malus}]]]]}} {{subname=^{guns}}}" data-i18n="guns" selected>Guns</option>
+										<option value="{{target=[[[[@{total-athletics}]]-[[@{malus}]]]]}} {{subname=^{athletics}}}" data-i18n="athletics">Athletics</option>
 									</select>
 								</div>
 								<div class="sheet-line center" style="padding-left:10px;">
@@ -3311,7 +3515,7 @@
 			</div>
 			<div class="sheet-line">
 					<button type="roll" name="roll_skill-psi" class="sheet-skills-btn" value="
-					@{gm} &{template:EPdefault} {{name=^{psi}}} {{subname=^{score}}} {{subskill=@{spe-psi}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-psi}]]-[[@{malus}*10]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})*10]]]]}}">
+					@{gm} &{template:EPdefault} {{name=^{psi}}} {{subname=^{score}}} {{subskill=@{spe-psi}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-psi}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="psi">Psi</div>
 					</button>
 					<input type="text" name="attr_spe-psi" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
@@ -3418,7 +3622,7 @@
 	</div>
 </div>
 
-<input type="hidden" name="attr_malus" value="(@{traumas}+@{wnd})" disabled />
+<input type="hidden" name="attr_malus" value="@{mentMalus}+@{morphTab}" disabled />
 
 <rolltemplate class="sheet-rolltemplate-EPdefault">
 	<table>