From d8568385ac4c615077b7daa961e41b09aadfe81f Mon Sep 17 00:00:00 2001
From: Djjus <59532170+Djjus@users.noreply.github.com>
Date: Tue, 14 Sep 2021 09:50:45 +0100
Subject: [PATCH 1/9] Update 1.53

---
 Warhammer 4e Character Sheet/README.md        |   13 +-
 .../Warhammer 4e Character Sheet.css          | 1425 +--
 .../Warhammer 4e Character Sheet.html         | 8413 +++++++++++++++--
 Warhammer 4e Character Sheet/translation.json |  137 +-
 4 files changed, 8583 insertions(+), 1405 deletions(-)

diff --git a/Warhammer 4e Character Sheet/README.md b/Warhammer 4e Character Sheet/README.md
index 1df7114304..96e8fec52d 100644
--- a/Warhammer 4e Character Sheet/README.md	
+++ b/Warhammer 4e Character Sheet/README.md	
@@ -73,6 +73,17 @@ Note conditions are not intended for out of combat situations, GM simply makes t
  
 ///// ============ Change Log ============ /////  
 
+September 14th 2021 v1.53
+
+- Various bug fixes
+- All Test Results now display inline with the Target in the Target v Test form.
+- Hovering over roll buttons will now show very clearly which button is about to be clicked.
+- Melee/Ranged Weapon selection will now allow clearing for the selected Weapon.
+- Melee/Ranged Weapons settings popout style changed a bit, added a wrap box.
+- Skills which are affected by advantage or penaties now have tooltip markers to indicate it.
+- Added experimental SL system and custom roll parsing sheet workers, these are hidden and dont interfere with the base page.
+
+
 August 25th 2021 v1.52
 
 - Changed Fortune and Resolve display so it shows ( remaining / max ) of each stat, also added configurable modifiers for both stats to allow players to account for talents like Luck and Strong-minded. This allows easier tracking of these stats and their modifiers.
@@ -265,7 +276,7 @@ July 13 2020 - v1.0
 - And a number of minor bug fixes 
 
 
-July 5 020 
+July 5 2020 
 
 - Add Armor value to NPC boxes 
 - Overburdened value now correctly increments when you go over the max encumbrance value, rather then at max encumbrance value. 
diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css
index a2b76a1cca..0185a8f073 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css	
@@ -1,5 +1,5 @@
 /* === BODY === */
-*, .sheet-rolltemplate-whfrp2e * {
+*, .sheet-rolltemplate-wfrp4e * {
 	box-sizing: border-box;
 }
 @font-face {
@@ -13,7 +13,6 @@
 }
 	
 .sheet-useBackground input[value="1"]:checked ~ *.sheet-background {
-	padding: 0  3px 3px !important;
 	background: url('https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/csbg_wfrp.png?raw=true');
   background-size: auto;
 	border: 27px solid transparent;
@@ -34,7 +33,6 @@
 }
 
 .sheet-useBackground input[value="2"]:checked ~ *.sheet-background {
-	padding: 0  3px 3px !important;
 	background: url('https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/csbg_wfrp.png?raw=true');
 	border: 27px solid transparent;
 	border-image: url('https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/csborder_dark.png?raw=true') 27 round;
@@ -54,7 +52,6 @@
 }
 
 .sheet-useBackground input[value="3"]:checked ~ *.sheet-background {
-	padding: 0  3px 3px !important;
 	background: url('https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/csbg_wfrp.png?raw=true');
 	border: 27px solid transparent;
 	border-image: url('https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/csborder_empire.png?raw=true') 27 round;
@@ -74,7 +71,6 @@
 }
 
 .sheet-useBackground input[value="4"]:checked ~ *.sheet-background {
-	padding: 0  3px 3px !important;
 	background: url('https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/csbg_wfrp.png?raw=true');
 	border: 27px solid transparent;
 	border-image: url('https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/csborder_dwarf.png?raw=true') 27 round;
@@ -94,7 +90,6 @@
 }
 
 .sheet-useBackground input[value="5"]:checked ~ *.sheet-background {
-	padding: 0  3px 3px !important;
 	background: url('https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/csbg_wfrp.png?raw=true');
 	border: 27px solid transparent;
 	border-image: url('https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/csborder_elf.png?raw=true') 27 round;
@@ -191,6 +186,7 @@ li {
 	line-height: 100%;
 }
 
+.sheet-combat-actions-half,
 .sheet-combat-actions {
     display: block;
     width: 100%;
@@ -271,22 +267,22 @@ input[type=checkbox][name*=attr_container-minimize]:checked{
 /* === BUTTONS === */
 button[type=action] {
 	position: relative;
-	background-color: #e3e1e1;
 	border: 1px solid black;
 	border-color: #423d32;
-	color: black;
+	color: var(--bgtc);
+	background-color: var(--bgc);
 	background-image: linear-gradient(rgba(255,255,255,.3), rgba(255,255,255,0));
 	width: 16px; /*Desired width*/
 	height: 18px; /*Desired height*/
 	padding: 0px 0px 0px 0px;
 	font-size: 8px;
 	line-height: 100%;
+	text-shadow:  0 1px 1px rgba(0,0,0,1);
 }
-button[type=action]:focus {
-    outline: 0 !important;
-}
-
+button[type=action].sheet-combat-actions-np,
+button[type=action].sheet-roll,
 button[type=roll] {
+    z-index: 998;
 	background-color: var(--bgc);
 	border-radius: 4px;
 	border: 1px solid;
@@ -294,11 +290,31 @@ button[type=roll] {
 	color: var(--bgtc);
 	background-image: linear-gradient(rgba(255,255,255,.3), rgba(255,255,255,0));	
 	text-shadow: var(--ts);
+	font-size: 8px;
+	line-height: 100%;
 }
+button[type=action].sheet-roll:hover {
+    z-index: 998;
+	background-color: #73560f;
+	border-radius: 4px;
+	border: 1px solid;
+	border-color: #423d32;
+	color: var(--bgtc);
+	text-shadow: var(--ts);
+	font-size: 8px;
+	line-height: 100%;
+}
+
+button[type=action]:before,
+button[type=action] span,
 button[type=roll]:before,
 button[type=roll] span {
 	vertical-align: baseline;
 }
+button[type=action].sheet-roll-flex::before,
+button[type=roll].sheet-roll-flex::before {
+	content: none !important;
+}
 .sheet-skills button[type=roll],
 .sheet-initiative button[type=roll] {
 	font-size: 12px;
@@ -341,11 +357,12 @@ button[type=roll].sheet-npc-combat::before {
 button[type=roll].sheet-npc-combat {
 	position: relative;
 	width: 23px;
-	height: 18px;
+	height: 17px;
 	font-size: 9px !important;
 	padding-bottom: 1px !important;
 	line-height: 100%;
 	color: var(--bgtc);
+	bottom: 1px;
 }
 
 
@@ -391,12 +408,69 @@ button[type=roll].sheet-adv-buttonnpc {
 	text-shadow:  0 1px 1px rgba(0,0,0,1);
 }
 
-
+button[type=action].sheet-combat-actions,
 button[type=roll].sheet-combat-actions {
 	border-radius: 1px;
 	font-size: 11px;
 	display: left;
 	height: 24px;
+	color: white;
+	padding: 1px 2px;
+	padding-bottom: -1px;
+	width: 100%;
+	margin: auto;
+	background-color: var(--bgc);
+	font-weight: var(--bgfw);
+	border: 1px solid;
+	border-color: #423d32;
+	background-image: var(--bgi);
+	text-align: center;
+	text-shadow:  0 1px 1px rgba(0,0,0,1);
+}
+
+button[type=action].sheet-combat-mini {
+	border-radius: 1px;
+	display: inline;
+	height: 12px;
+	width: 16px;
+	margin: auto;
+	color: white;
+	background-color: var(--bgc);
+	font-weight: normal;
+	border: 1px solid;
+	border-color: #423d32;
+	background-image: var(--bgi);
+	text-align: top;
+	vertical-align: text-top;
+	font-size: 8px;
+	line-height: 11px;
+	text-shadow: var(--ts);
+}
+
+button[type=action].sheet-combat-mini span {
+display: inline-block;
+position: relative;
+}
+button[type=roll].sheet-roll:hover,
+button[type=action].sheet-roll:hover,
+button[type=roll].sheet-combat-actions-rep:hover,
+button[type=action].sheet-combat-actions-rep:hover,
+button[type=roll].sheet-combat-actions-np:hover,
+button[type=action].sheet-combat-actions-np:hover,
+button[type=roll].sheet-combat-mini:hover,
+button[type=roll].sheet-combat-actions:hover,
+button[type=action].sheet-combat-actions:hover,
+button[type=action].sheet-combat-mini:hover {
+	filter: invert(1);
+}
+
+
+button[type=action].sheet-combat-actions-half,
+button[type=roll].sheet-combat-actions-half {
+	border-radius: 1px;
+	font-size: 8px;
+	display: left;
+	height: 12px;
 	padding: 1px 2px;
 	padding-bottom: -1px;
 	width: 100%;
@@ -408,14 +482,35 @@ button[type=roll].sheet-combat-actions {
 	background-image: var(--bgi);
 	text-align: center;
 }
+button[type=roll].sheet-combat-actions-half:hover,
+button[type=action].sheet-combat-actions-half:hover {
+	border-radius: 1px;
+	font-size: 8px;
+	display: left;
+	height: 12px;
+	padding: 1px 2px;
+	padding-bottom: -1px;
+	width: 100%;
+	margin: auto;
+	filter: invert(1);
+	font-weight: var(--bgfw);
+	border: 1px solid;
+	text-align: center;
+}
 
-button[type=roll].sheet-combat-actions-np::before {
+button[type=action].sheet-combat-actions-half::before,
+button[type=roll].sheet-combat-actions-half::before,
+button[type=action].sheet-combat-mini::before,
+button[type=roll].sheet-combat-mini::before,
+button[type=roll].sheet-combat-actions-np::before,
+button[type=action].sheet-combat-actions-np::before {
     background-image: none;
 	background-color: transparent;
 	content: none;
 }
 
 
+button[type=action].sheet-combat-actions-np,
 button[type=roll].sheet-combat-actions-np {
 	border-radius: 1px;
 	font-size: 11px;
@@ -434,20 +529,19 @@ button[type=roll].sheet-combat-actions-np {
 }
 
 
-
+button[type=action].sheet-combat-actions-rep::before,
 button[type=roll].sheet-combat-actions-rep::before {
     background-image: none;
 	background-color: transparent;
 	content: none;
 }
-
+button[type=action].sheet-combat-actions-rep,
 button[type=roll].sheet-combat-actions-rep {
     z-index: 999;
 	border-radius: 1px;
 	font-size: 9px;
 	height: 18px;
-	width: auto;
-	padding-top: 50px;
+	width: 100%;
 	background-color: var(--bgc);
 	font-weight: var(--bgfw);
 	border: 1px solid;
@@ -457,6 +551,19 @@ button[type=roll].sheet-combat-actions-rep {
 	float: center;
 	margin: 0px 0px 0px 0px;
 }
+button[type=action].sheet-combat-actions-rep:hover {
+	border-radius: 1px;
+	font-size: 8px;
+	display: left;
+	height: 18px;
+	padding: 1px 2px;
+	padding-bottom: -1px;
+	margin: auto;
+	filter: invert(1);
+	font-weight: var(--bgfw);
+	border: 1px solid;
+	text-align: center;
+}
 
 span.sheet-combat-actions-rep {
 	text-align: center;
@@ -466,6 +573,16 @@ span.sheet-combat-actions-rep {
 	float: center;
 }
 
+.sheet-talents-border {
+	border: 1px solid;
+    padding-bottom: 3.5px;
+    position: relative;
+    top: 2px;
+	height: 20px;
+    padding-top: 3.5px;
+    border: 1px solid #cfcfcf;
+    background-color: white;
+}
 
 button[type=radio] {
 	border: 1px solid;
@@ -535,6 +652,12 @@ input[type=radio] {
   line-height: 16px;
 }
 
+.sheet-dev {
+display:none;
+}
+.sheet-devmode:checked ~ .sheet-dev {
+display:flex;
+}
 
 /* === FIELDSETS === */
 .repcontrol,
@@ -552,13 +675,14 @@ input[type=radio] {
 .sheet-hidden {
 	display: none;
 }
+.sheet-hider:not(:checked) + input,
 .sheet-hider:not(:checked) + div {
 	display: none;
 }
 
 /* === LAYOUT === */
 .sheet-float-right,
-.sheet-rolltemplate-whfrp2e .sheet-float-right {
+.sheet-rolltemplate-wfrp4e .sheet-float-right {
 	float: right;
 }
 .sheet-inline {
@@ -567,7 +691,7 @@ input[type=radio] {
 .sheet-inline-block {
 	display: inline-block;
 }
-.sheet-rolltemplate-whfrp2e .sheet-relative,
+.sheet-rolltemplate-wfrp4e .sheet-relative,
 .sheet-relative {
 	position: relative;
 }
@@ -775,18 +899,18 @@ input[type=radio] {
 
 /* === TOOLTIPS === */
 .sheet-tooltip-position-wrapper,
-.sheet-rolltemplate-whfrp2e .sheet-tooltip-position-wrapper {
+.sheet-rolltemplate-wfrp4e .sheet-tooltip-position-wrapper {
 	position: absolute;
 	top: 1px;
 	right: 1px;
 	z-index: 99;
 }
 .sheet-tooltip,
-.sheet-rolltemplate-whfrp2e .sheet-tooltip {
+.sheet-rolltemplate-wfrp4e .sheet-tooltip {
 	position: relative;
 }
 .sheet-tooltip-toggle-text,
-.sheet-rolltemplate-whfrp2e .sheet-tooltip-toggle-text {
+.sheet-rolltemplate-wfrp4e .sheet-tooltip-toggle-text {
 	border-radius: 50%;
 	line-height: 100%;
 	font-size: 77%;
@@ -798,7 +922,7 @@ input[type=radio] {
 	font-weight: bold;
 }
 .sheet-tooltip [class*="sheet-tooltip-content"],
-.sheet-rolltemplate-whfrp2e .sheet-tooltip [class*="sheet-tooltip-content"] {
+.sheet-rolltemplate-wfrp4e .sheet-tooltip [class*="sheet-tooltip-content"] {
 	z-index: 99;
 	position: absolute;
 	color: #FFFFFF;
@@ -813,23 +937,23 @@ input[type=radio] {
 	text-align: left;
 }
 .sheet-tooltip .sheet-tooltip-small,
-.sheet-rolltemplate-whfrp2e .sheet-tooltip .sheet-tooltip-small {
+.sheet-rolltemplate-wfrp4e .sheet-tooltip .sheet-tooltip-small {
 	width: 80px;
 }
 .sheet-tooltip .sheet-tooltip-content-left,
-.sheet-rolltemplate-whfrp2e .sheet-tooltip .sheet-tooltip-content-left {
+.sheet-rolltemplate-wfrp4e .sheet-tooltip .sheet-tooltip-content-left {
 	right: 100%;
 	margin-right: 12px;
 	border-top-left-radius: 4px;
 }
 .sheet-tooltip .sheet-tooltip-content-right,
-.sheet-rolltemplate-whfrp2e .sheet-tooltip .sheet-tooltip-content-right {
+.sheet-rolltemplate-wfrp4e .sheet-tooltip .sheet-tooltip-content-right {
 	left: 100%;
 	margin-left: 12px;
 	border-top-right-radius: 4px;
 }
 .sheet-tooltip [class*="sheet-tooltip-content"]:after,
-.sheet-rolltemplate-whfrp2e .sheet-tooltip [class*="sheet-tooltip-content"]:after {
+.sheet-rolltemplate-wfrp4e .sheet-tooltip [class*="sheet-tooltip-content"]:after {
 	content: '';
 	position: absolute;
 	top: 9px;
@@ -838,19 +962,19 @@ input[type=radio] {
 	border-bottom: 8px solid transparent;
 }
 .sheet-tooltip .sheet-tooltip-content-left:after,
-.sheet-rolltemplate-whfrp2e .sheet-tooltip .sheet-tooltip-content-left:after {
+.sheet-rolltemplate-wfrp4e .sheet-tooltip .sheet-tooltip-content-left:after {
 	right: -8px;
 	border-left: 8px solid #000000;
 }
 .sheet-tooltip .sheet-tooltip-content-right:after,
-.sheet-rolltemplate-whfrp2e .sheet-tooltip .sheet-tooltip-content-right:after {
+.sheet-rolltemplate-wfrp4e .sheet-tooltip .sheet-tooltip-content-right:after {
 	left: -8px;
 	border-right: 8px solid #000000;
 }
 .sheet-tooltip:hover [class*="sheet-tooltip-content"],
 .sheet-tooltip:focus [class*="sheet-tooltip-content"],
-.sheet-rolltemplate-whfrp2e .sheet-tooltip:hover [class*="sheet-tooltip-content"],
-.sheet-rolltemplate-whfrp2e .sheet-tooltip:focus [class*="sheet-tooltip-content"] {
+.sheet-rolltemplate-wfrp4e .sheet-tooltip:hover [class*="sheet-tooltip-content"],
+.sheet-rolltemplate-wfrp4e .sheet-tooltip:focus [class*="sheet-tooltip-content"] {
 	visibility: visible;
 	z-index: 999;
 }
@@ -1771,7 +1895,7 @@ input {
 }
 
 .sheet-small-label,
-.sheet-rolltemplate-whfrp2e .sheet-small-label {
+.sheet-rolltemplate-wfrp4e .sheet-small-label {
 	font-size: 10px !important;
 	line-height: 100%;
 	padding-top: 2px;
@@ -1780,7 +1904,7 @@ input {
 }
 
 .sheet-small-label-white,
-.sheet-rolltemplate-whfrp2e .sheet-small-label-white {
+.sheet-rolltemplate-wfrp4e .sheet-small-label-white {
 	font-size: 11px !important;
     font-family: 'WH font';
 	font-weight: bold;
@@ -1814,7 +1938,7 @@ input {
 
 
 .sheet-last-updated,
-.sheet-rolltemplate-whfrp2e .sheet-last-updated {
+.sheet-rolltemplate-wfrp4e .sheet-last-updated {
 	font-size: 85%!important;
 	font-style: italic;
 	font-weight: bold;
@@ -1822,7 +1946,7 @@ input {
 }
 
 .sheet-hd-row,
-.sheet-rolltemplate-whfrp2e .sheet-hd-row {
+.sheet-rolltemplate-wfrp4e .sheet-hd-row {
 	font-size: 62% !important;
 	line-height: 100% !important;
 }
@@ -1830,45 +1954,45 @@ input {
 
 /* === FONTS === */
 .sheet-pictos,
-.sheet-rolltemplate-whfrp2e .sheet-pictos {
+.sheet-rolltemplate-wfrp4e .sheet-pictos {
 	font-family: "Pictos";
 	font-size: 14px;
 }
 .sheet-pictos-custom,
-.sheet-rolltemplate-whfrp2e .sheet-pictos-custom {
+.sheet-rolltemplate-wfrp4e .sheet-pictos-custom {
 	font-family: "Pictos Custom";
 	font-size: 14px;
 }
 .sheet-pictos-three,
-.sheet-rolltemplate-whfrp2e .sheet-pictos-three {
+.sheet-rolltemplate-wfrp4e .sheet-pictos-three {
 	font-family: "Pictos Three";
 	font-size: 14px;
 }
 .sheet-concentration-icon,
-.sheet-rolltemplate-whfrp2e .sheet-concentration-icon {
+.sheet-rolltemplate-wfrp4e .sheet-concentration-icon {
 	font-size: 14px;
 }
 .sheet-ritual-icon,
-.sheet-rolltemplate-whfrp2e .sheet-ritual-icon {
+.sheet-rolltemplate-wfrp4e .sheet-ritual-icon {
 	font-size: 16px;
 }
 .sheet-d6-font,
-.sheet-rolltemplate-whfrp2e .sheet-d6-font {
+.sheet-rolltemplate-wfrp4e .sheet-d6-font {
 	font-family: "dicefontd6";
 	font-size: 14px;
 }
 .sheet-d8-font,
-.sheet-rolltemplate-whfrp2e .sheet-d8-font {
+.sheet-rolltemplate-wfrp4e .sheet-d8-font {
 	font-family: "dicefontd8";
 	font-size: 14px;
 }
 .sheet-d10-font,
-.sheet-rolltemplate-whfrp2e .sheet-d10-font {
+.sheet-rolltemplate-wfrp4e .sheet-d10-font {
 	font-family: "dicefontd10";
 	font-size: 14px;
 }
 .sheet-d20-font,
-.sheet-rolltemplate-whfrp2e .sheet-d20-font {
+.sheet-rolltemplate-wfrp4e .sheet-d20-font {
 	font-family: "dicefontd20";
 	font-size: 14px;
 }
@@ -1876,43 +2000,43 @@ input {
 
 /* === BORDERS === */
 .sheet-border-right,
-.sheet-rolltemplate-whfrp2e .sheet-border-right {
+.sheet-rolltemplate-wfrp4e .sheet-border-right {
 	border-right: 1px solid #b8b8b8;
 }
 .sheet-border-left,
-.sheet-rolltemplate-whfrp2e .sheet-border-left {
+.sheet-rolltemplate-wfrp4e .sheet-border-left {
 	border-left: 1px solid #b8b8b8;
 }
 .sheet-border-right2,
-.sheet-rolltemplate-whfrp2e .sheet-border-right2 {
+.sheet-rolltemplate-wfrp4e .sheet-border-right2 {
 	border-right: 2px solid #000;
 }
 .sheet-border-left2,
-.sheet-rolltemplate-whfrp2e .sheet-border-left2 {
+.sheet-rolltemplate-wfrp4e .sheet-border-left2 {
 	border-left: 2px solid #000;
 }
 .sheet-border-top,
-.sheet-rolltemplate-whfrp2e .sheet-border-top {
+.sheet-rolltemplate-wfrp4e .sheet-border-top {
 	border-top: 1px solid #000;
 }
 .sheet-border-bottom,
-.sheet-rolltemplate-whfrp2e .sheet-border-bottom {
+.sheet-rolltemplate-wfrp4e .sheet-border-bottom {
 	border-bottom: 1px solid #000;
 }
 .sheet-border-right-dotted,
-.sheet-rolltemplate-whfrp2e .sheet-border-right-dotted {
+.sheet-rolltemplate-wfrp4e .sheet-border-right-dotted {
 	border-right: 1px dotted #000;
 }
 .sheet-border-left-dotted,
-.sheet-rolltemplate-whfrp2e .sheet-border-left-dotted {
+.sheet-rolltemplate-wfrp4e .sheet-border-left-dotted {
 	border-left: 1px dotted #000;
 }
 .sheet-border-top-dotted,
-.sheet-rolltemplate-whfrp2e .sheet-border-top-dotted {
+.sheet-rolltemplate-wfrp4e .sheet-border-top-dotted {
 	border-top: 1px dotted #000;
 }
 .sheet-border-bottom-dotted,
-.sheet-rolltemplate-whfrp2e .sheet-border-bottom-dotted {
+.sheet-rolltemplate-wfrp4e .sheet-border-bottom-dotted {
 	border-bottom: 1px dotted #000;
 }
 
@@ -1942,7 +2066,7 @@ input[type=number], input[type=text], input[type=value], select {
 	text-align: center;	
 	border: 1px solid #cfcfcf;
 }
-
+button[type=action].sheet-combat-actions-np,
 button[type=roll].sheet-combat-actions-np {
 	font-size: 12px;
       vertical-align: center;
@@ -2030,16 +2154,37 @@ textarea {
 
 button.sheet-roll {
 	position: relative;
+	height: 23px;
+	width: 19px;
 	font-size: 12px !important;
 	padding-top: 1px !important;
 	padding-bottom: 1px !important;
 	color: var(--bgtc);
 }
+button[type=action].sheet-roll-flex {
+	padding-left: 3px;
+	padding-right: 4px;
+	border-radius: 4px;
+}
+button.sheet-roll-flex {
+	position: relative;
+	height: 23px;
+	width: auto;
+	font-weight: bold;
+	font-size: 12px !important;
+	padding-top: 1px !important;
+	padding-bottom: 1px !important;
+	color: var(--bgtc);
+}
+button.sheet-roll-flex:hover {
+	filter: invert(1);
+}
 button.sheet-combat-actions-rep {
 	position: relative;
 	font-size: 11px !important;
-	padding-top: 0px !important;
-	padding-bottom: 3px !important;
+	padding-top: 1px !important;
+	padding-left: 2px !important;
+	padding-right: 2px !important;
 	color: var(--bgtc);
 }
 button.sheet-roll2 {
@@ -2080,7 +2225,7 @@ button[type=roll].sheet-talent-show::before {
 	content: none;
 }
 hr,
-.sheet-rolltemplate-whfrp2e hr {
+.sheet-rolltemplate-wfrp4e hr {
 	border: 0;
 	height: 1px;
 	background-image: -webkit-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,75.75), rgba(0,0,0,0));
@@ -2091,17 +2236,17 @@ hr,
 }
 
 span.sheet-spacer,
-.sheet-rolltemplate-whfrp2e span.sheet-spacer {
+.sheet-rolltemplate-wfrp4e span.sheet-spacer {
 	display: block;
 	margin-top: 5px;
 }
 .sheet-spacer-l,
-.sheet-rolltemplate-whfrp2e span.sheet-spacer-l {
+.sheet-rolltemplate-wfrp4e span.sheet-spacer-l {
 	display: block;
 	margin-top: 10px;
 }
 .sheet-spacer-xl,
-.sheet-rolltemplate-whfrp2e span.sheet-spacer-xl  {
+.sheet-rolltemplate-wfrp4e span.sheet-spacer-xl  {
 	display: block;
 	margin-top: 20px;
 }
@@ -2118,22 +2263,22 @@ span.sheet-spacer,
 	margin-bottom: 5px;
 }
 .sheet-vert-top,
-.sheet-rolltemplate-whfrp2e .sheet-vert-top {
+.sheet-rolltemplate-wfrp4e .sheet-vert-top {
 	vertical-align: top !important;
 }
 .sheet-vert-middle,
-.sheet-rolltemplate-whfrp2e .sheet-vert-middle {
+.sheet-rolltemplate-wfrp4e .sheet-vert-middle {
 	vertical-align: middle !important;
 }
 .sheet-text-middle {
 	text-align: middle !important;
 }
 .sheet-vert-bottom,
-.sheet-rolltemplate-whfrp2e .sheet-vert-bottom {
+.sheet-rolltemplate-wfrp4e .sheet-vert-bottom {
 	vertical-align: bottom !important;
 }
 .sheet-center,
-.sheet-rolltemplate-whfrp2e .sheet-center {
+.sheet-rolltemplate-wfrp4e .sheet-center {
 	text-align: center;
     font-family: 'WH font';
 }
@@ -2307,7 +2452,7 @@ input[disabled].sheet-passive-skill-score {
 
 /* === ROLLTEMPLATE === */
 [class^="sheet-col"],
-.sheet-rolltemplate-whfrp2e [class^="sheet-col"] {
+.sheet-rolltemplate-wfrp4e [class^="sheet-col"] {
 	display: inline-block;
 	*display: inline; /* IE < 8: fake inline-block */
 	zoom: 1;
@@ -2316,12 +2461,12 @@ input[disabled].sheet-passive-skill-score {
 
 	text-rendering: auto;
 }
-.sheet-rolltemplate-whfrp2e_char table {
+.sheet-rolltemplate-wfrp4e_char table {
 	width: 100%;
 	padding: 2px;
 	background:url(http://i.imgur.com/BLb0XMU.jpg) top left repeat;
 }
-.sheet-rolltemplate-whfrp2e_char th {
+.sheet-rolltemplate-wfrp4e_char th {
     color: rgb(233, 223, 151);
     background-color: rgb(63, 32, 33);
     padding-left: 5px;
@@ -2331,49 +2476,73 @@ input[disabled].sheet-passive-skill-score {
     font-family: "Arial", Helvetica, sans-serif;
     text-transform: uppercase;
 }
-.sheet-rolltemplate-whfrp2e_char .sheet-arrow-right {
+.sheet-rolltemplate-wfrp4e_char .sheet-arrow-right {
     border-top: 3px solid transparent;
     border-bottom: 3px solid transparent;
     border-left: 180px solid rgb(126, 45, 64);
 }
-.sheet-rolltemplate-whfrp2e_char .sheet-tcat {
+.sheet-rolltemplate-wfrp4e_char .sheet-tcat {
     font-weight: bold;
 }
-.sheet-rolltemplate-whfrp2e_char td {
+.sheet-rolltemplate-wfrp4e_char td {
     padding-left: 5px;
     font-size: 0.9em;
 }
-.sheet-rolltemplate-whfrp2e_char .inlinerollresult  {
+.sheet-rolltemplate-wfrp4e_char .inlinerollresult  {
     background-color: transparent;
     border: none;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-card .sheet-main-content .sheet-row .sheet-no-yellow-bg .inlinerollresult {
+.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-no-yellow-bg .inlinerollresult {
     background-color: transparent;
-	font-style: italic;
-	font-size: 1.1em;
+	font-style: normal;
+	font-size: 12px;
 	font-weight: bold;
 	font-family: Arial, Helvetica, sans-serif;
     border: none;
 	-moz-text-decoration-color: #D79340;
 	text-decoration-color: #D79340;
 }
-.sheet-rolltemplate-whfrp2e_char .inlinerollresult.fullcrit {
+.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-no-yellow-bg2 .inlinerollresult {
+    background-color: transparent;
+	font-style: normal;
+	font-size: 14px;
+	font-weight: bold;
+	border: 0px;
+	text-indent: 2px;
+}
+.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-no-yellow-bg-no-bold .inlinerollresult {
+    background-color: transparent;
+	font-style: normal;
+	font-size: 12px;
+	font-weight: bold;
+	font-family: Arial, Helvetica, sans-serif;
+    border: none;
+	-moz-text-decoration-color: #D79340;
+	text-decoration-color: #D79340;
+}
+.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-no-yellow-bg-no-bold .sheet-rt-test .inlinerollresult {
+	padding-left: 4px;
+}
+.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-rt-no-border .inlinerollresult {
+    border: none;
+}
+.sheet-rolltemplate-wfrp4e_char .inlinerollresult.fullcrit {
     color: #3FB315;
     border: none;
 }
-.sheet-rolltemplate-whfrp2e_char .inlinerollresult.fullfail {
+.sheet-rolltemplate-wfrp4e_char .inlinerollresult.fullfail {
     color: #B31515;
     border: none;
 }
-.sheet-rolltemplate-whfrp2e_char .inlinerollresult.importantroll {
+.sheet-rolltemplate-wfrp4e_char .inlinerollresult.importantroll {
 	color: #4A57ED;
     border: none;
 }
-.sheet-rolltemplate-whfrp2e {
+.sheet-rolltemplate-wfrp4e {
 	margin-left: -4px;
 	margin-right: -2px
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-card {
+.sheet-rolltemplate-wfrp4e .sheet-rt-card {
 	margin-right: 10px;
 	background-color:#FFFFFF;
 	font-size: 11px;
@@ -2385,78 +2554,88 @@ input[disabled].sheet-passive-skill-score {
 	
 	box-sizing: border-box;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-adv {
+.sheet-rolltemplate-wfrp4e .sheet-rt-adv {
 	color:#a69750;
 	font-style:italic;
-	text-indent: -98px;
 	font-size: 1.1em;
 	font-weight: bold;
 	font-family: Arial, Helvetica, sans-serif;
+	text-align: left;
+	padding-left: 35px;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-slmod {
+.sheet-rolltemplate-wfrp4e .sheet-rt-slmod {
+	color:#858585;
+	font-style:normal;
+	font-size: 1.1em;
+	font-weight: bold;
+	font-family: Arial, Helvetica, sans-serif;
+	text-align: left;
+	padding-left: 40px;
+}
+.sheet-rolltemplate-wfrp4e .sheet-rt-fatigued {
 	color:#858585;
 	font-style:italic;
 	font-size: 1.1em;
 	font-weight: bold;
 	font-family: Arial, Helvetica, sans-serif;
+	text-align: left;
+	padding-left: 35px;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-fatigued {
+.sheet-rolltemplate-wfrp4e .sheet-rt-blinded {
 	color:#858585;
 	font-style:italic;
-	text-indent: -113px;
 	font-size: 1.1em;
 	font-weight: bold;
 	font-family: Arial, Helvetica, sans-serif;
+	text-align: left;
+	padding-left: 35px;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-blinded {
+.sheet-rolltemplate-wfrp4e .sheet-rt-broken {
 	color:#858585;
 	font-style:italic;
-	text-indent: -119px;
 	font-size: 1.1em;
 	font-weight: bold;
 	font-family: Arial, Helvetica, sans-serif;
+	text-align: left;
+	padding-left: 35px;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-broken {
+.sheet-rolltemplate-wfrp4e .sheet-rt-deafened {
 	color:#858585;
 	font-style:italic;
-	text-indent: -122px;
 	font-size: 1.1em;
 	font-weight: bold;
 	font-family: Arial, Helvetica, sans-serif;
+	text-align: left;
+	padding-left: 35px;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-deafened {
+.sheet-rolltemplate-wfrp4e .sheet-rt-entangled {
 	color:#858585;
 	font-style:italic;
-	text-indent: -108px;
 	font-size: 1.1em;
 	font-weight: bold;
 	font-family: Arial, Helvetica, sans-serif;
+	text-align: left;
+	padding-left: 35px;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-entangled {
-	color:#858585;
-	font-style:italic;
-	text-indent: -105px;
-	font-size: 1.1em;
-	font-weight: bold;
-	font-family: Arial, Helvetica, sans-serif;
-}
-.sheet-rolltemplate-whfrp2e .sheet-rt-poisoned {
+.sheet-rolltemplate-wfrp4e .sheet-rt-poisoned {
 	color:#75a17e;
 	font-style:italic;
-	text-indent: -109px;
 	font-size: 1.1em;
 	font-weight: bold;
 	font-family: Arial, Helvetica, sans-serif;
+	text-align: left;
+	padding-left: 35px;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-prone {
+.sheet-rolltemplate-wfrp4e .sheet-rt-prone {
 	color:#858585;
 	font-style:italic;
-	text-indent: -130px;
 	font-size: 1.1em;
 	font-weight: bold;
 	font-family: Arial, Helvetica, sans-serif;
+	text-align: left;
+	padding-left: 35px;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-armorpen {
+.sheet-rolltemplate-wfrp4e .sheet-rt-armorpen {
 	color:#858585;
 	font-style:italic;
 	text-indent: -67px;
@@ -2464,21 +2643,21 @@ input[disabled].sheet-passive-skill-score {
 	font-weight: bold;
 	font-family: Arial, Helvetica, sans-serif;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-critical {
+.sheet-rolltemplate-wfrp4e .sheet-rt-critical {
   text-align: center;
   position: relative;
   color:green;
   font-style:italic;
   font-size: 1.1em;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-fumble {
+.sheet-rolltemplate-wfrp4e .sheet-rt-fumble {
   text-align: center;
   position: relative;
   color:red;
   font-style:italic;
   font-size: 1.1em;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-wrath {
+.sheet-rolltemplate-wfrp4e .sheet-rt-wrath {
   position: relative;
   color:red;
   font-style:italic;
@@ -2486,7 +2665,7 @@ input[disabled].sheet-passive-skill-score {
   font-size: 1.1em;
 }
 
-.sheet-rolltemplate-whfrp2e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-white a[href^="~"] {
+.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-white a[href^="~"] {
 	font-size: 12px !important;
 	padding-top: 1px !important;
 	padding-bottom: 1px !important;
@@ -2501,7 +2680,7 @@ input[disabled].sheet-passive-skill-score {
 	font-style: normal;
 }
 
-.sheet-rolltemplate-whfrp2e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-miscast a[href^="~"] {
+.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-miscast a[href^="~"] {
 	font-size: 15px !important;
 	padding-top: 1px !important;
 	padding-bottom: 1px !important;
@@ -2517,17 +2696,31 @@ input[disabled].sheet-passive-skill-score {
 	font-style: normal;
 }
 
-.sheet-rolltemplate-whfrp2e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-white:hover a[href^="~"] {
-	opacity: 1;
-
+.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-ripostedmg a[href^="~"] {
+	font-size: 11px !important;
+	padding-top: 1px !important;
+	padding-bottom: 1px !important;
+	color: black;
+	background-color: transparent;
+	border: none;
+	height: 1px;
+	width: 1px;
+	padding-left: 8px;
+	margin-right: 10px;
+	font-family: pictos;
+	opacity: 0.5;
+	font-style: normal;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-miscast:hover a[href^="~"] {
+
+.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-ripostedmg:hover a[href^="~"],
+.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-white:hover a[href^="~"],
+.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-miscast:hover a[href^="~"] {
 	opacity: 1;
 
 }
 
 /* Generic header */
-.sheet-rolltemplate-whfrp2e .sheet-rt-header {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header {
 	text-align: center;
 	position: relative;
 	color: #fff;
@@ -2538,122 +2731,129 @@ input[disabled].sheet-passive-skill-score {
 	
 	box-shadow: 0 2px 0 rgba(0,0,0,.3);
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-header .inlinerollresult {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header .inlinerollresult {
 	background: transparent;
 	border: none;
 	padding: 0;
 	font-weight: normal;
 	font-size: 1em;
 }
-.sheet-rolltemplate-whfrp2e .inlinerollresult {
+.sheet-rolltemplate-wfrp4e .inlinerollresult {
 	padding: 0 2px;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-header:before,
-.sheet-rolltemplate-whfrp2e .sheet-rt-header:after {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header:before,
+.sheet-rolltemplate-wfrp4e .sheet-rt-header:after {
 	content: '';
 	position: absolute;
 	border-style: solid;
 	border-color: transparent;
 	bottom: -10px;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-header:before {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header:before {
 	border-width: 0 10px 10px 0;
 	border-right-color: #222;
 	left: 0;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-header:after {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header:after {
 	border-width: 0 0 10px 10px;
 	border-left-color: #222;
 	right: 0;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-title {
+.sheet-rolltemplate-wfrp4e .sheet-rt-title {
 	font-size: 1.5em;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-subheader {
+.sheet-rolltemplate-wfrp4e .sheet-rt-subheader {
 	line-height: 120%;
 }
 
 /* Melee header*/
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-attack,
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-weapon {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-attack,
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-weapon {
 	background-color: #902000;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-attack:before,
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-weapon:before {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-attack:before,
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-weapon:before {
 	border-right-color: #902000;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-attack:after,
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-weapon:after {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-attack:after,
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-weapon:after {
 	border-left-color: #902000;
 }
 
 /* Skill test header*/
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-action {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-action {
 	background-color: #906000;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-action:before {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-action:before {
 	border-right-color: #906000;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-action:before {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-action:before {
 	border-left-color: #906000;
 }
 /* Heal test header*/
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-heal {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-heal {
 	background-color: #347891;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-heal:before {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-heal:before {
 	border-right-color: #347891;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-heal:before {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-heal:before {
 	border-left-color: #347891;
 }
 /* Spell header */
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-spell {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-spell {
 	background-color: #505050;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-spell:before {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-spell:before {
 	border-right-color: #505050;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-spell:after {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-spell:after {
 	border-left-color: #505050;
 }
 
 /* Characteristic test header */
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-ability {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-ability {
 	background-color: #603000;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-ability:before {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-ability:before {
 	border-right-color: #603000;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-ability:after {
+.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-ability:after {
 	border-left-color: #603000;
 }
 
-.sheet-rolltemplate-whfrp2e .sheet-row:nth-child(even) {
+.sheet-rolltemplate-wfrp4e .sheet-row:nth-child(even) {
 	background-color: #EEECEA;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-key,
-.sheet-rolltemplate-whfrp2e .sheet-rt-key-wide {
+.sheet-rolltemplate-wfrp4e .sheet-rt-key,
+.sheet-rolltemplate-wfrp4e .sheet-rt-key-wide,
+.sheet-rolltemplate-wfrp4e .sheet-rt-effects {
     display:inline-block;
 	font-weight: bold;
 	font-family: Arial, Helvetica, sans-serif;
-	font-size: 1.1em;
 	text-indent: 4px;
 	-moz-text-decoration-color: #D79340;
 	text-decoration-color: #D79340;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-key {
+.sheet-rolltemplate-wfrp4e .sheet-rt-key,
+.sheet-rolltemplate-wfrp4e .sheet-rt-key-wide {
+	font-size: 12px;
+}
+.sheet-rolltemplate-wfrp4e .sheet-rt-effects {
+	font-size: 11px;
+}
+.sheet-rolltemplate-wfrp4e .sheet-rt-key {
 	max-width: 120px;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-value {
+.sheet-rolltemplate-wfrp4e .sheet-rt-value {
     display:inline-block;
 	box-sizing: border-box;
 	padding-left: 3px
 }
-.sheet-rolltemplate-whfrp2e .sheet-main-content .sheet-row:not(:first-child) {
+.sheet-rolltemplate-wfrp4e .sheet-main-content .sheet-row:not(:first-child) {
 	margin-top: 2px;
 }
-.sheet-rolltemplate-whfrp2e .sheet-main-content hr.sheet-roll {
+.sheet-rolltemplate-wfrp4e .sheet-main-content hr.sheet-roll {
 	width: 80%;
 	margin-left: auto;
 	margin-right: auto;
@@ -2662,7 +2862,7 @@ input[disabled].sheet-passive-skill-score {
 	background-color: #D7A540;
 	height: 1px;
 }
-.sheet-rolltemplate-whfrp2e .sheet-rt-emote {
+.sheet-rolltemplate-wfrp4e .sheet-rt-emote {
 	font-style: italic;
 	font-size: 11px;
 	font-family: Arial;
@@ -2677,1643 +2877,1649 @@ input[disabled].sheet-passive-skill-score {
 
 /* === GRID (DO NOT EDIT BELOW THIS LINE OR RISK BREAKING FORMATTING) === */
 .sheet-row,
-.sheet-rolltemplate-whfrp2e .sheet-row {
+.sheet-rolltemplate-wfrp4e .sheet-row {
 	letter-spacing: -0.31em; /* Webkit: collapse white-space between units */
 	*letter-spacing: normal; /* reset IE < 8 */
 	*word-spacing: -0.43em; /* IE < 8: collapse white-space between units */
 	text-rendering: optimizespeed; /* Webkit: fixes text-rendering: optimizeLegibility */
 }
 .sheet-opera-only :-o-prefocus, .sheet-row,
-.sheet-rolltemplate-whfrp2e .sheet-opera-only :-o-prefocus, .sheet-rolltemplate-whfrp2e .sheet-row {
+.sheet-rolltemplate-wfrp4e .sheet-opera-only :-o-prefocus, .sheet-rolltemplate-wfrp4e .sheet-row {
 	word-spacing: -0.43em;
 }
 
+.sheet-col-auto,
+.sheet-rolltemplate-wfrp4e .sheet-col-auto {
+	width: auto;
+	display: block;
+}
+
 .sheet-col-1,
-.sheet-rolltemplate-whfrp2e .sheet-col-1 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1 {
 	width: 100%;
 	display: block;
 }
 
 .sheet-col-1-2,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-2 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-2 {
 	width: 50%;
 }
 .sheet-offset-1-2,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-2 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-2 {
 	margin-left: 50%;
 }
 
 .sheet-col-1-3,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-3 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-3 {
 	width: 33.33333%;
 }
 .sheet-offset-1-3,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-3 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-3 {
 	margin-left: 33.33333%;
 }
 .sheet-col-2-3,
-.sheet-rolltemplate-whfrp2e .sheet-col-2-3 {
+.sheet-rolltemplate-wfrp4e .sheet-col-2-3 {
 	width: 66.66667%;
 }
 .sheet-offset-2-3,
-.sheet-rolltemplate-whfrp2e .sheet-offset-2-3 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-2-3 {
 	margin-left: 66.66667%;
 }
 
 .sheet-col-1-4,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-4 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-4 {
 	width: 25%;
 }
 .sheet-offset-1-4,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-4 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-4 {
 	margin-left: 25%;
 }
 .sheet-col-3-4,
-.sheet-rolltemplate-whfrp2e .sheet-col-3-4 {
+.sheet-rolltemplate-wfrp4e .sheet-col-3-4 {
 	width: 75%;
 }
 .sheet-offset-3-4,
-.sheet-rolltemplate-whfrp2e .sheet-offset-3-4 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-3-4 {
 	margin-left: 75%;
 }
 .sheet-col-1-5,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-5 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-5 {
 	width: 20%;
 }
 .sheet-col-1-5r,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-5r {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-5r {
 	width: 15%;
 }
 .sheet-offset-1-5,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-5 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-5 {
 	margin-left: 20%;
 }
 .sheet-col-2-5,
-.sheet-rolltemplate-whfrp2e .sheet-col-2-5 {
+.sheet-rolltemplate-wfrp4e .sheet-col-2-5 {
 	width: 40%;
 }
 .sheet-offset-2-5,
-.sheet-rolltemplate-whfrp2e .sheet-offset-2-5 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-2-5 {
 	margin-left: 40%;
 }
 .sheet-col-3-5,
-.sheet-rolltemplate-whfrp2e .sheet-col-3-5 {
+.sheet-rolltemplate-wfrp4e .sheet-col-3-5 {
 	width: 60%;
 }
 .sheet-offset-3-5,
-.sheet-rolltemplate-whfrp2e .sheet-offset-3-5 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-3-5 {
 	margin-left: 60%;
 }
 .sheet-col-4-5,
-.sheet-rolltemplate-whfrp2e .sheet-col-4-5 {
+.sheet-rolltemplate-wfrp4e .sheet-col-4-5 {
 	width: 80%;
 }
 .sheet-offset-4-5,
-.sheet-rolltemplate-whfrp2e .sheet-offset-4-5 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-4-5 {
 	margin-left: 80%;
 }
 
 .sheet-col-1-6,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-6 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-6 {
 	width: 16.66667%;
 }
 .sheet-offset-1-6,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-6 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-6 {
 	margin-left: 16.66667%;
 }
 .sheet-col-5-6,
-.sheet-rolltemplate-whfrp2e .sheet-col-5-6 {
+.sheet-rolltemplate-wfrp4e .sheet-col-5-6 {
 	width: 83.33333%;
 }
 .sheet-offset-5-6,
-.sheet-rolltemplate-whfrp2e .sheet-offset-5-6 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-5-6 {
 	margin-left: 83.33333%;
 }
 
 .sheet-col-1-7,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-7 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-7 {
 	width: 14.28571%;
 }
 .sheet-offset-1-7,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-7 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-7 {
 	margin-left: 14.28571%;
 }
 .sheet-col-2-7,
-.sheet-rolltemplate-whfrp2e .sheet-col-2-7 {
+.sheet-rolltemplate-wfrp4e .sheet-col-2-7 {
 	width: 28.57143%;
 }
 .sheet-offset-2-7,
-.sheet-rolltemplate-whfrp2e .sheet-offset-2-7 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-2-7 {
 	margin-left: 28.57143%;
 }
 .sheet-col-3-7,
-.sheet-rolltemplate-whfrp2e .sheet-col-3-7 {
+.sheet-rolltemplate-wfrp4e .sheet-col-3-7 {
 	width: 42.85714%;
 }
 .sheet-offset-3-7,
-.sheet-rolltemplate-whfrp2e .sheet-offset-3-7 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-3-7 {
 	margin-left: 42.85714%;
 }
 .sheet-col-4-7,
-.sheet-rolltemplate-whfrp2e .sheet-col-4-7 {
+.sheet-rolltemplate-wfrp4e .sheet-col-4-7 {
 	width: 57.14286%;
 }
 .sheet-offset-4-7,
-.sheet-rolltemplate-whfrp2e .sheet-offset-4-7 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-4-7 {
 	margin-left: 57.14286%;
 }
 .sheet-col-5-7,
-.sheet-rolltemplate-whfrp2e .sheet-col-5-7 {
+.sheet-rolltemplate-wfrp4e .sheet-col-5-7 {
 	width: 71.42857%;
 }
 .sheet-offset-5-7,
-.sheet-rolltemplate-whfrp2e .sheet-offset-5-7 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-5-7 {
 	margin-left: 71.42857%;
 }
 .sheet-col-6-7,
-.sheet-rolltemplate-whfrp2e .sheet-col-6-7 {
+.sheet-rolltemplate-wfrp4e .sheet-col-6-7 {
 	width: 85.71429%;
 }
 .sheet-offset-6-7,
-.sheet-rolltemplate-whfrp2e .sheet-offset-6-7 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-6-7 {
 	margin-left: 85.71429%;
 }
 
 .sheet-col-1-8,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-8 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-8 {
 	width: 12.5%;
 }
 .sheet-offset-1-8,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-8 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-8 {
 	margin-left: 12.5%;
 }
 .sheet-col-3-8,
-.sheet-rolltemplate-whfrp2e .sheet-col-3-8 {
+.sheet-rolltemplate-wfrp4e .sheet-col-3-8 {
 	width: 37.5%;
 }
 .sheet-offset-3-8,
-.sheet-rolltemplate-whfrp2e .sheet-offset-3-8 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-3-8 {
 	margin-left: 37.5%;
 }
 .sheet-col-5-8,
-.sheet-rolltemplate-whfrp2e .sheet-col-5-8 {
+.sheet-rolltemplate-wfrp4e .sheet-col-5-8 {
 	width: 62.5%;
 }
 .sheet-offset-5-8,
-.sheet-rolltemplate-whfrp2e .sheet-offset-5-8 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-5-8 {
 	margin-left: 62.5%;
 }
 .sheet-col-7-8,
-.sheet-rolltemplate-whfrp2e .sheet-col-7-8 {
+.sheet-rolltemplate-wfrp4e .sheet-col-7-8 {
 	width: 87.5%;
 }
 .sheet-offset-7-8,
-.sheet-rolltemplate-whfrp2e .sheet-offset-7-8 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-7-8 {
 	margin-left: 87.5%;
 }
 .sheet-col-1-9,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-9 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-9 {
 	width: 11.11111%;
 }
 .sheet-col-1-9c,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-9c {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-9c {
 	width: 11.14286%;
 }
 .sheet-offset-1-9,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-9 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-9 {
 	margin-left: 11.11111%;
 }
 .sheet-col-2-9,
-.sheet-rolltemplate-whfrp2e .sheet-col-2-9 {
+.sheet-rolltemplate-wfrp4e .sheet-col-2-9 {
 	width: 22.22222%;
 }
 .sheet-offset-2-9,
-.sheet-rolltemplate-whfrp2e .sheet-offset-2-9 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-2-9 {
 	margin-left: 22.22222%;
 }
 .sheet-col-4-9,
-.sheet-rolltemplate-whfrp2e .sheet-col-4-9 {
+.sheet-rolltemplate-wfrp4e .sheet-col-4-9 {
 	width: 44.44444%;
 }
 .sheet-offset-4-9,
-.sheet-rolltemplate-whfrp2e .sheet-offset-4-9 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-4-9 {
 	margin-left: 44.44444%;
 }
 .sheet-col-4-10,
-.sheet-rolltemplate-whfrp2e .sheet-col-4-10 {
+.sheet-rolltemplate-wfrp4e .sheet-col-4-10 {
 	width: 40%;
 }
 .sheet-offset-4-10,
-.sheet-rolltemplate-whfrp2e .sheet-offset-4-10 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-4-10 {
 	margin-left: 40%;
 }
 .sheet-col-5-9,
-.sheet-rolltemplate-whfrp2e .sheet-col-5-9 {
+.sheet-rolltemplate-wfrp4e .sheet-col-5-9 {
 	width: 55.55556%;
 }
 .sheet-offset-5-9,
-.sheet-rolltemplate-whfrp2e .sheet-offset-5-9 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-5-9 {
 	margin-left: 55.55556%;
 }
 .sheet-col-6-9,
-.sheet-rolltemplate-whfrp2e .sheet-col-6-9 {
+.sheet-rolltemplate-wfrp4e .sheet-col-6-9 {
 	width: 66.66667%;
 }
 .sheet-offset-6-9,
-.sheet-rolltemplate-whfrp2e .sheet-offset-6-9 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-6-9 {
 	margin-left: 66.66667%;
 }
 .sheet-col-7-9,
-.sheet-rolltemplate-whfrp2e .sheet-col-7-9 {
+.sheet-rolltemplate-wfrp4e .sheet-col-7-9 {
 	width: 77.77778%;
 }
 .sheet-offset-7-9,
-.sheet-rolltemplate-whfrp2e .sheet-offset-7-9 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-7-9 {
 	margin-left: 77.77778%;
 }
 .sheet-col-8-9,
-.sheet-rolltemplate-whfrp2e .sheet-col-8-9 {
+.sheet-rolltemplate-wfrp4e .sheet-col-8-9 {
 	width: 88.88889%;
 }
 .sheet-offset-8-9,
-.sheet-rolltemplate-whfrp2e .sheet-offset-8-9 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-8-9 {
 	margin-left: 88.88889%;
 }
 
 .sheet-col-1-10,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-10 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-10 {
 	width: 9%;
 }
 .sheet-offset-1-10,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-10 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-10 {
 	margin-left: 10%;
 }
 .sheet-col-1-10t,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-10 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-10 {
 	width: 10%;
 }
 .sheet-col-3-10,
-.sheet-rolltemplate-whfrp2e .sheet-col-3-10 {
+.sheet-rolltemplate-wfrp4e .sheet-col-3-10 {
 	width: 30%;
 }
 .sheet-offset-3-10,
-.sheet-rolltemplate-whfrp2e .sheet-offset-3-10 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-3-10 {
 	margin-left: 30%;
 }
 .sheet-col-3-10t,
-.sheet-rolltemplate-whfrp2e .sheet-col-3-10 {
+.sheet-rolltemplate-wfrp4e .sheet-col-3-10 {
 	width: 30%;
 }
 .sheet-col-4-10,
-.sheet-rolltemplate-whfrp2e .sheet-col-4-10 {
+.sheet-rolltemplate-wfrp4e .sheet-col-4-10 {
 	width: 40%;
 }
 .sheet-offset-4-10,
-.sheet-rolltemplate-whfrp2e .sheet-offset-4-10 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-4-10 {
 	margin-left: 40%;
 }
 .sheet-col-7-10,
-.sheet-rolltemplate-whfrp2e .sheet-col-7-10 {
+.sheet-rolltemplate-wfrp4e .sheet-col-7-10 {
 	width: 70%;
 }
 .sheet-offset-7-10,
-.sheet-rolltemplate-whfrp2e .sheet-offset-7-10 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-7-10 {
 	margin-left: 70%;
 }
 .sheet-col-9-10,
-.sheet-rolltemplate-whfrp2e .sheet-col-9-10 {
+.sheet-rolltemplate-wfrp4e .sheet-col-9-10 {
 	width: 90%;
 }
 .sheet-offset-9-10,
-.sheet-rolltemplate-whfrp2e .sheet-offset-9-10 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-9-10 {
 	margin-left: 90%;
 }
 
 .sheet-col-1-11,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-11 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-11 {
 	width: 9.09091%;
 }
 .sheet-offset-1-11,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-11 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-11 {
 	margin-left: 9.09091%;
 }
 .sheet-col-2-11,
-.sheet-rolltemplate-whfrp2e .sheet-col-2-11 {
+.sheet-rolltemplate-wfrp4e .sheet-col-2-11 {
 	width: 18.18182%;
 }
 .sheet-offset-2-11,
-.sheet-rolltemplate-whfrp2e .sheet-offset-2-11 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-2-11 {
 	margin-left: 18.18182%;
 }
 .sheet-col-3-11,
-.sheet-rolltemplate-whfrp2e .sheet-col-3-11 {
+.sheet-rolltemplate-wfrp4e .sheet-col-3-11 {
 	width: 27.27273%;
 }
 .sheet-offset-3-11,
-.sheet-rolltemplate-whfrp2e .sheet-offset-3-11 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-3-11 {
 	margin-left: 27.27273%;
 }
 .sheet-col-4-11,
-.sheet-rolltemplate-whfrp2e .sheet-col-4-11 {
+.sheet-rolltemplate-wfrp4e .sheet-col-4-11 {
 	width: 36.36364%;
 }
 .sheet-offset-4-11,
-.sheet-rolltemplate-whfrp2e .sheet-offset-4-11 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-4-11 {
 	margin-left: 36.36364%;
 }
 .sheet-col-5-11,
-.sheet-rolltemplate-whfrp2e .sheet-col-5-11 {
+.sheet-rolltemplate-wfrp4e .sheet-col-5-11 {
 	width: 45.45455%;
 }
 .sheet-offset-5-11,
-.sheet-rolltemplate-whfrp2e .sheet-offset-5-11 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-5-11 {
 	margin-left: 45.45455%;
 }
 .sheet-col-6-11,
-.sheet-rolltemplate-whfrp2e .sheet-col-6-11 {
+.sheet-rolltemplate-wfrp4e .sheet-col-6-11 {
 	width: 54.54545%;
 }
 .sheet-offset-6-11,
-.sheet-rolltemplate-whfrp2e .sheet-offset-6-11 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-6-11 {
 	margin-left: 54.54545%;
 }
 .sheet-col-7-11,
-.sheet-rolltemplate-whfrp2e .sheet-col-7-11 {
+.sheet-rolltemplate-wfrp4e .sheet-col-7-11 {
 	width: 63.63636%;
 }
 .sheet-offset-7-11,
-.sheet-rolltemplate-whfrp2e .sheet-offset-7-11 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-7-11 {
 	margin-left: 63.63636%;
 }
 .sheet-col-8-11,
-.sheet-rolltemplate-whfrp2e .sheet-col-8-11 {
+.sheet-rolltemplate-wfrp4e .sheet-col-8-11 {
 	width: 72.72727%;
 }
 .sheet-offset-8-11,
-.sheet-rolltemplate-whfrp2e .sheet-offset-8-11 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-8-11 {
 	margin-left: 72.72727%;
 }
 .sheet-col-9-11,
-.sheet-rolltemplate-whfrp2e .sheet-col-9-11 {
+.sheet-rolltemplate-wfrp4e .sheet-col-9-11 {
 	width: 81.81818%;
 }
 .sheet-offset-9-11,
-.sheet-rolltemplate-whfrp2e .sheet-offset-9-11 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-9-11 {
 	margin-left: 81.81818%;
 }
 .sheet-col-10-11,
-.sheet-rolltemplate-whfrp2e .sheet-col-10-11 {
+.sheet-rolltemplate-wfrp4e .sheet-col-10-11 {
 	width: 90.90909%;
 }
 .sheet-offset-10-11,
-.sheet-rolltemplate-whfrp2e .sheet-offset-10-11 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-10-11 {
 	margin-left: 90.90909%;
 }
 
 .sheet-col-1-12,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-12 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-12 {
 	width: 8.33333%;
 }
 .sheet-offset-1-12,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-12 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-12 {
 	margin-left: 8.33333%;
 }
 .sheet-col-5-12,
-.sheet-rolltemplate-whfrp2e .sheet-col-5-12 {
+.sheet-rolltemplate-wfrp4e .sheet-col-5-12 {
 	width: 41.66667%;
 }
 .sheet-offset-5-12,
-.sheet-rolltemplate-whfrp2e .sheet-offset-5-12 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-5-12 {
 	margin-left: 41.66667%;
 }
 .sheet-col-7-12,
-.sheet-rolltemplate-whfrp2e .sheet-col-7-12 {
+.sheet-rolltemplate-wfrp4e .sheet-col-7-12 {
 	width: 58.33333%;
 }
 .sheet-offset-7-12,
-.sheet-rolltemplate-whfrp2e .sheet-offset-7-12 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-7-12 {
 	margin-left: 58.33333%;
 }
 .sheet-col-11-12,
-.sheet-rolltemplate-whfrp2e .sheet-col-11-12 {
+.sheet-rolltemplate-wfrp4e .sheet-col-11-12 {
 	width: 91.66667%;
 }
 .sheet-offset-11-12,
-.sheet-rolltemplate-whfrp2e .sheet-offset-11-12 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-11-12 {
 	margin-left: 91.66667%;
 }
 
 .sheet-col-1-13,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-13 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-13 {
 	width: 7.69231%;
 }
 .sheet-offset-1-13,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-13 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-13 {
 	margin-left: 7.69231%;
 }
 .sheet-col-2-13,
-.sheet-rolltemplate-whfrp2e .sheet-col-2-13 {
+.sheet-rolltemplate-wfrp4e .sheet-col-2-13 {
 	width: 15.38462%;
 }
 .sheet-offset-2-13,
-.sheet-rolltemplate-whfrp2e .sheet-offset-2-13 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-2-13 {
 	margin-left: 15.38462%;
 }
 .sheet-col-3-13,
-.sheet-rolltemplate-whfrp2e .sheet-col-3-13 {
+.sheet-rolltemplate-wfrp4e .sheet-col-3-13 {
 	width: 23.07692%;
 }
 .sheet-offset-3-13,
-.sheet-rolltemplate-whfrp2e .sheet-offset-3-13 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-3-13 {
 	margin-left: 23.07692%;
 }
 .sheet-col-4-13,
-.sheet-rolltemplate-whfrp2e .sheet-col-4-13 {
+.sheet-rolltemplate-wfrp4e .sheet-col-4-13 {
 	width: 30.76923%;
 }
 .sheet-offset-4-13,
-.sheet-rolltemplate-whfrp2e .sheet-offset-4-13 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-4-13 {
 	margin-left: 30.76923%;
 }
 .sheet-col-5-13,
-.sheet-rolltemplate-whfrp2e .sheet-col-5-13 {
+.sheet-rolltemplate-wfrp4e .sheet-col-5-13 {
 	width: 38.46154%;
 }
 .sheet-offset-5-13,
-.sheet-rolltemplate-whfrp2e .sheet-offset-5-13 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-5-13 {
 	margin-left: 38.46154%;
 }
 .sheet-col-6-13,
-.sheet-rolltemplate-whfrp2e .sheet-col-6-13 {
+.sheet-rolltemplate-wfrp4e .sheet-col-6-13 {
 	width: 46.15385%;
 }
 .sheet-offset-6-13,
-.sheet-rolltemplate-whfrp2e .sheet-offset-6-13 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-6-13 {
 	margin-left: 46.15385%;
 }
 .sheet-col-7-13,
-.sheet-rolltemplate-whfrp2e .sheet-col-7-13 {
+.sheet-rolltemplate-wfrp4e .sheet-col-7-13 {
 	width: 53.84615%;
 }
 .sheet-offset-7-13,
-.sheet-rolltemplate-whfrp2e .sheet-offset-7-13 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-7-13 {
 	margin-left: 53.84615%;
 }
 .sheet-col-8-13,
-.sheet-rolltemplate-whfrp2e .sheet-col-8-13 {
+.sheet-rolltemplate-wfrp4e .sheet-col-8-13 {
 	width: 61.53846%;
 }
 .sheet-offset-8-13,
-.sheet-rolltemplate-whfrp2e .sheet-offset-8-13 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-8-13 {
 	margin-left: 61.53846%;
 }
 .sheet-col-9-13,
-.sheet-rolltemplate-whfrp2e .sheet-col-9-13 {
+.sheet-rolltemplate-wfrp4e .sheet-col-9-13 {
 	width: 69.23077%;
 }
 .sheet-offset-9-13,
-.sheet-rolltemplate-whfrp2e .sheet-offset-9-13 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-9-13 {
 	margin-left: 69.23077%;
 }
 .sheet-col-10-13,
-.sheet-rolltemplate-whfrp2e .sheet-col-10-13 {
+.sheet-rolltemplate-wfrp4e .sheet-col-10-13 {
 	width: 76.92308%;
 }
 .sheet-offset-10-13,
-.sheet-rolltemplate-whfrp2e .sheet-offset-10-13 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-10-13 {
 	margin-left: 76.92308%;
 }
 .sheet-col-11-13,
-.sheet-rolltemplate-whfrp2e .sheet-col-11-13 {
+.sheet-rolltemplate-wfrp4e .sheet-col-11-13 {
 	width: 84.61538%;
 }
 .sheet-offset-11-13,
-.sheet-rolltemplate-whfrp2e .sheet-offset-11-13 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-11-13 {
 	margin-left: 84.61538%;
 }
 .sheet-col-12-13,
-.sheet-rolltemplate-whfrp2e .sheet-col-12-13 {
+.sheet-rolltemplate-wfrp4e .sheet-col-12-13 {
 	width: 92.30769%;
 }
 .sheet-offset-12-13,
-.sheet-rolltemplate-whfrp2e .sheet-offset-12-13 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-12-13 {
 	margin-left: 92.30769%;
 }
 
 .sheet-col-1-14,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-14 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-14 {
 	width: 7.14286%;
 }
 .sheet-offset-1-14,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-14 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-14 {
 	margin-left: 7.14286%;
 }
 .sheet-col-3-14,
-.sheet-rolltemplate-whfrp2e .sheet-col-3-14 {
+.sheet-rolltemplate-wfrp4e .sheet-col-3-14 {
 	width: 21.42857%;
 }
 .sheet-offset-3-14,
-.sheet-rolltemplate-whfrp2e .sheet-offset-3-14 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-3-14 {
 	margin-left: 21.42857%;
 }
 .sheet-col-5-14,
-.sheet-rolltemplate-whfrp2e .sheet-col-5-14 {
+.sheet-rolltemplate-wfrp4e .sheet-col-5-14 {
 	width: 35.71429%;
 }
 .sheet-offset-5-14,
-.sheet-rolltemplate-whfrp2e .sheet-offset-5-14 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-5-14 {
 	margin-left: 35.71429%;
 }
 .sheet-col-9-14,
-.sheet-rolltemplate-whfrp2e .sheet-col-9-14 {
+.sheet-rolltemplate-wfrp4e .sheet-col-9-14 {
 	width: 64.28571%;
 }
 .sheet-offset-9-14,
-.sheet-rolltemplate-whfrp2e .sheet-offset-9-14 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-9-14 {
 	margin-left: 64.28571%;
 }
 .sheet-col-11-14,
-.sheet-rolltemplate-whfrp2e .sheet-col-11-14 {
+.sheet-rolltemplate-wfrp4e .sheet-col-11-14 {
 	width: 78.57143%;
 }
 .sheet-offset-11-14,
-.sheet-rolltemplate-whfrp2e .sheet-offset-11-14 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-11-14 {
 	margin-left: 78.57143%;
 }
 .sheet-col-13-14,
-.sheet-rolltemplate-whfrp2e .sheet-col-13-14 {
+.sheet-rolltemplate-wfrp4e .sheet-col-13-14 {
 	width: 92.85714%;
 }
 .sheet-offset-13-14,
-.sheet-rolltemplate-whfrp2e .sheet-offset-13-14 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-13-14 {
 	margin-left: 92.85714%;
 }
 
 .sheet-col-1-15,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-15 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-15 {
 	width: 6.66667%;
 }
 .sheet-offset-1-15,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-15 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-15 {
 	margin-left: 6.66667%;
 }
 .sheet-col-2-15,
-.sheet-rolltemplate-whfrp2e .sheet-col-2-15 {
+.sheet-rolltemplate-wfrp4e .sheet-col-2-15 {
 	width: 13.33333%;
 }
 .sheet-offset-2-15,
-.sheet-rolltemplate-whfrp2e .sheet-offset-2-15 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-2-15 {
   margin-left: 13.33333%;
 }
 .sheet-col-4-15,
-.sheet-rolltemplate-whfrp2e .sheet-col-4-15 {
+.sheet-rolltemplate-wfrp4e .sheet-col-4-15 {
 	width: 26.66667%;
 }
 .sheet-offset-4-15,
-.sheet-rolltemplate-whfrp2e .sheet-offset-4-15 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-4-15 {
 	margin-left: 26.66667%;
 }
 .sheet-col-6-15,
-.sheet-rolltemplate-whfrp2e .sheet-col-6-15 {
+.sheet-rolltemplate-wfrp4e .sheet-col-6-15 {
 	width: 40%;
 }
 .sheet-offset-6-15,
-.sheet-rolltemplate-whfrp2e .sheet-offset-6-15 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-6-15 {
 	margin-left: 40%;
 }
 .sheet-col-7-15,
-.sheet-rolltemplate-whfrp2e .sheet-col-7-15 {
+.sheet-rolltemplate-wfrp4e .sheet-col-7-15 {
 	width: 46.66667%;
 }
 .sheet-offset-7-15,
-.sheet-rolltemplate-whfrp2e .sheet-offset-7-15 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-7-15 {
 	margin-left: 46.66667%;
 }
 .sheet-col-8-15,
-.sheet-rolltemplate-whfrp2e .sheet-col-8-15 {
+.sheet-rolltemplate-wfrp4e .sheet-col-8-15 {
 	width: 53.33333%;
 }
 .sheet-offset-8-15,
-.sheet-rolltemplate-whfrp2e .sheet-offset-8-15 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-8-15 {
 	margin-left: 53.33333%;
 }
 .sheet-col-9-15,
-.sheet-rolltemplate-whfrp2e .sheet-col-9-15 {
+.sheet-rolltemplate-wfrp4e .sheet-col-9-15 {
 	width: 60%;
 }.sheet-offset-9-15,
-.sheet-rolltemplate-whfrp2e .sheet-offset-9-15 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-9-15 {
 	margin-left: 60%;
 }
 .sheet-col-10-15,
-.sheet-rolltemplate-whfrp2e .sheet-col-10-15 {
+.sheet-rolltemplate-wfrp4e .sheet-col-10-15 {
 	width: 66.66667%;
 }
 .sheet-offset-10-15,
-.sheet-rolltemplate-whfrp2e .sheet-offset-10-15 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-10-15 {
 	margin-left: 66.66667%;
 }
 .sheet-col-11-15,
-.sheet-rolltemplate-whfrp2e .sheet-col-11-15 {
+.sheet-rolltemplate-wfrp4e .sheet-col-11-15 {
 	width: 73.33333%;
 }
 .sheet-offset-11-15,
-.sheet-rolltemplate-whfrp2e .sheet-offset-11-15 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-11-15 {
 	margin-left: 73.33333%;
 }
 .sheet-col-12-15,
-.sheet-rolltemplate-whfrp2e .sheet-col-12-15 {
+.sheet-rolltemplate-wfrp4e .sheet-col-12-15 {
 	width: 80%;
 }
 .sheet-offset-12-15,
-.sheet-rolltemplate-whfrp2e .sheet-offset-12-15 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-12-15 {
 	margin-left: 80%;
 }
 .sheet-col-13-15,
-.sheet-rolltemplate-whfrp2e .sheet-col-13-15 {
+.sheet-rolltemplate-wfrp4e .sheet-col-13-15 {
 	width: 86.66667%;
 }
 .sheet-offset-13-15,
-.sheet-rolltemplate-whfrp2e .sheet-offset-13-15 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-13-15 {
 	margin-left: 86.66667%;
 }
 .sheet-col-14-15,
-.sheet-rolltemplate-whfrp2e .sheet-col-14-15 {
+.sheet-rolltemplate-wfrp4e .sheet-col-14-15 {
 	width: 93.33333%;
 }
 .sheet-offset-14-15,
-.sheet-rolltemplate-whfrp2e .sheet-offset-14-15 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-14-15 {
 	margin-left: 93.33333%;
 }
 
 .sheet-col-1-16,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-16 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-16 {
 	width: 6.25%;
 }
 .sheet-offset-1-16,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-16 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-16 {
 	margin-left: 6.25%;
 }
 .sheet-col-3-16,
-.sheet-rolltemplate-whfrp2e .sheet-col-3-16 {
+.sheet-rolltemplate-wfrp4e .sheet-col-3-16 {
 	width: 18.75%;
 }
 .sheet-offset-3-16,
-.sheet-rolltemplate-whfrp2e .sheet-offset-3-16 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-3-16 {
 	margin-left: 18.75%;
 }
 .sheet-col-5-16,
-.sheet-rolltemplate-whfrp2e .sheet-col-5-16 {
+.sheet-rolltemplate-wfrp4e .sheet-col-5-16 {
 	width: 31.25%;
 }
 .sheet-offset-5-16,
-.sheet-rolltemplate-whfrp2e .sheet-offset-5-16 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-5-16 {
 	margin-left: 31.25%;
 }
 .sheet-col-7-16,
-.sheet-rolltemplate-whfrp2e .sheet-col-7-16 {
+.sheet-rolltemplate-wfrp4e .sheet-col-7-16 {
 	width: 43.75%;
 }
 .sheet-offset-7-16,
-.sheet-rolltemplate-whfrp2e .sheet-offset-7-16 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-7-16 {
 	margin-left: 43.75%;
 }
 .sheet-col-9-16,
-.sheet-rolltemplate-whfrp2e .sheet-col-9-16 {
+.sheet-rolltemplate-wfrp4e .sheet-col-9-16 {
 	width: 56.25%;
 }
 .sheet-offset-9-16,
-.sheet-rolltemplate-whfrp2e .sheet-offset-9-16 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-9-16 {
 	margin-left: 56.25%;
 }
 .sheet-col-11-16,
-.sheet-rolltemplate-whfrp2e .sheet-col-11-16 {
+.sheet-rolltemplate-wfrp4e .sheet-col-11-16 {
 	width: 68.75%;
 }
 .sheet-offset-11-16,
-.sheet-rolltemplate-whfrp2e .sheet-offset-11-16 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-11-16 {
 	margin-left: 68.75%;
 }
 .sheet-col-13-16,
-.sheet-rolltemplate-whfrp2e .sheet-col-13-16 {
+.sheet-rolltemplate-wfrp4e .sheet-col-13-16 {
 	width: 81.25%;
 }
 .sheet-offset-13-16,
-.sheet-rolltemplate-whfrp2e .sheet-offset-13-16 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-13-16 {
 	margin-left: 81.25%;
 }
 .sheet-col-15-16,
-.sheet-rolltemplate-whfrp2e .sheet-col-15-16 {
+.sheet-rolltemplate-wfrp4e .sheet-col-15-16 {
 	width: 93.75%;
 }
 .sheet-offset-15-16,
-.sheet-rolltemplate-whfrp2e .sheet-offset-15-16 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-15-16 {
 	margin-left: 93.75%;
 }
 
 .sheet-col-1-17,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-17 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-17 {
 	width: 5.88235%;
 }
 .sheet-offset-1-17,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-17 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-17 {
 	margin-left: 5.88235%;
 }
 .sheet-col-2-17,
-.sheet-rolltemplate-whfrp2e .sheet-col-2-17 {
+.sheet-rolltemplate-wfrp4e .sheet-col-2-17 {
 	width: 11.76471%;
 }
 .sheet-offset-2-17,
-.sheet-rolltemplate-whfrp2e .sheet-offset-2-17 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-2-17 {
 	margin-left: 11.76471%;
 }
 .sheet-col-3-17,
-.sheet-rolltemplate-whfrp2e .sheet-col-3-17 {
+.sheet-rolltemplate-wfrp4e .sheet-col-3-17 {
 	width: 17.64706%;
 }
 .sheet-offset-3-17,
-.sheet-rolltemplate-whfrp2e .sheet-offset-3-17 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-3-17 {
 	margin-left: 17.64706%;
 }
 .sheet-col-4-17,
-.sheet-rolltemplate-whfrp2e .sheet-col-4-17 {
+.sheet-rolltemplate-wfrp4e .sheet-col-4-17 {
 	width: 23.52941%;
 }
 .sheet-offset-4-17,
-.sheet-rolltemplate-whfrp2e .sheet-offset-4-17 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-4-17 {
 	margin-left: 23.52941%;
 }
 .sheet-col-5-17,
-.sheet-rolltemplate-whfrp2e .sheet-col-5-17 {
+.sheet-rolltemplate-wfrp4e .sheet-col-5-17 {
 	width: 29.41176%;
 }
 .sheet-offset-5-17,
-.sheet-rolltemplate-whfrp2e .sheet-offset-5-17 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-5-17 {
 	margin-left: 29.41176%;
 }
 .sheet-col-6-17,
-.sheet-rolltemplate-whfrp2e .sheet-col-6-17 {
+.sheet-rolltemplate-wfrp4e .sheet-col-6-17 {
 	width: 35.29412%;
 }
 .sheet-offset-6-17,
-.sheet-rolltemplate-whfrp2e .sheet-offset-6-17 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-6-17 {
 	margin-left: 35.29412%;
 }
 .sheet-col-7-17,
-.sheet-rolltemplate-whfrp2e .sheet-col-7-17 {
+.sheet-rolltemplate-wfrp4e .sheet-col-7-17 {
 	width: 41.17647%;
 }
 .sheet-offset-7-17,
-.sheet-rolltemplate-whfrp2e .sheet-offset-7-17 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-7-17 {
 	margin-left: 41.17647%;
 }
 .sheet-col-8-17,
-.sheet-rolltemplate-whfrp2e .sheet-col-8-17 {
+.sheet-rolltemplate-wfrp4e .sheet-col-8-17 {
 	width: 47.05882%;
 }
 .sheet-offset-8-17,
-.sheet-rolltemplate-whfrp2e .sheet-offset-8-17 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-8-17 {
 	margin-left: 47.05882%;
 }
 .sheet-col-9-17,
-.sheet-rolltemplate-whfrp2e .sheet-col-9-17 {
+.sheet-rolltemplate-wfrp4e .sheet-col-9-17 {
 	width: 52.94118%;
 }
 .sheet-offset-9-17,
-.sheet-rolltemplate-whfrp2e .sheet-offset-9-17 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-9-17 {
 	margin-left: 52.94118%;
 }
 .sheet-col-10-17,
-.sheet-rolltemplate-whfrp2e .sheet-col-10-17 {
+.sheet-rolltemplate-wfrp4e .sheet-col-10-17 {
 	width: 58.82353%;
 }
 .sheet-offset-10-17,
-.sheet-rolltemplate-whfrp2e .sheet-offset-10-17 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-10-17 {
 	margin-left: 58.82353%;
 }
 .sheet-col-11-17,
-.sheet-rolltemplate-whfrp2e .sheet-col-11-17 {
+.sheet-rolltemplate-wfrp4e .sheet-col-11-17 {
 	width: 64.70588%;
 }
 .sheet-offset-11-17,
-.sheet-rolltemplate-whfrp2e .sheet-offset-11-17 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-11-17 {
 	margin-left: 64.70588%;
 }
 .sheet-col-12-17,
-.sheet-rolltemplate-whfrp2e .sheet-col-12-17 {
+.sheet-rolltemplate-wfrp4e .sheet-col-12-17 {
 	width: 70.58824%;
 }
 .sheet-offset-12-17,
-.sheet-rolltemplate-whfrp2e .sheet-offset-12-17 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-12-17 {
 	margin-left: 70.58824%;
 }
 .sheet-col-13-17,
-.sheet-rolltemplate-whfrp2e .sheet-col-13-17 {
+.sheet-rolltemplate-wfrp4e .sheet-col-13-17 {
 	width: 76.47059%;
 }
 .sheet-offset-13-17,
-.sheet-rolltemplate-whfrp2e .sheet-offset-13-17 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-13-17 {
 	margin-left: 76.47059%;
 }
 .sheet-col-14-17,
-.sheet-rolltemplate-whfrp2e .sheet-col-14-17 {
+.sheet-rolltemplate-wfrp4e .sheet-col-14-17 {
 	width: 82.35294%;
 }
 .sheet-offset-14-17,
-.sheet-rolltemplate-whfrp2e .sheet-offset-14-17 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-14-17 {
 	margin-left: 82.35294%;
 }
 .sheet-col-15-17,
-.sheet-rolltemplate-whfrp2e .sheet-col-15-17 {
+.sheet-rolltemplate-wfrp4e .sheet-col-15-17 {
 	width: 88.23529%;
 }
 .sheet-offset-15-17,
-.sheet-rolltemplate-whfrp2e .sheet-offset-15-17 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-15-17 {
 	margin-left: 88.23529%;
 }
 .sheet-col-16-17,
-.sheet-rolltemplate-whfrp2e .sheet-col-16-17 {
+.sheet-rolltemplate-wfrp4e .sheet-col-16-17 {
 	width: 94.11765%;
 }
 .sheet-offset-16-17,
-.sheet-rolltemplate-whfrp2e .sheet-offset-16-17 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-16-17 {
 	margin-left: 94.11765%;
 }
 
 .sheet-col-1-18,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-18 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-18 {
   width: 5.55556%;
 }
 .sheet-offset-1-18,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-18 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-18 {
   margin-left: 5.55556%;
 }
 
 .sheet-col-5-18,
-.sheet-rolltemplate-whfrp2e .sheet-col-5-18 {
+.sheet-rolltemplate-wfrp4e .sheet-col-5-18 {
 	width: 27.77778%;
 }
 .sheet-offset-5-18,
-.sheet-rolltemplate-whfrp2e .sheet-offset-5-18 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-5-18 {
 	margin-left: 27.77778%;
 }
 .sheet-col-7-18,
-.sheet-rolltemplate-whfrp2e .sheet-col-7-18 {
+.sheet-rolltemplate-wfrp4e .sheet-col-7-18 {
 	width: 38.88889%;
 }
 .sheet-offset-7-18,
-.sheet-rolltemplate-whfrp2e .sheet-offset-7-18 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-7-18 {
 	margin-left: 38.88889%;
 }
 .sheet-col-11-18,
-.sheet-rolltemplate-whfrp2e .sheet-col-11-18 {
+.sheet-rolltemplate-wfrp4e .sheet-col-11-18 {
 	width: 61.11111%;
 }
 .sheet-offset-11-18,
-.sheet-rolltemplate-whfrp2e .sheet-offset-11-18 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-11-18 {
 	margin-left: 61.11111%;
 }
 .sheet-col-13-18,
-.sheet-rolltemplate-whfrp2e .sheet-col-13-18 {
+.sheet-rolltemplate-wfrp4e .sheet-col-13-18 {
 	width: 72.22222%;
 }
 .sheet-offset-13-18,
-.sheet-rolltemplate-whfrp2e .sheet-offset-13-18 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-13-18 {
 	margin-left: 72.22222%;
 }
 .sheet-col-15-18,
-.sheet-rolltemplate-whfrp2e .sheet-col-15-18 {
+.sheet-rolltemplate-wfrp4e .sheet-col-15-18 {
 	width: 83.33333%;
 }
 .sheet-offset-15-18,
-.sheet-rolltemplate-whfrp2e .sheet-offset-15-18 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-15-18 {
 	margin-left: 83.33333%;
 }
 .sheet-col-17-18,
-.sheet-rolltemplate-whfrp2e .sheet-col-17-18 {
+.sheet-rolltemplate-wfrp4e .sheet-col-17-18 {
 	width: 94.44444%;
 }
 .sheet-offset-17-18,
-.sheet-rolltemplate-whfrp2e .sheet-offset-17-18 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-17-18 {
 	margin-left: 94.44444%;
 }	
 
 .sheet-col-1-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-19 {
 	width: 5.26316%;
 }
 .sheet-offset-1-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-19 {
 	margin-left: 5.26316%;
 }
 .sheet-col-2-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-2-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-2-19 {
 	width: 10.52632%;
 }
 .sheet-offset-2-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-2-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-2-19 {
 	margin-left: 10.52632%;
 }
 .sheet-col-3-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-3-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-3-19 {
 	width: 15.78947%;
 }
 .sheet-offset-3-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-3-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-3-19 {
 	margin-left: 15.78947%;
 }
 .sheet-col-4-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-4-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-4-19 {
 	width: 21.05263%;
 }
 .sheet-offset-4-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-4-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-4-19 {
 	margin-left: 21.05263%;
 }
 .sheet-col-5-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-5-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-5-19 {
 	width: 26.31579%;
 }
 .sheet-offset-5-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-5-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-5-19 {
 	margin-left: 26.31579%;
 }
 .sheet-col-6-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-6-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-6-19 {
 	width: 31.57895%;
 }
 .sheet-offset-6-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-6-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-6-19 {
 	margin-left: 31.57895%;
 }
 .sheet-col-7-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-7-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-7-19 {
 	width: 36.84211%;
 }
 .sheet-offset-7-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-7-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-7-19 {
 	margin-left: 36.84211%;
 }
 .sheet-col-8-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-8-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-8-19 {
 	width: 42.10526%;
 }
 .sheet-offset-8-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-8-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-8-19 {
 	margin-left: 42.10526%;
 }
 .sheet-col-9-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-9-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-9-19 {
 	width: 47.36842%;
 }
 .sheet-offset-9-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-9-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-9-19 {
 	margin-left: 47.36842%;
 }
 .sheet-col-10-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-10-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-10-19 {
 	width: 52.63158%;
 }
 .sheet-offset-10-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-10-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-10-19 {
 	margin-left: 52.63158%;
 }
 .sheet-col-11-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-11-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-11-19 {
 	width: 57.89474%;
 }
 .sheet-offset-11-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-11-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-11-19 {
 	margin-left: 57.89474%;
 }
 .sheet-col-12-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-12-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-12-19 {
 	width: 63.15789%;
 }
 .sheet-offset-12-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-12-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-12-19 {
 	margin-left: 63.15789%;
 }
 .sheet-col-13-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-13-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-13-19 {
 	width: 68.42105%;
 }
 .sheet-offset-13-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-13-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-13-19 {
 	margin-left: 68.42105%;
 }
 .sheet-col-14-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-14-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-14-19 {
 	width: 73.68421%;
 }
 .sheet-offset-14-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-14-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-14-19 {
 	margin-left: 73.68421%;
 }
 .sheet-col-15-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-15-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-15-19 {
 	width: 78.94737%;
 }
 .sheet-offset-15-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-15-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-15-19 {
 	margin-left: 78.94737%;
 }
 .sheet-col-16-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-16-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-16-19 {
 	width: 84.21053%;
 }
 .sheet-offset-16-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-16-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-16-19 {
 	margin-left: 84.21053%;
 }
 .sheet-col-17-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-17-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-17-19 {
 	width: 89.47368%;
 }
 .sheet-offset-17-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-17-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-17-19 {
 	margin-left: 89.47368%;
 }
 .sheet-col-18-19,
-.sheet-rolltemplate-whfrp2e .sheet-col-18-19 {
+.sheet-rolltemplate-wfrp4e .sheet-col-18-19 {
 	width: 94.73684%;
 }
 .sheet-offset-18-19,
-.sheet-rolltemplate-whfrp2e .sheet-offset-18-19 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-18-19 {
 	margin-left: 94.73684%;
 }
 
 .sheet-col-1-20,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-20 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-20 {
 	width: 5%;
 }
 .sheet-offset-1-20,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-20 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-20 {
 	margin-left: 5%;
 }
 .sheet-col-3-20,
-.sheet-rolltemplate-whfrp2e .sheet-col-3-20 {
+.sheet-rolltemplate-wfrp4e .sheet-col-3-20 {
 	width: 15%;
 }
 .sheet-offset-3-20,
-.sheet-rolltemplate-whfrp2e .sheet-offset-3-20 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-3-20 {
 	margin-left: 15%;
 }
 .sheet-col-7-20,
-.sheet-rolltemplate-whfrp2e .sheet-col-7-20 {
+.sheet-rolltemplate-wfrp4e .sheet-col-7-20 {
 	width: 35%;
 }
 .sheet-offset-7-20,
-.sheet-rolltemplate-whfrp2e .sheet-offset-7-20 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-7-20 {
 	margin-left: 35%;
 }
 .sheet-col-9-20,
-.sheet-rolltemplate-whfrp2e .sheet-col-9-20 {
+.sheet-rolltemplate-wfrp4e .sheet-col-9-20 {
 	width: 45%;
 }
 .sheet-offset-9-20,
-.sheet-rolltemplate-whfrp2e .sheet-offset-9-20 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-9-20 {
 	margin-left: 45%;
 }
 .sheet-col-11-20,
-.sheet-rolltemplate-whfrp2e .sheet-col-11-20 {
+.sheet-rolltemplate-wfrp4e .sheet-col-11-20 {
 	width: 55%;
 }
 .sheet-offset-11-20,
-.sheet-rolltemplate-whfrp2e .sheet-offset-11-20 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-11-20 {
 	margin-left: 55%;
 }
 .sheet-col-13-20,
-.sheet-rolltemplate-whfrp2e .sheet-col-13-20 {
+.sheet-rolltemplate-wfrp4e .sheet-col-13-20 {
 	width: 65%;
 }
 .sheet-offset-13-20,
-.sheet-rolltemplate-whfrp2e .sheet-offset-13-20 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-13-20 {
 	margin-left: 65%;
 }
 .sheet-col-15-20,
-.sheet-rolltemplate-whfrp2e .sheet-col-15-20 {
+.sheet-rolltemplate-wfrp4e .sheet-col-15-20 {
 	width: 75%;
 }
 .sheet-offset-15-20,
-.sheet-rolltemplate-whfrp2e .sheet-offset-15-20 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-15-20 {
 	margin-left: 75%;
 }
 .sheet-col-17-20,
-.sheet-rolltemplate-whfrp2e .sheet-col-17-20 {
+.sheet-rolltemplate-wfrp4e .sheet-col-17-20 {
 	width: 85%;
 }
 .sheet-offset-17-20,
-.sheet-rolltemplate-whfrp2e .sheet-offset-17-20 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-17-20 {
 	margin-left: 85%;
 }
 .sheet-col-19-20,
-.sheet-rolltemplate-whfrp2e .sheet-col-19-20 {
+.sheet-rolltemplate-wfrp4e .sheet-col-19-20 {
 	width: 95%;
 }
 .sheet-offset-19-20,
-.sheet-rolltemplate-whfrp2e .sheet-offset-19-20 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-19-20 {
 	margin-left: 95%;
 }
 
 .sheet-col-1-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-21 {
 	width: 4.7619%;
 }
 .sheet-offset-1-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-21 {
 	margin-left: 4.7619%;
 }
 .sheet-col-2-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-2-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-2-21 {
 	width: 9.52381%;
 }
 .sheet-offset-2-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-2-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-2-21 {
 	margin-left: 9.52381%;
 }
 .sheet-col-4-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-4-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-4-21 {
 	width: 19.04762%;
 }
 .sheet-offset-4-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-4-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-4-21 {
 	margin-left: 19.04762%;
 }
 .sheet-col-5-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-5-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-5-21 {
 	width: 23.80952%;
 }
 .sheet-offset-5-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-5-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-5-21 {
 	margin-left: 23.80952%;
 }
 .sheet-col-6-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-6-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-6-21 {
 	width: 28.57143%;
 }
 .sheet-offset-6-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-6-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-6-21 {
 	margin-left: 28.57143%;
 }
 .sheet-col-8-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-8-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-8-21 {
 	width: 38.09524%;
 }
 .sheet-offset-8-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-8-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-8-21 {
 	margin-left: 38.09524%;
 }
 .sheet-col-9-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-9-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-9-21 {
 	width: 42.85714%;
 }
 .sheet-offset-9-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-9-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-9-21 {
   margin-left: 42.85714%;
 }
 .sheet-col-10-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-10-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-10-21 {
 	width: 47.61905%;
 }
 .sheet-offset-10-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-10-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-10-21 {
 	margin-left: 47.61905%;
 }
 .sheet-col-11-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-11-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-11-21 {
 	width: 52.38095%;
 }
 .sheet-offset-11-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-11-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-11-21 {
 	margin-left: 52.38095%;
 }
 .sheet-col-12-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-12-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-12-21 {
 	width: 57.14286%;
 }
 .sheet-offset-12-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-12-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-12-21 {
 	margin-left: 57.14286%;
 }
 .sheet-col-13-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-13-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-13-21 {
 	width: 61.90476%;
 }
 .sheet-offset-13-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-13-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-13-21 {
 	margin-left: 61.90476%;
 }
 .sheet-col-14-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-14-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-14-21 {
 	width: 66.66667%;
 }
 .sheet-offset-14-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-14-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-14-21 {
 	margin-left: 66.66667%;
 }
 .sheet-col-15-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-15-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-15-21 {
 	width: 71.42857%;
 }
 .sheet-offset-15-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-15-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-15-21 {
 	margin-left: 71.42857%;
 }
 .sheet-col-16-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-16-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-16-21 {
 	width: 76.19048%;
 }
 .sheet-offset-16-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-16-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-16-21 {
 	margin-left: 76.19048%;
 }
 .sheet-col-17-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-17-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-17-21 {
 	width: 80.95238%;
 }
 .sheet-offset-17-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-17-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-17-21 {
 	margin-left: 80.95238%;
 }
 .sheet-col-18-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-18-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-18-21 {
 	width: 85.71429%;
 }
 .sheet-offset-18-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-18-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-18-21 {
 	margin-left: 85.71429%;
 }
 .sheet-col-19-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-19-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-19-21 {
 	width: 90.47619%;
 }
 .sheet-offset-19-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-19-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-19-21 {
 	margin-left: 90.47619%;
 }
 .sheet-col-20-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-20-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-20-21 {
 	width: 95.2381%;
 }
 .sheet-offset-20-21,
-.sheet-rolltemplate-whfrp2e .sheet-offset-20-21 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-20-21 {
 	margin-left: 95.2381%;
 }
 
 .sheet-col-1-22,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-22 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-22 {
 	width: 4.54545%;
 }
 .sheet-offset-1-22,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-22 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-22 {
 	margin-left: 4.54545%;
 }
 .sheet-col-3-22,
-.sheet-rolltemplate-whfrp2e .sheet-col-3-22 {
+.sheet-rolltemplate-wfrp4e .sheet-col-3-22 {
 	width: 13.63636%;
 }
 .sheet-offset-3-22,
-.sheet-rolltemplate-whfrp2e .sheet-offset-3-22 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-3-22 {
 	margin-left: 13.63636%;
 }
 .sheet-col-5-22,
-.sheet-rolltemplate-whfrp2e .sheet-col-5-22 {
+.sheet-rolltemplate-wfrp4e .sheet-col-5-22 {
 	width: 22.72727%;
 }
 .sheet-offset-5-22,
-.sheet-rolltemplate-whfrp2e .sheet-offset-5-22 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-5-22 {
 	margin-left: 22.72727%;
 }
 .sheet-col-7-22,
-.sheet-rolltemplate-whfrp2e .sheet-col-7-22 {
+.sheet-rolltemplate-wfrp4e .sheet-col-7-22 {
 	width: 31.81818%;
 }
 .sheet-offset-7-22,
-.sheet-rolltemplate-whfrp2e .sheet-offset-7-22 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-7-22 {
 	margin-left: 31.81818%;
 }
 .sheet-col-9-22,
-.sheet-rolltemplate-whfrp2e .sheet-col-9-22 {
+.sheet-rolltemplate-wfrp4e .sheet-col-9-22 {
 	width: 40.90909%;
 }
 .sheet-offset-9-22,
-.sheet-rolltemplate-whfrp2e .sheet-offset-9-22 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-9-22 {
 	margin-left: 40.90909%;
 }
 .sheet-col-13-22,
-.sheet-rolltemplate-whfrp2e .sheet-col-13-22 {
+.sheet-rolltemplate-wfrp4e .sheet-col-13-22 {
 	width: 59.09091%;
 }
 .sheet-offset-13-22,
-.sheet-rolltemplate-whfrp2e .sheet-offset-13-22 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-13-22 {
 	margin-left: 59.09091%;
 }
 
 .sheet-col-15-22,
-.sheet-rolltemplate-whfrp2e .sheet-col-15-22 {
+.sheet-rolltemplate-wfrp4e .sheet-col-15-22 {
 	width: 68.18182%;
 }
 .sheet-offset-15-22,
-.sheet-rolltemplate-whfrp2e .sheet-offset-15-22 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-15-22 {
 	margin-left: 68.18182%;
 }
 .sheet-col-17-22,
-.sheet-rolltemplate-whfrp2e .sheet-col-17-22 {
+.sheet-rolltemplate-wfrp4e .sheet-col-17-22 {
 	width: 77.27273%;
 }
 .sheet-offset-17-22,
-.sheet-rolltemplate-whfrp2e .sheet-offset-17-22 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-17-22 {
 	margin-left: 77.27273%;
 }
 .sheet-col-19-22,
-.sheet-rolltemplate-whfrp2e .sheet-col-19-22 {
+.sheet-rolltemplate-wfrp4e .sheet-col-19-22 {
 	width: 86.36364%;
 }
 .sheet-offset-19-22,
-.sheet-rolltemplate-whfrp2e .sheet-offset-19-22 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-19-22 {
 	margin-left: 86.36364%;
 }
 .sheet-col-21-22,
-.sheet-rolltemplate-whfrp2e .sheet-col-21-22 {
+.sheet-rolltemplate-wfrp4e .sheet-col-21-22 {
 	width: 95.45455%;
 }
 .sheet-offset-21-22,
-.sheet-rolltemplate-whfrp2e .sheet-offset-21-22 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-21-22 {
 	margin-left: 95.45455%;
 }
 
 .sheet-col-1-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-23 {
 	width: 4.34783%;
 }
 .sheet-offset-1-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-23 {
 	margin-left: 4.34783%;
 }
 .sheet-col-2-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-2-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-2-23 {
 	width: 8.69565%;
 }
 .sheet-offset-2-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-2-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-2-23 {
 	margin-left: 8.69565%;
 }
 .sheet-col-3-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-3-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-3-23 {
 	width: 13.04348%;
 }
 .sheet-offset-3-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-3-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-3-23 {
 	margin-left: 13.04348%;
 }
 .sheet-col-4-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-4-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-4-23 {
 	width: 17.3913%;
 }
 .sheet-offset-4-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-4-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-4-23 {
 	margin-left: 17.3913%;
 }
 .sheet-col-5-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-5-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-5-23 {
 	width: 21.73913%;
 }
 .sheet-offset-5-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-5-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-5-23 {
 	margin-left: 21.73913%;
 }
 .sheet-col-6-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-6-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-6-23 {
 	width: 26.08696%;
 }
 .sheet-offset-6-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-6-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-6-23 {
 	margin-left: 26.08696%;
 }
 .sheet-col-7-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-7-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-7-23 {
 	width: 30.43478%;
 }
 .sheet-offset-7-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-7-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-7-23 {
 	margin-left: 30.43478%;
 }
 .sheet-col-8-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-8-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-8-23 {
 	width: 34.78261%;
 }
 .sheet-offset-8-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-8-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-8-23 {
 	margin-left: 34.78261%;
 }
 .sheet-col-9-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-9-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-9-23 {
 	width: 39.13043%;
 }
 .sheet-offset-9-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-9-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-9-23 {
 	margin-left: 39.13043%;
 }
 .sheet-col-10-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-10-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-10-23 {
 	width: 43.47826%;
 }
 .sheet-offset-10-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-10-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-10-23 {
 	margin-left: 43.47826%;
 }
 .sheet-col-11-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-11-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-11-23 {
 	width: 47.82609%;
 }
 .sheet-offset-11-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-11-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-11-23 {
 	margin-left: 47.82609%;
 }
 .sheet-col-12-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-12-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-12-23 {
 	width: 52.17391%;
 }
 .sheet-offset-12-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-12-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-12-23 {
 	margin-left: 52.17391%;
 }
 .sheet-col-13-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-13-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-13-23 {
 	width: 56.52174%;
 }
 .sheet-offset-13-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-13-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-13-23 {
 	margin-left: 56.52174%;
 }
 .sheet-col-14-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-14-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-14-23 {
 	width: 60.86957%;
 }
 .sheet-offset-14-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-14-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-14-23 {
 	margin-left: 60.86957%;
 }
 .sheet-col-15-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-15-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-15-23 {
 	width: 65.21739%;
 }
 .sheet-offset-15-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-15-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-15-23 {
 	margin-left: 65.21739%;
 }
 .sheet-col-16-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-16-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-16-23 {
 	width: 69.56522%;
 }
 .sheet-offset-16-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-16-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-16-23 {
 	margin-left: 69.56522%;
 }
 .sheet-col-17-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-17-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-17-23 {
 	width: 73.91304%;
 }
 .sheet-offset-17-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-17-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-17-23 {
 	margin-left: 73.91304%;
 }
 .sheet-col-18-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-18-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-18-23 {
 	width: 78.26087%;
 }
 .sheet-offset-18-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-18-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-18-23 {
 	margin-left: 78.26087%;
 }
 .sheet-col-19-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-19-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-19-23 {
 	width: 82.6087%;
 }
 .sheet-offset-19-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-19-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-19-23 {
 	margin-left: 82.6087%;
 }
 .sheet-col-20-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-20-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-20-23 {
 	width: 86.95652%;
 }
 .sheet-offset-20-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-20-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-20-23 {
 	margin-left: 86.95652%;
 }
 .sheet-col-21-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-21-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-21-23 {
 	width: 91.30435%;
 }
 .sheet-offset-21-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-21-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-21-23 {
 	margin-left: 91.30435%;
 }
 .sheet-col-22-23,
-.sheet-rolltemplate-whfrp2e .sheet-col-22-23 {
+.sheet-rolltemplate-wfrp4e .sheet-col-22-23 {
 	width: 95.65217%;
 }
 .sheet-offset-22-23,
-.sheet-rolltemplate-whfrp2e .sheet-offset-22-23 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-22-23 {
 	margin-left: 95.65217%;
 }
 
 .sheet-col-1-24,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-24 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-24 {
 	width: 4.16667%;
 }
 .sheet-offset-1-24,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-24 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-24 {
 	margin-left: 4.16667%;
 }
 .sheet-col-5-24,
-.sheet-rolltemplate-whfrp2e .sheet-col-5-24 {
+.sheet-rolltemplate-wfrp4e .sheet-col-5-24 {
 	width: 20.83333%;
 }
 .sheet-offset-5-24,
-.sheet-rolltemplate-whfrp2e .sheet-offset-5-24 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-5-24 {
 	margin-left: 20.83333%;
 }
 .sheet-col-7-24,
-.sheet-rolltemplate-whfrp2e .sheet-col-7-24 {
+.sheet-rolltemplate-wfrp4e .sheet-col-7-24 {
 	width: 29.16667%;
 }
 .sheet-offset-7-24,
-.sheet-rolltemplate-whfrp2e .sheet-offset-7-24 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-7-24 {
 	margin-left: 29.16667%;
 }
 .sheet-col-9-24,
-.sheet-rolltemplate-whfrp2e .sheet-col-9-24 {
+.sheet-rolltemplate-wfrp4e .sheet-col-9-24 {
 	width: 37.5%;
 }
 .sheet-offset-9-24,
-.sheet-rolltemplate-whfrp2e .sheet-offset-9-24 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-9-24 {
 	margin-left: 37.5%;
 }
 .sheet-col-11-24,
-.sheet-rolltemplate-whfrp2e .sheet-col-11-24 {
+.sheet-rolltemplate-wfrp4e .sheet-col-11-24 {
 	width: 45.83333%;
 }
 .sheet-offset-11-24,
-.sheet-rolltemplate-whfrp2e .sheet-offset-11-24 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-11-24 {
 	margin-left: 45.83333%;
 }
 .sheet-col-13-24,
-.sheet-rolltemplate-whfrp2e .sheet-col-13-24 {
+.sheet-rolltemplate-wfrp4e .sheet-col-13-24 {
 	width: 54.16667%;
 }
 .sheet-offset-13-24,
-.sheet-rolltemplate-whfrp2e .sheet-offset-13-24 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-13-24 {
 	margin-left: 54.16667%;
 }
 .sheet-col-15-24,
-.sheet-rolltemplate-whfrp2e .sheet-col-15-24 {
+.sheet-rolltemplate-wfrp4e .sheet-col-15-24 {
 	width: 62.5%;
 }
 .sheet-offset-15-24,
-.sheet-rolltemplate-whfrp2e .sheet-offset-15-24 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-15-24 {
 	margin-left: 62.5%;
 }
 .sheet-col-17-24,
-.sheet-rolltemplate-whfrp2e .sheet-col-17-24 {
+.sheet-rolltemplate-wfrp4e .sheet-col-17-24 {
 	width: 70.83333%;
 }
 .sheet-offset-17-24,
-.sheet-rolltemplate-whfrp2e .sheet-offset-17-24 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-17-24 {
 	margin-left: 70.83333%;
 }
 .sheet-col-19-24,
-.sheet-rolltemplate-whfrp2e .sheet-col-19-24 {
+.sheet-rolltemplate-wfrp4e .sheet-col-19-24 {
 	width: 79.16667%;
 }
 .sheet-offset-19-24,
-.sheet-rolltemplate-whfrp2e .sheet-offset-19-24 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-19-24 {
 	margin-left: 79.16667%;
 }
 .sheet-col-21-24,
-.sheet-rolltemplate-whfrp2e .sheet-col-21-24 {
+.sheet-rolltemplate-wfrp4e .sheet-col-21-24 {
 	width: 87.5%;
 }
 .sheet-offset-21-24,
-.sheet-rolltemplate-whfrp2e .sheet-offset-21-24 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-21-24 {
 	margin-left: 87.5%;
 }
 .sheet-col-23-24,
-.sheet-rolltemplate-whfrp2e .sheet-col-23-24 {
+.sheet-rolltemplate-wfrp4e .sheet-col-23-24 {
 	width: 95.83333%;
 }
 .sheet-offset-23-24,
-.sheet-rolltemplate-whfrp2e .sheet-offset-23-24 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-23-24 {
 	margin-left: 95.83333%;
 }
 
 .sheet-col-1-25,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-25 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-25 {
 	width: 4%;
 }
 .sheet-offset-1-25,
-.sheet-rolltemplate-whfrp2e .sheet-offset-1-25 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-1-25 {
 	margin-left: 4%;
 }
 .sheet-col-2-25,
@@ -4476,6 +4682,10 @@ input[disabled].sheet-passive-skill-score {
 .sheet-rolltemplate-ahqr .sheet-offset-24-25{
 	margin-left: 96%;
 }
+.sheet-col-1-28,
+.sheet-rolltemplate-wfrp4e .sheet-col-1-28 {
+	width: 3.57143%;
+}
 
 .sheet-col-1-30,
 .sheet-rolltemplate-ahqr .sheet-col-1-30{
@@ -4557,7 +4767,10 @@ input[disabled].sheet-passive-skill-score {
 .sheet-rolltemplate-ahqr .sheet-offset-28-30{
 	width: 93.33333%;
 }
-
+.sheet-col-1-35,
+.sheet-rolltemplate-ahqr .sheet-col-1-35{
+	width: 2.8571%;
+}
 .sheet-col-11-36,
 .sheet-rolltemplate-ahqr .sheet-col-11-36{
 	width: 30.55556%;
@@ -4755,208 +4968,208 @@ input[disabled].sheet-passive-skill-score {
 }
 
 .sheet-col-045,
-.sheet-rolltemplate-whfrp2e .sheet-col-045 {
+.sheet-rolltemplate-wfrp4e .sheet-col-045 {
 	width: 4.5%;
 }
 .sheet-col-085,
-.sheet-rolltemplate-whfrp2e .sheet-col-085 {
+.sheet-rolltemplate-wfrp4e .sheet-col-085 {
 	width: 8.5%;
 }
 .sheet-col-095,
-.sheet-rolltemplate-whfrp2e .sheet-col-095 {
+.sheet-rolltemplate-wfrp4e .sheet-col-095 {
 	width: 9.5%;
 }
 .sheet-col-105,
-.sheet-rolltemplate-whfrp2e .sheet-col-105 {
+.sheet-rolltemplate-wfrp4e .sheet-col-105 {
 	width: 10.5%;
 }
 .sheet-col-535,
-.sheet-rolltemplate-whfrp2e .sheet-col-535 {
+.sheet-rolltemplate-wfrp4e .sheet-col-535 {
 	width: 53.5%;
 }
 .sheet-col-1-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-100 {
 	width: 1%;
 }
 .sheet-col-3-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-3-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-3-100 {
 	width: 3%;
 }
 .sheet-col-4-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-4-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-4-100 {
 	width: 4%;
 }
 .sheet-col-6-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-6-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-6-100 {
 	width: 6%;
 }
 .sheet-col-7-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-7-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-7-100 {
 	width: 7%;
 }
 .sheet-col-8-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-8-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-8-100 {
 	width: 8%;
 }
 .sheet-col-9-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-9-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-9-100 {
 	width: 9%;
 }
 .sheet-col-11-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-11-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-11-100 {
 	width: 11%;
 }
 .sheet-col-12-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-12-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-12-100 {
 	width: 12%;
 }
 .sheet-col-13-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-13-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-13-100 {
 	width: 13%;
 }
 .sheet-col-14-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-14-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-14-100 {
 	width: 14%;
 }
 .sheet-col-16-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-16-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-16-100 {
 	width: 16%;
 }
 .sheet-col-17-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-17-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-17-100 {
 	width: 17%;
 }
 .sheet-col-18-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-18-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-18-100 {
 	width: 18%;
 }
 .sheet-col-19-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-19-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-19-100 {
 	width: 19%;
 }
 .sheet-col-21-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-21-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-21-100 {
 	width: 21%;
 }
 .sheet-col-23-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-23-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-23-100 {
 	width: 23%;
 }
 .sheet-col-24-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-24-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-24-100 {
 	width: 24%;
 }
 .sheet-col-26-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-26-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-26-100 {
 	width: 26%;
 }
 .sheet-col-27-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-27-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-27-100 {
 	width: 27%;
 }
 .sheet-col-28-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-28-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-28-100 {
 	width: 28%;
 }
 .sheet-col-29-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-29-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-29-100 {
 	width: 29%;
 }
 .sheet-col-31-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-31-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-31-100 {
 	width: 31%;
 }
 .sheet-col-32-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-32-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-32-100 {
 	width: 32%;
 }
 .sheet-col-35-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-35-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-35-100 {
 	width: 35%;
 }
 .sheet-col-36-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-36-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-36-100 {
 	width: 36%;
 }
 .sheet-col-37-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-37-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-37-100 {
 	width: 37%;
 }
 .sheet-col-1-150,
-.sheet-rolltemplate-whfrp2e .sheet-col-1-150 {
+.sheet-rolltemplate-wfrp4e .sheet-col-1-150 {
 	width: 1.5%;
 }
 .sheet-col-63-200,
-.sheet-rolltemplate-whfrp2e .sheet-col-63-200 {
+.sheet-rolltemplate-wfrp4e .sheet-col-63-200 {
 	width: 31.5%;
 }
 .sheet-col-103-200,
-.sheet-rolltemplate-whfrp2e .sheet-col-103-200 {
+.sheet-rolltemplate-wfrp4e .sheet-col-103-200 {
 	width: 51.5%;
 }
 .sheet-col-25-39,
-.sheet-rolltemplate-whfrp2e .sheet-col-25-49 {
+.sheet-rolltemplate-wfrp4e .sheet-col-25-49 {
 	width: 39%;
 }
 .sheet-col-25-49,
-.sheet-rolltemplate-whfrp2e .sheet-col-25-49 {
+.sheet-rolltemplate-wfrp4e .sheet-col-25-49 {
 	width: 49%;
 }
 .sheet-offset-25-49,
-.sheet-rolltemplate-whfrp2e .sheet-offset-25-49 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-25-49 {
 	margin-left: 49%;
 }
 .sheet-col-25-1,
-.sheet-rolltemplate-whfrp2e .sheet-col-25-1 {
+.sheet-rolltemplate-wfrp4e .sheet-col-25-1 {
 	width: 1.5%;
 }
 .sheet-col-25-2,
-.sheet-rolltemplate-whfrp2e .sheet-col-25-2 {
-	width: 2%;
+.sheet-rolltemplate-wfrp4e .sheet-col-25-2 {
+	width: 2% 2%;
 }
 .sheet-col-25-3,
-.sheet-rolltemplate-whfrp2e .sheet-col-25-3 {
+.sheet-rolltemplate-wfrp4e .sheet-col-25-3 {
 	width: 2.5%;
 }
 .sheet-offset-25-2,
-.sheet-rolltemplate-whfrp2e .sheet-offset-25-2 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-25-2 {
 	margin-left: 2%;
 }
 .sheet-col-25-21,
-.sheet-rolltemplate-whfrp2e .sheet-col-25-21 {
+.sheet-rolltemplate-wfrp4e .sheet-col-25-21 {
 	width: 52.5%;
 }
 .sheet-col-25-78,
-.sheet-rolltemplate-whfrp2e .sheet-col-25-78 {
+.sheet-rolltemplate-wfrp4e .sheet-col-25-78 {
 	width: 78%;
 }
 .sheet-offset-25-78,
-.sheet-rolltemplate-whfrp2e .sheet-offset-25-78 {
+.sheet-rolltemplate-wfrp4e .sheet-offset-25-78 {
 	margin-left: 78%;
 }
 .sheet-col-100-100,
-.sheet-rolltemplate-whfrp2e .sheet-col-100-100 {
+.sheet-rolltemplate-wfrp4e .sheet-col-100-100 {
 	width: 100%;
 }
 .sheet-col-rowspan,
-.sheet-rolltemplate-whfrp2e .sheet-col-535 {
+.sheet-rolltemplate-wfrp4e .sheet-col-535 {
 	top: 0;
 	bottom: 0;
 	height: 100%;
 }
 
 .sheet-row-r,
-.sheet-rolltemplate-whfrp2e .sheet-row-r {
+.sheet-rolltemplate-wfrp4e .sheet-row-r {
 	letter-spacing: -0.31em;
 	*letter-spacing: normal;
 	word-spacing: -0.43em;
 }
 .sheet-opera-only :-o-prefocus,  .sheet-row-r,
-.sheet-rolltemplate-whfrp2e .sheet-opera-only :-o-prefocus, .sheet-rolltemplate-whfrp2e .sheet-row-r {
+.sheet-rolltemplate-wfrp4e .sheet-opera-only :-o-prefocus, .sheet-rolltemplate-wfrp4e .sheet-row-r {
 	word-spacing: -0.43em;
 }
 .sheet-row-r img,
-.sheet-rolltemplate-whfrp2e .sheet-row-r img {
+.sheet-rolltemplate-wfrp4e .sheet-row-r img {
 	max-width: 100%;
 }
 
diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index 78ef1d546c..9e5f861dc7 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
@@ -139,7 +139,8 @@
 			</div>
 			<div class="sheet-col-1-4 sheet-pad-r-sm">
 			<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-mar-l-md" >
-				<span  style="font-size: 14px" data-i18n="FATE-&-RESILENCE">FATE & RESILIENCE</span><label class="talsetshow-check" style="display: inline; padding-right: 0px; margin-bottom: 0px; line-height: 12px;">
+				<span  style="font-size: 14px" data-i18n="FATE-&-RESILENCE">FATE & RESILIENCE</span>
+				<label class="talsetshow-check" style="display: inline; padding-right: 0px; margin-bottom: 0px; line-height: 12px;">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_FateResil_settings_hide" value="0"/>		
 		<input class="talsetshow-check__hide" type="checkbox" name="attr_FateResil_settings_hide" value="1"/><span class="talsetshow-check__span" style="vertical-align: text-top; font-size: 12px; line-height: 12px;" checked="unchecked">y</span>
               </label></div>
@@ -168,7 +169,7 @@
 			</div>
 			<div class="sheet-col-1-4 sheet-pad-r-sm">
 			<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-mar-l-md" >
-				<span  style="font-size: 14px" data-i18n="ADVANTAGECAP">ADVANTAGE</span>				
+				<span  style="font-size: 14px" data-i18n="ADVANTAGECAP">ADVANTAGE</span>	
 			</div>	
 			<img src="https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/seperator-center-quater.png?raw=true">												
 			</div>
@@ -261,7 +262,7 @@
 				<div class="sheet-row">
 					<div class="sheet-col-1 sheet-sub-header">
 					<button type="roll" class="sheet-adv-button sheet-roll3" name="Advantage" value="!token-mod --set statusmarkers|!2-Advantage[[@{selected|Advantage}]]">
-						<span data-i18n="ADVANTAGE">Advantage</span>
+						<span  style="margin-right: 4px; font-family: pictos; color: gold; font-size: 8px;">S</span><span data-i18n="ADVANTAGE">Advantage</span>
 					</button>
 					</div>
 				</div>
@@ -274,10 +275,7 @@
 			</div>
 		</div>	
 		<span class="sheet-spacer-l"></span>
-
 		<span class="sheet-spacer"></span>	
-
-		
 		<div class="sheet-row">		
 			<div class="sheet-col-1-4 sheet-seperator-cap sheet-left sheet-pad-l-md sheet-pad-t-md">
 				<span  style="font-size: 14px" data-i18n="COMBAT-ACTIONS-CAP">COMBAT ACTIONS</span>				
@@ -426,8 +424,9 @@
 				</div>				
 			</div>
 
+				<input type="hidden" name="attr_Devmode" value="0" />	
 				<input type="hidden" name="attr_sheetcheck" value="0" />		
-	
+		
 			<input type="hidden" name="attr_condgen" value="0" readonly />	
 			<input type="hidden" name="attr_condgen_move" value="0" readonly />	
 			<input type="hidden" name="attr_condgen_see" value="0" readonly />		
@@ -436,101 +435,212 @@
 			<input type="hidden" name="attr_condgen_see_move" value="0" readonly />					
 			<input type="hidden" name="attr_condall" value="0" readonly />	
 
-						<input class="sheet-hidden" type="textarea" name="attr_RT-reroll" value="[1](~@{character_name}|" />
-						<input class="sheet-hidden" type="textarea" name="attr_RT-crit" value="[l](~@{character_name}|CriticalTest)" />
-						<input class="sheet-hidden" type="textarea" name="attr_RT-fumble" value="[l](~@{character_name}|FumbleTest)" />
-						<input class="sheet-hidden" type="textarea" name="attr_RT-minor" value="[J](~@{character_name}|Minor)" />		
-						<input class="sheet-hidden" type="textarea" name="attr_RT-major" value="[`](~@{character_name}|Major)" />		
-						<input class="sheet-hidden" type="textarea" name="attr_RT-wrath" value="[l](~@{character_name}|Wrath)" />									
+				<input class="sheet-hidden" type="textarea" name="attr_RT-reroll" value="[1](~@{character_name}|" />
+				<input class="sheet-hidden" type="textarea" name="attr_RT-crit" value="[l](~@{character_name}|CriticalTest)" />
+				<input class="sheet-hidden" type="textarea" name="attr_RT-fumble" value="[l](~@{character_name}|FumbleTest)" />
+				<input class="sheet-hidden" type="textarea" name="attr_RT-minor" value="[J](~@{character_name}|Minor)" />		
+				<input class="sheet-hidden" type="textarea" name="attr_RT-major" value="[`](~@{character_name}|Major)" />		
+				<input class="sheet-hidden" type="textarea" name="attr_RT-wrath" value="[l](~@{character_name}|Wrath)" />		
+				<input class="sheet-hidden" type="textarea" name="attr_RT-ripostedmgmain" value="[r](~@{character_name}|ripostedmgmain)" />	
+				<button type="action" class="sheet-hidden" name="act_ripostedmgmain" />
+				<input class="sheet-hidden" type="textarea" name="attr_RT-ripostedmgoff" value="[r](~@{character_name}|ripostedmgoff)" />		
+				<button type="action" class="sheet-hidden" name="act_ripostedmgoff" />							
+
+			<input type="hidden" name="attr_Used_MeleeDamaging" value="0" disabled="true" />	
+			<input type="hidden" name="attr_Used_DefenseDamaging" value="0" disabled="true" />	
+			<input type="hidden" name="attr_Used_MeleeOpposedDmg" value="0"  disabled="true" />				
+			<input type="hidden" name="attr_Used_DefenseOpposedDmg" value="0" disabled="true" />	
+			<input type="hidden" name="attr_Used_MeleeDefensive" value="0" disabled="true" />	
+			<input type="hidden" name="attr_Used_DefenseDefensive" value="0" disabled="true" />	
+			<input type="hidden" name="attr_Used_MeleePrecise" value="0" disabled="true" />	
+			<input type="hidden" name="attr_Used_MeleePractical" value="0" disabled="true" />	
+			<input type="hidden" name="attr_Used_MeleeTwoHanded" value="0" disabled="true" />	
+			<input type="hidden" name="attr_slbonusAtkMain" value="@{Used_MeleePractical}+@{Used_MeleePrecise}" disabled="true" />	
+			<input type="hidden" name="attr_slbonusAtkOff" value="@{Used_DefensePractical}+@{Used_DefensePrecise}" disabled="true" />	
+			<input type="hidden" name="attr_slbonusRgd" value="@{Used_RangedPractical}+@{Used_RangedPrecise}" disabled="true" />	
+			<input type="hidden" name="attr_slbonusCast" value="@{Talent_InstinctiveDictionLvl}+@{Talent_PerfectPitchLvl}" disabled="true" />	
+			<input type="hidden" name="attr_slbonusChannel" value="@{Talent_AethyricAttunementLvl}" disabled="true" />	
+			<input type="hidden" name="attr_slbonusDefMain" value="@{DefensiveTotal}+@{Used_MeleePractical}+@{Talent_RiposteLvl}+@{Talent_ReversalLvl}+(@{Used_MeleeShield}*@{Talent_ShieldsmanLvl})" disabled="true" />
+			<input type="hidden" name="attr_slbonusDefOff" value="@{DefensiveTotal}+@{Used_DefensePractical}+@{Talent_RiposteLvl}+@{Talent_ReversalLvl}+(@{Used_DefenseShield}*@{Talent_ShieldsmanLvl})" disabled="true" />
+			<input type="hidden" name="attr_DefensiveTotal" value="@{Used_MeleeDefensive}+(@{Used_DefenseDefensive}-(@{Used_MeleeTwoHanded}*@{Used_DefenseDefensive})   )" disabled="true" />
 														
 		</div>		
 		</div>	
 
-		<div class="combat-actions sheet-pad-b-lg" style="width: 99%;>
+		<div class="combat-actions sheet-pad-b-lg" style="width: 99%;">
 		<span class="sheet-spacer"></span>
-		<div class="sheet-row sheet-center">
+		
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0"  />
+<div class="sheet-row sheet-center">
 			<div class="sheet-col-1-9 sheet-center">
 				<input type="checkbox" name="attr_initiative_houserule" class="sheet-hidden sheet-hider" value="0" checked="checked" />
 				<div class="sheet-center sheet-block-a">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Initiative" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ @{Initiative} [INIT] +?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}} {{SLmod=[[?{SL Modifier|0}]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Initiative" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ @{Initiative} [INIT] +?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}} {{SLmod=[[?{SL Modifier|0}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_initiative_houserule" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-center sheet-block-a">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Initiative2" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[1d10 [d10] +(@{Initiative} [INIT] +?{@{translation_modifier}|0})&{tracker}]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Initiative2" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[1d10 [d10] +(@{Initiative} [INIT] +?{@{translation_modifier}|0})&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_initiative_houserule" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-center sheet-block-a">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Initiative3" value="@{Whisper} &{template:whfrp2e}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[[[1d10]] [d10] +[[floor((@{Agility})/10)]] [AGIB] +[[floor((@{Initiative}+?{@{translation_modifier}|0})/10)]] [INITB] &{tracker}]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Initiative3" value="@{Whisper} &{template:wfrp4e}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[[[1d10]] [d10] +[[floor((@{Agility})/10)]] [AGIB] +[[floor((@{Initiative}+?{@{translation_modifier}|0})/10)]] [INITB] &{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
-				<input type="hidden" name="attr_Initiative_cm" value="@{Whisper} &{template:whfrp2e}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[[[1d10]] [d10] +[[floor((@{Agility})/10)]] [AGIB] +[[floor((@{Initiative}+?{@{translation_modifier}|0})/10)]] [INITB] &{tracker}]]}}" />
+				<input type="hidden" name="attr_Initiative_cm" value="@{Whisper} &{template:wfrp4e}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[[[1d10]] [d10] +[[floor((@{Agility})/10)]] [AGIB] +[[floor((@{Initiative}+?{@{translation_modifier}|0})/10)]] [INITB] &{tracker}]]}}" />
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-center">
-							<button type="roll" class="sheet-combat-actions-np" name="roll_CriticalTest" value="@{Whisper} &amp&{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=Critical Roll}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{modvalue=[[?{Crit Roll Modifier|0}]]}}">
+							<button type="roll" class="sheet-combat-actions-np" name="roll_CriticalTest" value="@{Whisper} &amp&{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=Critical Roll}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{modvalue=[[?{Crit Roll Modifier|0}]]}}">
 						<span data-i18n="CRITICAL-HIT">Critical Hit</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_FumbleTest" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{FUMBLE}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_FumbleTest" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{FUMBLE}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}">
 						<span data-i18n="OOPS">Oops</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_AmputationTest" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AMPUTATION}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{amputationroll=true}} {{test=[[@{roll_rule}]]}} {{target=[[ [[@{condgen_move}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_AmputationTest" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AMPUTATION}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{amputationroll=true}} {{test=[[@{roll_rule}]]}} {{target=[[ [[@{condgen_move}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}}">
 						<span data-i18n="AMPUTATION">Amputation</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Endurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[0]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}} {{reroll=@{RT-reroll}Endurance)}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Endurance" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[0]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}} {{reroll=@{RT-reroll}Endurance)}}">
 						<span data-i18n="ENDURANCE">Endurance</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Intuition" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}} {{reroll=@{RT-reroll}Intuition)}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Intuition" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}} {{reroll=@{RT-reroll}Intuition)}}">
 						<span style="white-space: pre;" data-i18n="INTUITION">Intuition</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Perception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]] [PEN]  + [[@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{armorpen=[[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}} {{reroll=@{RT-reroll}Perception)}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Perception" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]] [PEN]  + [[@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{armorpen=[[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}} {{reroll=@{RT-reroll}Perception)}}">
 						<span data-i18n="PERCEPTION">Perception</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Cool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{COOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CoolChar}+@{CoolAdv}+@{CoolMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Cool_modtype1}]]}} {{mod1=@{Cool_mod1}}} {{mod2type=[[@{Cool_modtype2}]]}} {{mod2=@{Cool_mod2}}} {{mod3type=[[@{Cool_modtype3}]]}} {{mod3=@{Cool_mod3}}} {{reroll=@{RT-reroll}Cool)}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Cool" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{COOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CoolChar}+@{CoolAdv}+@{CoolMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Cool_modtype1}]]}} {{mod1=@{Cool_mod1}}} {{mod2type=[[@{Cool_modtype2}]]}} {{mod2=@{Cool_mod2}}} {{mod3type=[[@{Cool_modtype3}]]}} {{mod3=@{Cool_mod3}}} {{reroll=@{RT-reroll}Cool)}}">
 						<span data-i18n="COOL">Cool</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Dodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{DODGE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{DodgeChar}+@{DodgeAdv}+@{DodgeMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Dodge_modtype1}]]}} {{mod1=@{Dodge_mod1}}} {{mod2type=[[@{Dodge_modtype2}]]}} {{mod2=@{Dodge_mod2}}} {{mod3type=[[@{Dodge_modtype3}]]}} {{mod3=@{Dodge_mod3}}} {{reroll=@{RT-reroll}Dodge)}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Dodge" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{DODGE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{DodgeChar}+@{DodgeAdv}+@{DodgeMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Dodge_modtype1}]]}} {{mod1=@{Dodge_mod1}}} {{mod2type=[[@{Dodge_modtype2}]]}} {{mod2=@{Dodge_mod2}}} {{mod3type=[[@{Dodge_modtype3}]]}} {{mod3=@{Dodge_mod3}}} {{reroll=@{RT-reroll}Dodge)}}">
 						<span data-i18n="DODGE">Dodge</span>
 					</button>
 				</div>
 			</div>		
 		</div>
 		
+		
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1"  />
+		<div class="sheet-row sheet-center">
+			<div class="sheet-col-1-9 sheet-center">
+				<input type="checkbox" name="attr_initiative_houserule" class="sheet-hidden sheet-hider" value="0" checked="checked" />
+				<div class="sheet-center sheet-block-a">
+					<button type="action" class="sheet-combat-actions-np" name="act_Initiative_houserule0" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ @{Initiative} [INIT] +?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}} {{SLmod=[[?{SL Modifier|0}]]}}">
+						<span data-i18n="INITIATIVE">Initiative</span>
+					</button>
+				</div>
+				<input type="checkbox" name="attr_initiative_houserule" class="sheet-hidden sheet-hider" value="1" />
+				<div class="sheet-center sheet-block-a">
+					<button type="action" class="sheet-combat-actions-np" name="act_Initiative_houserule1" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[1d10 [d10] +(@{Initiative} [INIT] +?{@{translation_modifier}|0})&{tracker}]]}}">
+						<span data-i18n="INITIATIVE">Initiative</span>
+					</button>
+				</div>
+				<input type="checkbox" name="attr_initiative_houserule" class="sheet-hidden sheet-hider" value="2" />
+				<div class="sheet-center sheet-block-a">
+					<button type="action" class="sheet-combat-actions-np" name="act_Initiative_houserule2" value="@{Whisper} &{template:wfrp4e}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[[[1d10]] [d10] +[[floor((@{Agility})/10)]] [AGIB] +[[floor((@{Initiative}+?{@{translation_modifier}|0})/10)]] [INITB] &{tracker}]]}}">
+						<span data-i18n="INITIATIVE">Initiative</span>
+					</button>
+				</div>
+				<input type="hidden" name="attr_Initiative_cm" value="@{Whisper} &{template:wfrp4e}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[[[1d10]] [d10] +[[floor((@{Agility})/10)]] [AGIB] +[[floor((@{Initiative}+?{@{translation_modifier}|0})/10)]] [INITB] &{tracker}]]}}" />
+			</div>
+			<div class="sheet-col-1-9 sheet-center">
+				<div class="sheet-center">
+							<button type="action" class="sheet-combat-actions-np" name="act_CriticalTest" value="@{Whisper} &amp&{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=Critical Roll}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{modvalue=[[?{Crit Roll Modifier|0}]]}}">
+						<span data-i18n="CRITICAL-HIT">Critical Hit</span>
+					</button>
+				</div>
+			</div>
+			<div class="sheet-col-1-9 sheet-center">
+				<div class="sheet-center">
+					<button type="action" class="sheet-combat-actions-np" name="act_FumbleTest" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{FUMBLE}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}">
+						<span data-i18n="OOPS">Oops</span>
+					</button>
+				</div>
+			</div>
+			<div class="sheet-col-1-9 sheet-center">
+				<div class="sheet-col-1 sheet-center">
+					<button type="action" class="sheet-combat-actions-np" name="act_AmputationTest" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AMPUTATION}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{amputationroll=true}} {{test=[[@{roll_rule}]]}} {{target=[[ [[@{condgen_move}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}}">
+						<span data-i18n="AMPUTATION">Amputation</span>
+					</button>
+				</div>
+			</div>
+			<div class="sheet-col-1-9 sheet-center">
+				<div class="sheet-col-1 sheet-center">
+					<button type="action" class="sheet-combat-actions-np" name="act_Endurance" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[0]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}} {{reroll=@{RT-reroll}Endurance)}}">
+						<span data-i18n="ENDURANCE">Endurance</span>
+					</button>
+				</div>
+			</div>
+			<div class="sheet-col-1-9 sheet-center">
+				<div class="sheet-col-1 sheet-center">
+					<button type="action" class="sheet-combat-actions-np" name="act_Intuition" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}} {{reroll=@{RT-reroll}Intuition)}}">
+						<span style="white-space: pre;" data-i18n="INTUITION">Intuition</span>
+					</button>
+				</div>
+			</div>
+			<div class="sheet-col-1-9 sheet-center">
+				<div class="sheet-col-1 sheet-center">
+					<button type="action" class="sheet-combat-actions-np" name="act_Perception" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]] [PEN]  + [[@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{armorpen=[[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}} {{reroll=@{RT-reroll}Perception)}}">
+						<span data-i18n="PERCEPTION">Perception</span>
+					</button>
+				</div>
+			</div>
+			<div class="sheet-col-1-9 sheet-center">
+				<div class="sheet-col-1 sheet-center">
+					<button type="action" class="sheet-combat-actions-np" name="act_Cool" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{COOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CoolChar}+@{CoolAdv}+@{CoolMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Cool_modtype1}]]}} {{mod1=@{Cool_mod1}}} {{mod2type=[[@{Cool_modtype2}]]}} {{mod2=@{Cool_mod2}}} {{mod3type=[[@{Cool_modtype3}]]}} {{mod3=@{Cool_mod3}}} {{reroll=@{RT-reroll}Cool)}}">
+						<span data-i18n="COOL">Cool</span>
+					</button>
+				</div>
+			</div>
+			<div class="sheet-col-1-9 sheet-center">
+				<div class="sheet-col-1 sheet-center">
+					<button type="action" class="sheet-combat-actions-np" name="act_Dodge" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{DODGE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{DodgeChar}+@{DodgeAdv}+@{DodgeMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Dodge_modtype1}]]}} {{mod1=@{Dodge_mod1}}} {{mod2type=[[@{Dodge_modtype2}]]}} {{mod2=@{Dodge_mod2}}} {{mod3type=[[@{Dodge_modtype3}]]}} {{mod3=@{Dodge_mod3}}} {{reroll=@{RT-reroll}Dodge)}}">
+						<span data-i18n="DODGE">Dodge</span>
+					</button>
+				</div>
+			</div>		
+		</div>
+		
+		
+		
+		
+		
 		<div class="sheet-row sheet-center sheet-nowrap">
 
 
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 				<div class="sheet-row sheet-sub-header sheet-nowrap">
 					<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-border-left" data-i18n="DICE-ROLLS">Dice Rolls</div>
 					<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-border-left" data-i18n="MOVEMENT-ROLLS">Movement Rolls</div>
@@ -538,12 +648,39 @@
 					<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-border-left" data-i18n="CURRENT-OPPOSED-WEAPON">Current Opposed Weapon</div>
 					<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-border-left  sheet-border-right" data-i18n="CURRENT-RANGED-WEAPON">Current Ranged Weapon</div>
 				</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+				<div class="sheet-row sheet-sub-header sheet-nowrap">
+					<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-border-left" data-i18n="DICE-ROLLS">Dice Rolls</div>
+					<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-border-left" data-i18n="MOVEMENT-ROLLS">Movement Rolls</div>
+					<div class="sheet-col-1-5 sheet-right sheet-small-label sheet-vert-middle sheet-border-left" style="line-height: 13px;" > <span data-i18n="MAINHAND-WEAPON" style="margin-right: 23px">Attack Weapon</span>
+					
+		
+					<button type="action" class="sheet-combat-mini" name="act_meleechargemain" data-i18n-title="CHARGE"  >
+						<span style="font-family: pictos;">8</span>
+					</button>
+					
+					
+					</div>
+					<div class="sheet-col-1-5 sheet-right sheet-small-label sheet-vert-middle sheet-border-left sheet-combat-mini2" style="line-height: 13px;"><span data-i18n="OFFHAND-WEAPON" style="margin-right: 23px">Attack Weapon</span>
+					
+		
+					<button type="action" class="sheet-combat-mini" name="act_meleechargeoff" data-i18n-title="CHARGE"  >
+						<span style="font-family: pictos;">8</span>
+					</button>
+					</div>
+				
+					<div class="sheet-col-1-5 sheet-right sheet-small-label sheet-vert-middle sheet-border-left sheet-border-right" style="line-height: 13px;"> <span data-i18n="RANGED-WEAPON" style="margin-right: 35px">Ranged Weapon</span>
+					<button type="action" class="sheet-combat-mini" name="act_RangedWeaponRld" data-i18n-title="RELOAD">
+						<span style="font-family: pictos; bottom: 1px;">1</span>
+					</button>	
+					</div>
+				</div>
 
 
-
-			<div class="sheet-col-1-5 sheet-center sheet-nowrap">
+		<div class="sheet-row sheet-nowrap">
+			<div class="sheet-col-1-5 sheet-center sheet-nowrap" style="float: left;">
 				<div class="sheet-col-1-2 sheet-right" style="width: 85%; float: left;">
-					<input type="text" class="sheet-combat-actions-np" name="attr_CharacterRoll" value="1d100" style="height: 24px; padding-bottom: 1px;"/>	
+					<input type="text" class="sheet-combat-actions-np" name="attr_CharacterRoll" value="1d100" style="display: inline;height: 24px; padding-bottom: 1px;"/>	
 				</div>
 				<input type="checkbox" name="attr_Whisper" class="sheet-hidden sheet-hider" value="0" checked />	
 				<div class="sheet-col-1-2 sheet-center" style="width: 15%;">
@@ -558,20 +695,20 @@
 					</button>
 				</div>
 			</div>					
-			<div class="sheet-col-1-5 sheet-center sheet-nowrap">
+			<div class="sheet-col-1-5 sheet-center sheet-nowrap" style="float: left;">
 				<div class="sheet-col-1-2 sheet-right" style="width: 85%; float: left;">
 					<select class="sheet-combat-select" name="attr_CharacterAction" style="height: 24px; text-align-last: center;">					
-						<option value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + @{Athletics} [SKILL] + ?{@{translation_modifier}|0} [ADV] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}"  data-i18n="ATHLETICS" selected="selected">Athletics</option>	
+						<option value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{AthleticsChar}+@{AthleticsAdv}+@{AthleticsMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}Athletics)}}"  data-i18n="ATHLETICS" selected="selected">Athletics</option>	
 						
-						<option value="@{Whisper} &{template:whfrp2e} {{modvalue=[[20]]}} {{climbing=true}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=Climbing Roll}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]]+@{Climb}+20]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}}  {{movement=[[@{Movementmod})]]}} {{mod1type=[[@{Climb_modtype1}]]}} {{mod1=@{Climb_mod1}}} {{mod2type=[[@{Climb_modtype2}]]}} {{mod2=@{Climb_mod2}}} {{mod3type=[[@{Climb_modtype3}]]}} {{mod3=@{Climb_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}" data-i18n="CLIMBING">Climbing</option>
+						<option value="@{Whisper} &{template:wfrp4e} {{modvalue=[[20]]}} {{climbing=true}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=Climbing Roll}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]]+@{Climb}+20]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}}  {{movement=[[@{Movementmod})]]}} {{mod1type=[[@{Climb_modtype1}]]}} {{mod1=@{Climb_mod1}}} {{mod2type=[[@{Climb_modtype2}]]}} {{mod2=@{Climb_mod2}}} {{mod3type=[[@{Climb_modtype3}]]}} {{mod3=@{Climb_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}" data-i18n="CLIMBING">Climbing</option>
 						
-						<option value="@{Whisper} &{template:whfrp2e} {{falling=true}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=Falling Roll}} {{character_name=@{character_name}}} {{yards=[[?{How many yards have you fallen down?|3}]]}} {{damage=[[1d10+(?{How many yards have you fallen down?|3}*3)-( [[(((([[?{Did you fall on purpose ?|Yes, ?{Roll a Average (+20) Athletics Test&#44 was the result a success (SL +0 or more)?&amp;#124;Yes&amp;#44; 1+3*?{Enter your Athletics Test SL result&amp;amp;#124;0&amp;amp;#125; &amp;#124;No&amp;#44; 0&amp;#125; &#124;No&#44; 0&amp;#125;&#125; |No, 0}]]) + 0) + abs(([[?{Did you fall on purpose ?|Yes, ?{Roll a Average (+20) Athletics Test&#44 was the result a success (SL +0 or more)?&amp;#124;Yes&amp;#44; 1+3*?{Enter your Athletics Test SL result&amp;amp;#124;0&amp;amp;#125; &amp;#124;No&amp;#44; 0&amp;#125; &#124;No&#44; 0&amp;#125;&#125; |No, 0}]]) - 0))/2)]])-@{ToughnessBonus}]]}} {{slyards=[[?{Did you fall on purpose ?|Yes, ?{Roll a Average (+20) Athletics Test&#44 was the result a success (SL +0 or more)?&amp;#124;Yes&amp;#44; 1+3*?{Enter your Athletics Test SL result&amp;amp;#124;0&amp;amp;#125; &amp;#124;No&amp;#44; 0&amp;#125; &#124;No&#44; 0&amp;#125;&#125; |No, 0}]]}} {{reroll=@{RT-reroll}CharacterAction)}}"  data-i18n="FALLING">Falling</option>
+						<option value="@{Whisper} &{template:wfrp4e} {{falling=true}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=Falling Roll}} {{character_name=@{character_name}}} {{yards=[[?{How many yards have you fallen down?|3}]]}} {{damage=[[1d10+(?{How many yards have you fallen down?|3}*3)-( [[(((([[?{Did you fall on purpose ?|Yes, ?{Roll a Average (+20) Athletics Test&#44 was the result a success (SL +0 or more)?&amp;#124;Yes&amp;#44; 1+3*?{Enter your Athletics Test SL result&amp;amp;#124;0&amp;amp;#125; &amp;#124;No&amp;#44; 0&amp;#125; &#124;No&#44; 0&amp;#125;&#125; |No, 0}]]) + 0) + abs(([[?{Did you fall on purpose ?|Yes, ?{Roll a Average (+20) Athletics Test&#44 was the result a success (SL +0 or more)?&amp;#124;Yes&amp;#44; 1+3*?{Enter your Athletics Test SL result&amp;amp;#124;0&amp;amp;#125; &amp;#124;No&amp;#44; 0&amp;#125; &#124;No&#44; 0&amp;#125;&#125; |No, 0}]]) - 0))/2)]])-@{ToughnessBonus}]]}} {{slyards=[[?{Did you fall on purpose ?|Yes, ?{Roll a Average (+20) Athletics Test&#44 was the result a success (SL +0 or more)?&amp;#124;Yes&amp;#44; 1+3*?{Enter your Athletics Test SL result&amp;amp;#124;0&amp;amp;#125; &amp;#124;No&amp;#44; 0&amp;#125; &#124;No&#44; 0&amp;#125;&#125; |No, 0}]]}} {{reroll=@{RT-reroll}CharacterAction)}}"  data-i18n="FALLING">Falling</option>
 
-						<option value="@{Whisper} &amp;{template:whfrp2e} {{leaping=true}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=Leaping Roll}} {{character_name=@{character_name}}} {{movement=[[@{Movementmod}]]}} {{SLmod=[[?{If you have a run up of at least your Movement in yards Roll a Average (+20) Athletics Test. if not Roll Challenging (+0) Athletics Test, then enter the SL Result|0}]]}} {{reroll=@{RT-reroll}CharacterAction)}}" data-i18n="LEAPING">Leaping</option>
+						<option value="@{Whisper} &amp;{template:wfrp4e} {{leaping=true}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=Leaping Roll}} {{character_name=@{character_name}}} {{movement=[[@{Movementmod}]]}} {{SLmod=[[?{If you have a run up of at least your Movement in yards Roll a Average (+20) Athletics Test. if not Roll Challenging (+0) Athletics Test, then enter the SL Result|0}]]}} {{reroll=@{RT-reroll}CharacterAction)}}" data-i18n="LEAPING">Leaping</option>
 											
-						<option value="@{Whisper} &{template:whfrp2e} {{pursuit=true}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{title=Pursuit}} {{pursuitopt=[[?{Choose|Pursuer Roll, 1|Pursued Roll, 2}]]}} {{character_name=@{character_name}}} {{pursuitdist=[[?{Enter the current Distance between the pursuing parties (1-9)|4}]]}} {{target=[[[[@{condgen_see}*-1]] [COND] + @{Athletics} [SKILL] + ?{Athletics roll Modifier|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}"  data-i18n="PURSUIT">Pursuit</option>
+						<option value="@{Whisper} &{template:wfrp4e} {{pursuit=true}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{title=Pursuit}} {{pursuitopt=[[?{Choose|Pursuer Roll, 1|Pursued Roll, 2}]]}} {{character_name=@{character_name}}} {{pursuitdist=[[?{Enter the current Distance between the pursuing parties (1-9)|4}]]}} {{target=[[[[@{condgen_see}*-1]] [COND] + @{Athletics} [SKILL] + ?{Athletics roll Modifier|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}"  data-i18n="PURSUIT">Pursuit</option>
 						
-						<option value="@{Whisper} &amp;{template:whfrp2e} {{modvalue=[[20]]}} {{sprinting=true}} {{cond=[[@{condgen_see_move}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{title=^{ATHLETICS}}} {{skill=^{SPRINT-ROLL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{Athletics} [SKILL] + 20 [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{movement=[[@{Run}*2)]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}" data-i18n="SPRINTING">Sprinting</option>
+						<option value="@{Whisper} &amp;{template:wfrp4e} {{modvalue=[[20]]}} {{sprinting=true}} {{cond=[[@{condgen_see_move}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{title=^{ATHLETICS}}} {{skill=^{SPRINT-ROLL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{Athletics} [SKILL] + 20 [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{movement=[[@{Run}*2)]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}" data-i18n="SPRINTING">Sprinting</option>
 					</select>
 				</div>	
 				<div class="sheet-col-1-2 sheet-center" style="width: 15%;">
@@ -580,50 +717,106 @@
 					</button>
 				</div>	
 			</div>	
-		
-			<div class="sheet-col-1-5 sheet-center sheet-nowrap">
+
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1"  />			
+			<div class="sheet-col-1-5 sheet-center sheet-nowrap" style="float: left;">
 				<div class="sheet-col-1-2 sheet-center" style="width: 85%; float: left;">		
-						<input class="sheet-combat-actions-np" type="value" name="attr_CurrAtk" style="height: 24px;padding-bottom: 1px;" value=" Equip in Weapons Tab " readonly />
+						<input class="sheet-combat-actions-np" type="value" name="attr_Used_MeleeWeapon" style="height: 24px;padding-bottom: 1px;" value=" Equip in Weapons Tab " readonly />
 				</div>
 
 				<div class="sheet-col-1-2 sheet-center inline-block" style="width: 15%;">
-					<button type="roll" class="sheet-combat-actions" name="roll_MeleeAttack"  value="@{Whisper} &{template:whfrp2e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Opposed Attack Roll, Add Modifier (Adv. already added)|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{character_name=@{character_name}}} {{attacktype=^{MELEE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Opposed Attack Roll, Add Modifier (Adv. already added)|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=$[[0]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
-						<span></span>
+					<button type="action" class="sheet-combat-actions-half" name="act_MeleeAttackMain" >
+						<span style="color: white;" data-i18n="ABB-ATK">Atk</span>
 					</button>
+					
+					<button type="action" class="sheet-combat-actions-half" name="act_MeleeOpposedMain" >
+						<span style="color: white;" data-i18n="ABB-OPP">Opp</span>
+					</button>
+					
 				</div>
 			</div>
-
-			<div class="sheet-col-1-5 sheet-center sheet-nowrap">
+			
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />			
+			<div class="sheet-col-1-5 sheet-center sheet-nowrap" style="float: left;">
 				<div class="sheet-col-1-2 sheet-center" style="width: 85%; float: left;">		
-						<input class="sheet-combat-actions-np" type="value" name="attr_CurrDef" style="height: 24px;padding-bottom: 1px;" value=" Equip in Weapons Tab " readonly />
+						<input class="sheet-combat-actions-np" type="value" name="attr_Used_DefenseWeapon" style="height: 24px;padding-bottom: 1px;" value=" Equip in Weapons Tab " readonly />
 					</button>
 				</div>
+				
 				<div class="sheet-col-1-2 sheet-center" style="width: 15%;">
-					<button type="roll" class="sheet-combat-actions" name="roll_MeleeOpposed" value="@{Whisper} &{template:whfrp2e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Opposed Defense Roll, Add Modifier (Adv. already added)|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{attacktype=^{OPPOSED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Opposed Defense Roll, Add Modifier (Adv. already added)|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{Used_DefenseDefensive}]]}} {{test=$[[0]]}} {{reach=@{Used_DefenseReach}}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{showdmg=[[@{Used_DefenseOpposedDmg}]]}} {{hitlocation=true}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{armorqualities=@{armorQuality}}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeOpposed)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
-						<span></span>
+					<button type="action" class="sheet-combat-actions-half" name="act_MeleeAttackOff">
+						<span style="color: white;" data-i18n="ABB-ATK">Atk</span>
+					</button>
+					<button type="action" class="sheet-combat-actions-half" name="act_MeleeOpposedOff">
+						<span style="color: white;" data-i18n="ABB-OPP">Opp</span>
 					</button>
 				</div>
 			</div>
 			
-			<div class="sheet-col-1-5 sheet-center sheet-nowrap">
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />			
+			<div class="sheet-col-1-5 sheet-center sheet-nowrap" style="float: left;">
 				<div class="sheet-col-1-2 sheet-center" style="width: 85%; float: left;">		
-						<input class="sheet-combat-actions-np" type="value" name="attr_CurrRgd" style="height: 24px;padding-bottom: 1px;" value=" Equip in Weapons Tab " readonly />
-					</button>
+						<input class="sheet-combat-actions-np" type="value" name="attr_Used_MeleeWeapon" style="height: 24px;padding-bottom: 1px;" value=" Equip in Weapons Tab " readonly />
 				</div>
-				<div class="sheet-col-1-2 sheet-center" style="width: 15%;">
-					<button type="roll" class="sheet-combat-actions" name="roll_RangedAttack" value="@{Whisper} &{template:whfrp2e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Ranged Attack Roll, Add Modifier (Adv. already added)|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Roll, Add Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=$[[0]]}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{range=@{Used_WeaponRange}}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
+
+				<div class="sheet-col-1-2 sheet-center inline-block" style="width: 15%;">
+					<button type="roll" class="sheet-combat-actions" name="roll_MeleeAttack"  value="@{Whisper} &{template:wfrp4e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Opposed Attack Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{character_name=@{character_name}}} {{attacktype=^{MELEE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Opposed Attack Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=$[[0]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
 						<span></span>
 					</button>
 				</div>
 			</div>
+
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
+			<div class="sheet-col-1-5 sheet-center sheet-nowrap" style="float: left;">
+				<div class="sheet-col-1-2 sheet-center" style="width: 85%; float: left;">		
+						<input class="sheet-combat-actions-np" type="value" name="attr_Used_DefenseWeapon" style="height: 24px;padding-bottom: 1px;" value=" Equip in Weapons Tab " readonly />
+					</button>
+				</div>
+				<div class="sheet-col-1-2 sheet-center" style="width: 15%;">
+					<button type="roll" class="sheet-combat-actions" name="roll_MeleeOpposed" value="@{Whisper} &{template:wfrp4e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Opposed Defense Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{attacktype=^{OPPOSED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Opposed Defense Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{Used_DefenseDefensive}]]}} {{test=$[[0]]}} {{reach=@{Used_DefenseReach}}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{showdmg=[[@{Used_DefenseOpposedDmg}]]}} {{hitlocation=true}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{armorqualities=@{armorQuality}}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeOpposed)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
+						<span></span>
+					</button>
+				</div>
+			</div>			
+
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />				
+			<div class="sheet-col-1-5 sheet-center sheet-nowrap" style="float: left;">
+				<div class="sheet-col-1-2 sheet-center" style="width: 85%; float: left;">		
+						<input class="sheet-combat-actions-np" type="value" name="attr_Used_RangedWeaponName" style="height: 24px;padding-bottom: 1px;" value=" Equip in Weapons Tab " readonly />
+					</button>
+				</div>
+				<div class="sheet-col-1-2 sheet-center" style="width: 15%;">
+					<button type="action" class="sheet-combat-actions" name="act_RangedAtk" style="font-family: dicefontd20; color: white">t</button>
+						<span></span>
+					</button>
+				</div>
+				
+			</div>		
+
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />				
+			<div class="sheet-col-1-5 sheet-center sheet-nowrap" style="float: left;">
+				<div class="sheet-col-1-2 sheet-center" style="width: 85%; float: left;">		
+						<input class="sheet-combat-actions-np" type="value" name="attr_Used_RangedWeaponName" style="height: 24px;padding-bottom: 1px;" value=" Equip in Weapons Tab " readonly />
+					</button>
+				</div>
+				<div class="sheet-col-1-2 sheet-center" style="width: 15%;">
+					<button type="roll" class="sheet-combat-actions" name="roll_RangedAttack" value="@{Whisper} &{template:wfrp4e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Ranged Attack Roll Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Roll Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=$[[0]]}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{range=@{Used_WeaponRange}}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
+						<span></span>
+					</button>
+				</div>
+						
+							
+			</div>
+		</div>	
+				
 		</div>			
 		</div>		
 
+							<span class="sheet-spacer-l"></span>	
 					<input type="hidden" name="attr_drop_category" accept="Category"/>	
 					<input type="hidden" name="attr_drop_name" accept="Name"/>	
 					<input type="hidden" name="attr_drop_data" accept="data"/>		
 
-
 		<div class="sheet-row">		
 
 			<img src="https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/seperator-center-full.png?raw=true">						
@@ -631,7 +824,6 @@
 
 		<span class="sheet-spacer"></span>			
 
-
 		<!-- TAB SELECT -->
 
 		<div class="sheet-tab-page">	
@@ -741,27 +933,27 @@
 				</div>						
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack2" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack2" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="3" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed2" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed2" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="3" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed3" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=1}} {{SLmod{{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed3" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=1}} {{SLmod{{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 
 					</div>		
@@ -805,19 +997,19 @@
 
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="0" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &amp&{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[(@{InitiativeStat})]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &amp&{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[(@{InitiativeStat})]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+@{InitiativeStat}&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+@{InitiativeStat}&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="2" checked="checked" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+floor((@{AgilityStat})/10)+floor((@{InitiativeStat})/10)&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+floor((@{AgilityStat})/10)+floor((@{InitiativeStat})/10)&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>				
@@ -829,11 +1021,11 @@
 
 				<input type="checkbox" name="attr_NPCUsedRanged" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged" style="margin-left: 73px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged" style="margin-left: 77px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
 				</div>		
 				<input type="checkbox" name="attr_NPCUsedRanged" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged2" style="margin-left: 73px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged2" style="margin-left: 77px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
 				</div>	
 
 	
@@ -1041,35 +1233,35 @@
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillStat}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Weapon_Skill)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillStat}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Weapon_Skill)}}"></button>
 						</div>
 						<input class="sheet-hidden" type="textarea" name="attr_Weapon_SkillB" value="[l](~@{character_name}|CriticalTest)" />
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}}  {{title=^{BALLISTIC-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{BallisticSkillStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Ballistic_Skill)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}}  {{title=^{BALLISTIC-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{BallisticSkillStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Ballistic_Skill)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}{{title=^{STRENGTH}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{StrengthStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Strength)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}{{title=^{STRENGTH}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{StrengthStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Strength)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1)*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Toughness)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1)*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Toughness)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Initiative)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Initiative)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Agility)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Agility)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{blindeded=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{DexterityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Dexterity)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{blindeded=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{DexterityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Dexterity)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{IntelligenceStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Intelligence)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{IntelligenceStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Intelligence)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{WILL-POWER}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Will_Power)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{WILL-POWER}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Will_Power)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{FellowshipStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Fellowship)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{FellowshipStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Fellowship)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 						</div>
@@ -1135,46 +1327,46 @@
 							
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="0" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCAthletics" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCAthletics)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCAthletics" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCAthletics)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="1" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCCool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{COOL}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCCool)}}"></button>
+							<button type="roll" class="sheet-roll-flex" name="roll_NPCCool" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{COOL}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCCool)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="2" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_CriticalTest" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{title=Critical Roll}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{reroll=@{NPC-rep}CriticalTest)}}">
+							<button type="roll" class="sheet-roll" name="roll_CriticalTest" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{title=Critical Roll}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{reroll=@{NPC-rep}CriticalTest)}}">
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="3" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCDodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{DODGE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reroll=@{NPC-rep}NPCDodge)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCDodge" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{DODGE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reroll=@{NPC-rep}NPCDodge)}}"></button>
 						</div>					
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="4" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCEndurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCEndurance)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCEndurance" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCEndurance)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="5" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCPerception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{PERCEPTION}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCPerception)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCPerception" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{PERCEPTION}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCPerception)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="6" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_FumbleTest" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousStat}]]}} {{title=^{FUMBLE}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}"></span>
+							<button type="roll" class="sheet-roll" name="roll_FumbleTest" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousStat}]]}} {{title=^{FUMBLE}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}"></span>
 					</button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="7" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">						
-							<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:whfrp2e} {{title=^{MINOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
+							<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:wfrp4e} {{title=^{MINOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
 					</button>
 				</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="8" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">				
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:whfrp2e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:wfrp4e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
 					</button>
 				</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="9" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:whfrp2e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:wfrp4e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll=[[1d100]]}}">
 					</button>
 				</div>		
 
@@ -1228,7 +1420,7 @@
 								<input class="sheet-center" type="number" name="attr_npc-skill" value="@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}" disabled="true" />
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_npc-skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_NPC-skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill)}}"></button>
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
 
@@ -1260,7 +1452,7 @@
 								<input class="sheet-center" type="number" name="attr_npc-skill2" value="@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}" disabled="true" />				
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_npc-skill2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname2}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} } {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill2)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_NPC-skill2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname2}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} } {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill2)}}"></button>
 							</div>
 														
 							</div>	
@@ -1378,10 +1570,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="1" selected />
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 
 						</div>
@@ -1446,10 +1638,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="2"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -1513,10 +1705,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="3"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -1573,7 +1765,7 @@
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttackRanged" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -1630,7 +1822,7 @@
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttackRanged2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -1730,13 +1922,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -1782,13 +1974,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCastDmg2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[  [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-praydamage2}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[  [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-praydamage2}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -1834,13 +2026,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -1887,13 +2079,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast2)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg2" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-spell-button-group sheet-right">
-								<button type="roll" class="sheet-roll" name="roll_SpellCastDmg2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage2}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage2}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg2)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -1941,13 +2133,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-spell-button-group sheet-right">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage3}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg3)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage3}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg3)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -1999,7 +2191,7 @@
 							</div>	
 							
 							<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
 							</div>
 						</div>
 		</div>	
@@ -2075,27 +2267,27 @@
 				</div>						
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack2" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack2" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="3" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed2" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed2" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="3" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed3" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed3" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 
 					</div>		
@@ -2139,19 +2331,19 @@
 
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="0" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &amp&{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[(@{InitiativeStat})]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &amp&{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[(@{InitiativeStat})]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+@{InitiativeStat}&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+@{InitiativeStat}&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="2" checked="checked" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+floor((@{AgilityStat})/10)+floor((@{InitiativeStat})/10)&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+floor((@{AgilityStat})/10)+floor((@{InitiativeStat})/10)&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>				
@@ -2163,11 +2355,11 @@
 
 				<input type="checkbox" name="attr_NPCUsedRanged" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged" style="margin-left: 73px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged" style="margin-left: 77px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
 				</div>		
 				<input type="checkbox" name="attr_NPCUsedRanged" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged2" style="margin-left: 73px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged2" style="margin-left: 77px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
 				</div>	
 
 	
@@ -2375,35 +2567,35 @@
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillStat}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Weapon_Skill)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillStat}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Weapon_Skill)}}"></button>
 						</div>
 						<input class="sheet-hidden" type="textarea" name="attr_Weapon_SkillB" value="[l](~@{character_name}|CriticalTest)" />
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}}  {{title=^{BALLISTIC-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{BallisticSkillStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Ballistic_Skill)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}}  {{title=^{BALLISTIC-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{BallisticSkillStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Ballistic_Skill)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}{{title=^{STRENGTH}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{StrengthStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Strength)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}{{title=^{STRENGTH}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{StrengthStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Strength)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1)*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Toughness)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1)*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Toughness)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Initiative)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Initiative)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Agility)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Agility)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{blindeded=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{DexterityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Dexterity)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{blindeded=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{DexterityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Dexterity)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{IntelligenceStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Intelligence)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{IntelligenceStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Intelligence)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{WILL-POWER}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Will_Power)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{WILL-POWER}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Will_Power)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{FellowshipStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Fellowship)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{FellowshipStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Fellowship)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 						</div>
@@ -2469,46 +2661,46 @@
 							
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="0" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCAthletics" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCAthletics)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCAthletics" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCAthletics)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="1" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCCool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{COOL}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCCool)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCCool" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{COOL}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCCool)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="2" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_CriticalTest" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{title=Critical Roll}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{reroll=@{NPC-rep}CriticalTest)}}">
+							<button type="roll" class="sheet-roll" name="roll_CriticalTest" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{title=Critical Roll}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{reroll=@{NPC-rep}CriticalTest)}}">
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="3" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCDodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{DODGE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reroll=@{NPC-rep}NPCDodge)}}"></button>
+							<button type="roll" class="sheet-roll-flex" name="roll_NPCDodge" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{DODGE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reroll=@{NPC-rep}NPCDodge)}}"></button>
 						</div>					
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="4" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCEndurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCEndurance)}}"></button>
+							<button type="roll" class="sheet-roll=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCEndurance)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="5" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCPerception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{PERCEPTION}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCPerception)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCPerception" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{PERCEPTION}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCPerception)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="6" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_FumbleTest" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousStat}]]}} {{title=^{FUMBLE}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}"></span>
+							<button type="roll" class="sheet-roll" name="roll_FumbleTest" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousStat}]]}} {{title=^{FUMBLE}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}"></span>
 					</button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="7" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">						
-							<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:whfrp2e} {{title=^{MINOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
+							<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:wfrp4e} {{title=^{MINOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
 					</button>
 				</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="8" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">				
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:whfrp2e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:wfrp4e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
 					</button>
 				</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="9" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:whfrp2e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:wfrp4e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll=[[1d100]]}}">
 					</button>
 				</div>		
 
@@ -2562,7 +2754,7 @@
 								<input class="sheet-center" type="number" name="attr_npc-skill" value="@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}" disabled="true" />
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_npc-skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_NPC-skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill)}}"></button>
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
 
@@ -2594,7 +2786,7 @@
 								<input class="sheet-center" type="number" name="attr_npc-skill2" value="@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}" disabled="true" />				
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_npc-skill2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname2}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} } {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill2)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_NPC-skill2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname2}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} } {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill2)}}"></button>
 							</div>
 														
 							</div>	
@@ -2712,10 +2904,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="1" selected />
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 
 						</div>
@@ -2780,10 +2972,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="2"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -2847,10 +3039,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="3"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -2907,7 +3099,7 @@
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttackRanged" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -2964,7 +3156,7 @@
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttackRanged2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -3064,13 +3256,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -3116,13 +3308,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCastDmg2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[  [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-praydamage2}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[  [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-praydamage2}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -3168,13 +3360,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -3221,13 +3413,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast2)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg2" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-spell-button-group sheet-right">
-								<button type="roll" class="sheet-roll" name="roll_SpellCastDmg2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage2}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage2}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg2)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -3275,13 +3467,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-spell-button-group sheet-right">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage3}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg3)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage3}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg3)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -3333,7 +3525,7 @@
 							</div>	
 							
 							<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
 							</div>
 						</div>
 		</div>	
@@ -3408,27 +3600,27 @@
 				</div>						
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack2" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack2" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="3" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed2" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed2" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="3" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed3" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed3" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 
 					</div>		
@@ -3472,19 +3664,19 @@
 
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="0" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &amp&{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[(@{InitiativeStat})]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &amp&{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[(@{InitiativeStat})]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+@{InitiativeStat}&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+@{InitiativeStat}&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="2" checked="checked" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+floor((@{AgilityStat})/10)+floor((@{InitiativeStat})/10)&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+floor((@{AgilityStat})/10)+floor((@{InitiativeStat})/10)&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>				
@@ -3496,11 +3688,11 @@
 
 				<input type="checkbox" name="attr_NPCUsedRanged" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged" style="margin-left: 73px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged" style="margin-left: 77px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
 				</div>		
 				<input type="checkbox" name="attr_NPCUsedRanged" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged2" style="margin-left: 73px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged2" style="margin-left: 77px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
 				</div>	
 
 	
@@ -3708,35 +3900,35 @@
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillStat}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Weapon_Skill)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillStat}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Weapon_Skill)}}"></button>
 						</div>
 						<input class="sheet-hidden" type="textarea" name="attr_Weapon_SkillB" value="[l](~@{character_name}|CriticalTest)" />
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}}  {{title=^{BALLISTIC-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{BallisticSkillStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Ballistic_Skill)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}}  {{title=^{BALLISTIC-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{BallisticSkillStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Ballistic_Skill)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}{{title=^{STRENGTH}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{StrengthStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Strength)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}{{title=^{STRENGTH}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{StrengthStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Strength)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1)*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Toughness)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1)*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Toughness)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Initiative)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Initiative)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Agility)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Agility)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{blindeded=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{DexterityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Dexterity)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{blindeded=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{DexterityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Dexterity)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{IntelligenceStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Intelligence)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{IntelligenceStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Intelligence)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{WILL-POWER}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Will_Power)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{WILL-POWER}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Will_Power)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{FellowshipStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Fellowship)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{FellowshipStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Fellowship)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 						</div>
@@ -3802,46 +3994,46 @@
 							
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="0" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCAthletics" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCAthletics)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCAthletics" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCAthletics)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="1" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCCool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{COOL}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCCool)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCCool" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{COOL}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCCool)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="2" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_CriticalTest" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{title=Critical Roll}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{reroll=@{NPC-rep}CriticalTest)}}">
+							<button type="roll" class="sheet-roll" name="roll_CriticalTest" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{title=Critical Roll}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{reroll=@{NPC-rep}CriticalTest)}}">
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="3" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCDodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{DODGE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reroll=@{NPC-rep}NPCDodge)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCDodge" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{DODGE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reroll=@{NPC-rep}NPCDodge)}}"></button>
 						</div>					
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="4" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCEndurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCEndurance)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCEndurance" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCEndurance)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="5" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCPerception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{PERCEPTION}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCPerception)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCPerception" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{PERCEPTION}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCPerception)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="6" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_FumbleTest" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousStat}]]}} {{title=^{FUMBLE}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}"></span>
+							<button type="roll" class="sheet-roll" name="roll_FumbleTest" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousStat}]]}} {{title=^{FUMBLE}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}"></span>
 					</button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="7" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">						
-							<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:whfrp2e} {{title=^{MINOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
+							<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:wfrp4e} {{title=^{MINOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
 					</button>
 				</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="8" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">				
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:whfrp2e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:wfrp4e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
 					</button>
 				</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="9" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:whfrp2e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:wfrp4e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll=[[1d100]]}}">
 					</button>
 				</div>		
 
@@ -3895,7 +4087,7 @@
 								<input class="sheet-center" type="number" name="attr_npc-skill" value="@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}" disabled="true" />
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_npc-skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_NPC-skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill)}}"></button>
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
 
@@ -3927,7 +4119,7 @@
 								<input class="sheet-center" type="number" name="attr_npc-skill2" value="@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}" disabled="true" />				
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_npc-skill2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname2}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} } {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill2)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_NPC-skill2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname2}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} } {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill2)}}"></button>
 							</div>
 														
 							</div>	
@@ -4045,10 +4237,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="1" selected />
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 
 						</div>
@@ -4113,10 +4305,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="2"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -4180,10 +4372,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="3"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -4240,7 +4432,7 @@
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttackRanged" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -4297,7 +4489,7 @@
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttackRanged2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -4397,13 +4589,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -4449,13 +4641,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCastDmg2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-praydamage2}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-praydamage2}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -4501,13 +4693,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -4554,13 +4746,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast2)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg2" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-spell-button-group sheet-right">
-								<button type="roll" class="sheet-roll" name="roll_SpellCastDmg2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage2}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage2}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg2)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -4608,13 +4800,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-spell-button-group sheet-right">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage3}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg3)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage3}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg3)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -4666,7 +4858,7 @@
 							</div>	
 							
 							<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
 							</div>
 						</div>
 		</div>	
@@ -4741,27 +4933,27 @@
 				</div>						
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack2" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack2" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="3" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed2" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed2" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="3" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed3" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed3" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 
 					</div>		
@@ -4805,19 +4997,19 @@
 
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="0" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &amp&{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[(@{InitiativeStat})]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &amp&{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[(@{InitiativeStat})]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+@{InitiativeStat}&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+@{InitiativeStat}&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="2" checked="checked" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+floor((@{AgilityStat})/10)+floor((@{InitiativeStat})/10)&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+floor((@{AgilityStat})/10)+floor((@{InitiativeStat})/10)&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>				
@@ -4829,11 +5021,11 @@
 
 				<input type="checkbox" name="attr_NPCUsedRanged" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged" style="margin-left: 73px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged" style="margin-left: 77px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
 				</div>		
 				<input type="checkbox" name="attr_NPCUsedRanged" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged2" style="margin-left: 73px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged2" style="margin-left: 77px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
 				</div>	
 
 	
@@ -5041,35 +5233,35 @@
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillStat}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Weapon_Skill)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillStat}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Weapon_Skill)}}"></button>
 						</div>
 						<input class="sheet-hidden" type="textarea" name="attr_Weapon_SkillB" value="[l](~@{character_name}|CriticalTest)" />
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}}  {{title=^{BALLISTIC-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{BallisticSkillStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Ballistic_Skill)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}}  {{title=^{BALLISTIC-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{BallisticSkillStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Ballistic_Skill)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}{{title=^{STRENGTH}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{StrengthStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Strength)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}{{title=^{STRENGTH}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{StrengthStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Strength)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1)*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Toughness)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1)*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Toughness)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Initiative)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Initiative)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Agility)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Agility)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{blindeded=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{DexterityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Dexterity)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{blindeded=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{DexterityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Dexterity)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{IntelligenceStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Intelligence)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{IntelligenceStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Intelligence)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{WILL-POWER}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Will_Power)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{WILL-POWER}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Will_Power)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{FellowshipStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Fellowship)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{FellowshipStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Fellowship)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 						</div>
@@ -5135,46 +5327,46 @@
 							
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="0" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCAthletics" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCAthletics)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCAthletics" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCAthletics)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="1" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCCool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{COOL}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCCool)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCCool" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{COOL}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCCool)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="2" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_CriticalTest" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{title=Critical Roll}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{reroll=@{NPC-rep}CriticalTest)}}">
+							<button type="roll" class="sheet-roll" name="roll_CriticalTest" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{title=Critical Roll}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{reroll=@{NPC-rep}CriticalTest)}}">
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="3" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCDodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{DODGE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reroll=@{NPC-rep}NPCDodge)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCDodge" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{DODGE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reroll=@{NPC-rep}NPCDodge)}}"></button>
 						</div>					
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="4" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCEndurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCEndurance)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCEndurance" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCEndurance)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="5" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCPerception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{PERCEPTION}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCPerception)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCPerception" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{PERCEPTION}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCPerception)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="6" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_FumbleTest" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousStat}]]}} {{title=^{FUMBLE}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}"></span>
+							<button type="roll" class="sheet-roll" name="roll_FumbleTest" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousStat}]]}} {{title=^{FUMBLE}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}"></span>
 					</button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="7" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">						
-							<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:whfrp2e} {{title=^{MINOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
+							<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:wfrp4e} {{title=^{MINOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
 					</button>
 				</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="8" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">				
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:whfrp2e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:wfrp4e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
 					</button>
 				</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="9" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:whfrp2e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:wfrp4e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll=[[1d100]]}}">
 					</button>
 				</div>		
 
@@ -5228,7 +5420,7 @@
 								<input class="sheet-center" type="number" name="attr_npc-skill" value="@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}" disabled="true" />
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_npc-skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_NPC-skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill)}}"></button>
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
 
@@ -5260,7 +5452,7 @@
 								<input class="sheet-center" type="number" name="attr_npc-skill2" value="@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}" disabled="true" />				
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_npc-skill2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname2}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} } {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill2)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_NPC-skill2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname2}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} } {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill2)}}"></button>
 							</div>
 														
 							</div>	
@@ -5378,10 +5570,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="1" selected />
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 
 						</div>
@@ -5446,10 +5638,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="2"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -5513,10 +5705,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="3"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttack3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll" name="roll_NPCOpposed3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -5573,7 +5765,7 @@
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttackRanged" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -5630,7 +5822,7 @@
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll" name="roll_NPCAttackRanged2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -5730,13 +5922,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -5782,13 +5974,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_PrayCastDmg2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-praydamage2}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-praydamage2}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -5834,13 +6026,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -5887,13 +6079,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast2)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg2" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-spell-button-group sheet-right">
-								<button type="roll" class="sheet-roll" name="roll_SpellCastDmg2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage2}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage2}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg2)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -5941,13 +6133,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-spell-button-group sheet-right">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage3}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg3)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage3}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg3)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -5999,7 +6191,7 @@
 							</div>	
 							
 							<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
 							</div>
 						</div>
 		</div>	
@@ -6154,7 +6346,7 @@
 									<select class="sheet-select-no-arrow-center2" name="attr_OtherXPType"  style="height: 20.5px;padding-top: 0px;">
 										<option value="0" data-i18n="FREE-CHAR-DESC" selected="selected">Free Characteristic - (deducts from XP spent)</option>
 										<option value="1" data-i18n="FREE-SKILL-DESC">Free Skill ----------- (deducts from XP spent)</option>
-										<option value="2" data-i18n="FREE-TALENT-DESC">Free Talent ---------- (deducts from XP spent)</option>
+										<option value="2" data-i18n="FREE-Talent_DESC">Free Talent ---------- (deducts from XP spent)</option>
 										<option value="3" data-i18n="FREE-OTHER-DESC">Free Other ---------- (adds to XP spent)</option>
 										<option value="4" data-i18n="CAREER-CHANGE-DESC">Career Change ------- (adds to XP spent)</option>
 										<option value="5" data-i18n="OTHER-SPENT-DESC">Other XP spent ------ (adds to XP spent)</option>
@@ -6633,39 +6825,78 @@
 					</div>
 					
 					<span class="sheet-spacer"></span>
+					
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 					<div class="sheet-row">
 						<div class="sheet-col-3-20 sheet-pad-t-xsm sheet-pad-r-sm">
 							<br />
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm sheet-pad-b-lg">
-							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{WeaponSkillMod}}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}}  {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{WeaponSkill} [CHAR] + ?{@{translation_modifier}|@{WeaponSkillMod}} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{WeaponSkillSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}Weapon_Skill)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_WeaponSkill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{WeaponSkillMod}}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}}  {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{WeaponSkill} [CHAR] + ?{@{translation_modifier}|@{WeaponSkillMod}} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{WeaponSkillSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}Weapon_Skill)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{BallisticSkillMod}}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} { {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{BALLISTIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{BallisticSkill} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{BallisticSkillSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}Ballistic_Skill)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_BallisticSkill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{BallisticSkillMod}}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} { {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{BALLISTIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{BallisticSkill} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{BallisticSkillSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}Ballistic_Skill)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{StrengthMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{STRENGTH}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Strength} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{StrengthSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Strength)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{StrengthMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{STRENGTH}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Strength} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{StrengthSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Strength)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{ToughnessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Toughness} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{ToughnessSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Toughness)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{ToughnessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Toughness} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{ToughnessSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Toughness)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{InitiativeMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + @{Initiative} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{InitiativeSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Initiative)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{InitiativeMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + @{Initiative} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{InitiativeSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Initiative)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{AgilityMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_move}*-1]] [COND] + @{Agility} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{AgilitySL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Agility)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{AgilityMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_move}*-1]] [COND] + @{Agility} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{AgilitySL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Agility)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{DexterityMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_move}*-1]] [COND] + @{Dexterity} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{DexteritySL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Dexterity)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{DexterityMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_move}*-1]] [COND] + @{Dexterity} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{DexteritySL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Dexterity)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{IntelligenceMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Intelligence} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{IntelligenceSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Intelligence)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{IntelligenceMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Intelligence} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{IntelligenceSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Intelligence)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{WillpowerMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{WILL-POWER}}}{{character_name=@{character_name}}}  {{target=[[ [[@{condgen}*-1]] [COND] + @{WillPower} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{WillPowerSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Will_Power)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_WillPower" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{WillpowerMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{WILL-POWER}}}{{character_name=@{character_name}}}  {{target=[[ [[@{condgen}*-1]] [COND] + @{WillPower} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{WillPowerSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Will_Power)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{FellowshipMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen}*-1)]] [COND] + @{Fellowship} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{FellowshipSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Fellowship)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{FellowshipMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen}*-1)]] [COND] + @{Fellowship} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{FellowshipSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Fellowship)}}"></button>
+						</div>
+					</div>					
+					
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+					<div class="sheet-row">
+						<div class="sheet-col-3-20 sheet-pad-t-xsm sheet-pad-r-sm">
+							<br />
+						</div>
+						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm sheet-pad-b-lg">
+							<button type="action" class="sheet-roll" name="act_WeaponSkill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{WeaponSkillMod}}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}}  {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{WeaponSkill} [CHAR] + ?{@{translation_modifier}|@{WeaponSkillMod}} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{WeaponSkillSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}WeaponSkill)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}" style="font-family: dicefontd20;">t</button>
+						</div>
+						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
+							<button type="action" class="sheet-roll" name="act_BallisticSkill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{BallisticSkillMod}}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} { {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{BALLISTIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{BallisticSkill} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{BallisticSkillSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}BallisticSkill)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}" style="font-family: dicefontd20;">t</button>
+						</div>
+						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
+							<button type="action" class="sheet-roll" name="act_Strength" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{StrengthMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{STRENGTH}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Strength} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{StrengthSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Strength)}}" style="font-family: dicefontd20;">t</button>
+						</div>
+						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
+							<button type="action" class="sheet-roll" name="act_Toughness" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{ToughnessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Toughness} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{ToughnessSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Toughness)}}" style="font-family: dicefontd20;">t</button>
+						</div>
+						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
+							<button type="action" class="sheet-roll" name="act_Initiative" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{InitiativeMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + @{Initiative} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{InitiativeSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Initiative)}}" style="font-family: dicefontd20;">t</button>
+						</div>
+						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
+							<button type="action" class="sheet-roll" name="act_Agility" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{AgilityMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_move}*-1]] [COND] + @{Agility} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{AgilitySL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Agility)}}" style="font-family: dicefontd20;">t</button>
+						</div>
+						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
+							<button type="action" class="sheet-roll" name="act_Dexterity" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{DexterityMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_move}*-1]] [COND] + @{Dexterity} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{DexteritySL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Dexterity)}}" style="font-family: dicefontd20;">t</button>
+						</div>
+						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
+							<button type="action" class="sheet-roll" name="act_Intelligence" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{IntelligenceMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Intelligence} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{IntelligenceSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Intelligence)}}" style="font-family: dicefontd20;">t</button>
+						</div>
+						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
+							<button type="action" class="sheet-roll" name="act_willpower" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{WillpowerMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{WILL-POWER}}}{{character_name=@{character_name}}}  {{target=[[ [[@{condgen}*-1]] [COND] + @{WillPower} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{WillPowerSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}WillPower)}}" style="font-family: dicefontd20;">t</button>
+						</div>
+						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
+							<button type="action" class="sheet-roll" name="act_Fellowship" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{FellowshipMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen}*-1)]] [COND] + @{Fellowship} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{FellowshipSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Fellowship)}}" style="font-family: dicefontd20;">t</button>
 						</div>
 					</div>
 
@@ -6807,7 +7038,7 @@
 							<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-pad-t-lg sheet-mar-l-md">
 								<span  style="font-size: 14px" data-i18n="MOVEMENTCAP">MOVEMENT</span>
 								<div class="sheet-col-1-13 sheet-center"style="float: right; margin-right: 35px;">
-									<button type="roll" class="sheet-combat-actions-rep" style="width:42px" name="roll_Sprint" value="@{Whisper} &amp;{template:whfrp2e} {{modvalue=[[20]]}} {{sprinting=true}} {{cond=[[@{condgen_see_move}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{title=^{ATHLETICS}}} {{skill=^{SPRINT-ROLL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{Athletics} [SKILL] + 20 [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{movement=[[@{Run}*2)]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}"><span data-i18n="SPRINT">Sprint</span></button>
+									<button type="roll" class="sheet-combat-actions-rep" style="width:42px" name="roll_Sprint" value="@{Whisper} &amp;{template:wfrp4e} {{modvalue=[[20]]}} {{sprinting=true}} {{cond=[[@{condgen_see_move}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{title=^{ATHLETICS}}} {{skill=^{SPRINT-ROLL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{Athletics} [SKILL] + 20 [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{movement=[[@{Run}*2)]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}"><span data-i18n="SPRINT">Sprint</span></button>
 								</div>					
 							</div>	
 							<img src="https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/seperator-center.png?raw=true">	
@@ -6853,10 +7084,10 @@
 							<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-pad-t-lg sheet-mar-l-md">
 								<span  style="font-size: 14px" data-i18n="CORRUPTION-&-SINCAP">CORRUPTION & SIN </span>
 								<div class="sheet-col-1-13 sheet-center"style="float: right; margin-right: 35px;">
-									<button type="roll" class="sheet-combat-actions-rep" style="width:42px" name="roll_Wrath" value="@{Whisper} &{template:whfrp2e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll= [[[[1d100]] [ROLL] + (@{Sin}*10) [SIN] ]]}}"><span data-i18n="WRATH">Wrath</span></button>
+									<button type="roll" class="sheet-combat-actions-rep" style="width:42px" name="roll_Wrath" value="@{Whisper} &{template:wfrp4e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll= [[[[1d100]] [ROLL] + (@{Sin}*10) [SIN] ]]}}"><span data-i18n="WRATH">Wrath</span></button>
 								</div>	
 								<div class="sheet-col-1-13 sheet-center" style="float: right; margin-right: 30px;">
-									<button type="roll" class="sheet-combat-actions-rep" style="width:55px" name="roll_Mutations" value="@{Whisper} &{template:whfrp2e} {{mutation=[[?{Choose a Mutation Type|Physical Mutation, 0|Mental Mutation, 1|Fixation, 2}]]}} {{chaos=[[?{Choose a Chaos God|Any Power, 0|Khorne, 1|Nurgle, 2|Slaanesh, 3|Tzeentch, 4}]]}} {{character_name=@{character_name}}} {{mutationroll=[[1d100]]}} {{mutationroll2=[[1d100]]}} {{mutationroll3=[[2d10]]}}"><span data-i18n="MUTATION">Mutation</span></button>
+									<button type="roll" class="sheet-combat-actions-rep" style="width:55px" name="roll_Mutations" value="@{Whisper} &{template:wfrp4e} {{mutation=[[?{Choose a Mutation Type|Physical Mutation, 0|Mental Mutation, 1|Fixation, 2}]]}} {{chaos=[[?{Choose a Chaos God|Any Power, 0|Khorne, 1|Nurgle, 2|Slaanesh, 3|Tzeentch, 4}]]}} {{character_name=@{character_name}}} {{mutationroll=[[1d100]]}} {{mutationroll2=[[1d100]]}} {{mutationroll3=[[2d10]]}}"><span data-i18n="MUTATION">Mutation</span></button>
 								</div>	
 							</div>	
 							<img src="https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/seperator-center.png?raw=true">	
@@ -7004,8 +7235,13 @@
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 								<input class="sheet-center" type="number" name="attr_Art" value="@{ArtChar}+@{ArtAdv}+@{ArtMisc}+(@{condgen_see}*-1)" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_Art" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ART}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{ArtChar}+@{ArtAdv}+@{ArtMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Art_modtype1}]]}} {{mod1=@{Art_mod1}}} {{mod2type=[[@{Art_modtype2}]]}} {{mod2=@{Art_mod2}}} {{mod3type=[[@{Art_modtype3}]]}} {{mod3=@{Art_mod3}}} {{reroll=@{RT-reroll}Art)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_Art" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ART}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{ArtChar}+@{ArtAdv}+@{ArtMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Art_modtype1}]]}} {{mod1=@{Art_mod1}}} {{mod2type=[[@{Art_modtype2}]]}} {{mod2=@{Art_mod2}}} {{mod3type=[[@{Art_modtype3}]]}} {{mod3=@{Art_mod3}}} {{reroll=@{RT-reroll}Art)}}"></button>
+							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Art"style="font-family: dicefontd20;">t</button>
 							</div>
 							
 							
@@ -7066,6 +7302,8 @@
            </div>					
 		</div>
 	</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
+		<div>
 						<fieldset class="repeating_artspecializationr">
 							<div class="sheet-row">
 								<div class="sheet-col-1-10 sheet-center sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -7091,7 +7329,7 @@
 								<input class="sheet-hidden" type="textarea" name="attr_Skill_rep_ID" />
 									<input class="sheet-hidden" type="number" name="attr_ArtSpecializationXP" value="0" readonly />
 									<input class="sheet-hidden" type="textarea" name="attr_ArtSpecializationDis" value="0" readonly />
-								<input class="sheet-hidden" type="textarea" name="attr_RT-rep" value="[1](~@{character_name}|repeating_ArtSpecializationr_@{Skill_rep_ID}_" />
+								<input class="sheet-hidden" type="textarea" name="attr_RT-rep" value="[1](~@{character_name}|repeating_artspecializationr_@{repeating_artspecializationr_-MiSdjAPU9AcZUFzLWOV_Skill_rep_ID}_" />
 								<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 									<input class="sheet-center" type="number" name="attr_ArtSpecializationAdv" value="0" min="0" />
 								</div>
@@ -7100,9 +7338,9 @@
 								</div>
 								<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 									<input class="sheet-center" type="number" name="attr_ArtSpecialization" value="@{ArtSpecializationChar}+@{ArtSpecializationAdv}+@{ArtSpecializationMisc}+(@{condgen_see}*-1)" disabled="true" />
-								</div>
-								<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle sheet-left">
-									<button type="roll" class="sheet-roll" name="roll_ArtSpecialization" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{ArtSpecializationName}}} {{skill=^{ART}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{ArtSpecializationChar}+@{ArtSpecializationAdv}+@{ArtSpecializationMisc}]] [SKILL] +?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Art_cust_modtype1}]]}} {{mod1=@{Art_cust_mod1}}} {{mod2type=[[@{Art_cust_modtype2}]]}} {{mod2=@{Art_cust_mod2}}} {{mod3type=[[@{Art_cust_modtype3}]]}} {{mod3=@{Art_cust_mod3}}} {{reroll=@{RT-rep}ArtSpecialization)}}"></button>
+								</div>	
+								<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+									<button type="roll" class="sheet-roll" name="roll_ArtSpecialization" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{ArtSpecializationName}}} {{skill=^{ART}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{ArtSpecializationChar}+@{ArtSpecializationAdv}+@{ArtSpecializationMisc}]] [SKILL] +?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Art_cust_modtype1}]]}} {{mod1=@{Art_cust_mod1}}} {{mod2type=[[@{Art_cust_modtype2}]]}} {{mod2=@{Art_cust_mod2}}} {{mod3type=[[@{Art_cust_modtype3}]]}} {{mod3=@{Art_cust_mod3}}} {{reroll=@{RT-rep}ArtSpecialization)}}"></button>
 								</div>
 								
 							
@@ -7164,8 +7402,117 @@
 		</div>								
 								
 								
+							</div>							
+						</fieldset>	
+	
+		</div>
+	
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+		<div>
+						<fieldset class="repeating_artspecializationr">
+							<div class="sheet-row">
+								<div class="sheet-col-1-10 sheet-center sheet-center sheet-pad-r-sm sheet-vert-middle">
+									<input type="checkbox" name="attr_ArtSpecializationCareer" value="1" />
+								</div>
+								<div class="sheet-col-4-10 sheet-pad-r-sm sheet-vert-middle">
+									<input class="sheet-center" type="text" name="attr_ArtSpecializationName" />
+								</div>
+								<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+									<select class="sheet-select-no-arrow-center" name="attr_ArtSpecializationChar">
+										<option value="(@{WeaponSkill}+@{WeaponSkillMod})" data-i18n="ABBREVIATE-WEAPON-SKILL">WS</option>
+										<option value="(@{BallisticSkill}+@{BallisticSkillMod})" data-i18n="ABBREVIATE-BALLISTIC-SKILL">BS</option>
+										<option value="(@{Strength}+@{StrengthMod})" data-i18n="ABBREVIATE-STRENGTH">S</option>
+										<option value="(@{Toughness}+@{ToughnessMod})" data-i18n="ABBREVIATE-TOUGHNESS">T</option>
+										<option value="(@{Initiative}+@{InitiativeMod})" data-i18n="ABBREVIATE-INITIATIVE">I</option>
+										<option value="(@{Agility}+@{AgilityMod})" data-i18n="ABBREVIATE-AGILITY">Ag</option>
+										<option value="(@{Dexterity}+@{DexterityMod})" data-i18n="ABBREVIATE-DEXTERITY" selected="selected">Dex</option>
+										<option value="(@{Intelligence}+@{IntelligenceMod})" data-i18n="ABBREVIATE-INTELLIGENCE">Int</option>
+										<option value="(@{WillPower}+@{WillPowerMod})" data-i18n="ABBREVIATE-WILL-POWER">Wp</option>
+										<option value="(@{Fellowship}+@{FellowshipMod})" data-i18n="ABBREVIATE-FELLOWSHIP">Fel</option>
+									</select>
+								</div>
+								<input class="sheet-hidden" type="textarea" name="attr_Skill_rep_ID" />
+									<input class="sheet-hidden" type="number" name="attr_ArtSpecializationXP" value="0" readonly />
+									<input class="sheet-hidden" type="textarea" name="attr_ArtSpecializationDis" value="0" readonly />
+								<input class="sheet-hidden" type="textarea" name="attr_RT-rep" value="[1](~@{character_name}|repeating_artspecializationr_@{repeating_artspecializationr_-MiSdjAPU9AcZUFzLWOV_Skill_rep_ID}_" />
+								<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+									<input class="sheet-center" type="number" name="attr_ArtSpecializationAdv" value="0" min="0" />
+								</div>
+								<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+									<input class="sheet-center" type="number" name="attr_ArtSpecializationMisc" value="0" />
+								</div>
+								<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+									<input class="sheet-center" type="number" name="attr_ArtSpecialization" value="@{ArtSpecializationChar}+@{ArtSpecializationAdv}+@{ArtSpecializationMisc}+(@{condgen_see}*-1)" disabled="true" />
+								</div>	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_artspecialization"style="font-family: dicefontd20;">t</button>
+							</div>
+								
+							
+              <label class="sheet-col-1-14 talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_Art_cust_settings_hide" value="0"/>		
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_Art_cust_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_Art_cust_settings_hide" class="sheet-hidden sheet-hider" value="1" />
+				
+				
+			<div class="Art_cust_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Art_Custom_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Art_Custom_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Art_Custom_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Art_Custom_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Art_Custom_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Art_Custom_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>								
+							<span class="sheet-spacer"></span>	
+           </div>				
+		</div>								
+								
+								
 							</div>							
 						</fieldset>
+	
+		</div>
+						
+						
 					</div>
 					<div class="sheet-row" style="padding-left: 12px; padding-right: 12px;">
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -7197,10 +7544,17 @@
 						</div>
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Athletics" value="@{AthleticsChar}+@{AthleticsAdv}+@{AthleticsMisc}+(@{condgen_see_move}*-1)" disabled="true" />
-						</div>
-						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Athletics" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{AthleticsChar}+@{AthleticsAdv}+@{AthleticsMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}Athletics)}}"></button>
-						</div>
+						</div>			
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+							<button type="roll" class="sheet-roll" name="roll_Athletics" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{AthleticsChar}+@{AthleticsAdv}+@{AthleticsMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}Athletics)}}"></button>
+							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Athletics" style="font-family: dicefontd20;">t</button>
+							</div>
+						
+						
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Athletics_settings_hide" value="0"/>		
@@ -7292,9 +7646,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Bribery" value="@{BriberyChar}+@{BriberyAdv}+@{BriberyMisc}+(@{condgen}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Bribery" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{BRIBERY}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{BriberyChar}+@{BriberyAdv}+@{BriberyMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Bribery_modtype1}]]}} {{mod1=@{Bribery_mod1}}} {{mod2type=[[@{Bribery_modtype2}]]}} {{mod2=@{Bribery_mod2}}} {{mod3type=[[@{Bribery_modtype3}]]}} {{mod3=@{Bribery_mod3}}} {{reroll=@{RT-reroll}Bribery)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Bribery" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{BRIBERY}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{BriberyChar}+@{BriberyAdv}+@{BriberyMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Bribery_modtype1}]]}} {{mod1=@{Bribery_mod1}}} {{mod2type=[[@{Bribery_modtype2}]]}} {{mod2=@{Bribery_mod2}}} {{mod3type=[[@{Bribery_modtype3}]]}} {{mod3=@{Bribery_mod3}}} {{reroll=@{RT-reroll}Bribery)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Bribery" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Bribery_settings_hide" value="0"/>		
@@ -7386,9 +7745,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Charm" value="@{CharmChar}+@{CharmAdv}+@{CharmMisc}+(@{condgen}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Charm" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{CHARM}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CharmChar}+@{CharmAdv}+@{CharmMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{charstatus=@{status}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Charm_modtype1}]]}} {{mod1=@{Charm_mod1}}} {{mod2type=[[@{Charm_modtype2}]]}} {{mod2=@{Charm_mod2}}} {{mod3type=[[@{Charm_modtype3}]]}} {{mod3=@{Charm_mod3}}} {{reroll=@{RT-reroll}Charm)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Charm" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{CHARM}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CharmChar}+@{CharmAdv}+@{CharmMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{charstatus=@{status}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Charm_modtype1}]]}} {{mod1=@{Charm_mod1}}} {{mod2type=[[@{Charm_modtype2}]]}} {{mod2=@{Charm_mod2}}} {{mod3type=[[@{Charm_modtype3}]]}} {{mod3=@{Charm_mod3}}} {{reroll=@{RT-reroll}Charm)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Charm" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Charm_settings_hide" value="0"/>		
@@ -7480,9 +7844,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_CharmAnimal" value="@{CharmAnimalChar}+@{CharmAnimalAdv}+@{CharmAnimalMisc}+(@{condgen}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_CharmAnimal" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{CHARM-ANIMAL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CharmAnimalChar}+@{CharmAnimalAdv}+@{CharmAnimalMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{CharmAnimal_modtype1}]]}} {{mod1=@{CharmAnimal_mod1}}} {{mod2type=[[@{CharmAnimal_modtype2}]]}} {{mod2=@{CharmAnimal_mod2}}} {{mod3type=[[@{CharmAnimal_modtype3}]]}} {{mod3=@{CharmAnimal_mod3}}} {{reroll=@{RT-reroll}CharmAnimal)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_CharmAnimal" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{CHARM-ANIMAL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CharmAnimalChar}+@{CharmAnimalAdv}+@{CharmAnimalMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{CharmAnimal_modtype1}]]}} {{mod1=@{CharmAnimal_mod1}}} {{mod2type=[[@{CharmAnimal_modtype2}]]}} {{mod2=@{CharmAnimal_mod2}}} {{mod3type=[[@{CharmAnimal_modtype3}]]}} {{mod3=@{CharmAnimal_mod3}}} {{reroll=@{RT-reroll}CharmAnimal)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_CharmAnimal" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_CharmAnimal_settings_hide" value="0"/>		
@@ -7572,9 +7941,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Climb" value="@{ClimbChar}+@{ClimbAdv}+@{ClimbMisc}+(@{condgen_see_move}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Climb" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{CLIMB}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ClimbChar}+@{ClimbAdv}+@{ClimbMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Climb_modtype1}]]}} {{mod1=@{Climb_mod1}}} {{mod2type=[[@{Climb_modtype2}]]}} {{mod2=@{Climb_mod2}}} {{mod3type=[[@{Climb_modtype3}]]}} {{mod3=@{Climb_mod3}}} {{reroll=@{RT-reroll}Climb)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Climb" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{CLIMB}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ClimbChar}+@{ClimbAdv}+@{ClimbMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Climb_modtype1}]]}} {{mod1=@{Climb_mod1}}} {{mod2type=[[@{Climb_modtype2}]]}} {{mod2=@{Climb_mod2}}} {{mod3type=[[@{Climb_modtype3}]]}} {{mod3=@{Climb_mod3}}} {{reroll=@{RT-reroll}Climb)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Climb" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Climb_settings_hide" value="0"/>		
@@ -7664,9 +8038,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_ConsumeAlcohol" value="@{ConsumeAlcoholChar}+@{ConsumeAlcoholAdv}+@{ConsumeAlcoholMisc}+(@{condgen}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_ConsumeAlcohol" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{CONSUME-ALCOHOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{ConsumeAlcoholChar}+@{ConsumeAlcoholAdv}+@{ConsumeAlcoholMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{ConsumeAlcohol_modtype1}]]}} {{mod1=@{ConsumeAlcohol_mod1}}} {{mod2type=[[@{ConsumeAlcohol_modtype2}]]}} {{mod2=@{ConsumeAlcohol_mod2}}} {{mod3type=[[@{ConsumeAlcohol_modtype3}]]}} {{mod3=@{ConsumeAlcohol_mod3}}} {{reroll=@{RT-reroll}ConsumeAlcohol)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_ConsumeAlcohol" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{CONSUME-ALCOHOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{ConsumeAlcoholChar}+@{ConsumeAlcoholAdv}+@{ConsumeAlcoholMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{ConsumeAlcohol_modtype1}]]}} {{mod1=@{ConsumeAlcohol_mod1}}} {{mod2type=[[@{ConsumeAlcohol_modtype2}]]}} {{mod2=@{ConsumeAlcohol_mod2}}} {{mod3type=[[@{ConsumeAlcohol_modtype3}]]}} {{mod3=@{ConsumeAlcohol_mod3}}} {{reroll=@{RT-reroll}ConsumeAlcohol)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_ConsumeAlcohol" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_ConsumeAlcohol_settings_hide" value="0"/>		
@@ -7730,7 +8109,7 @@
 							<input type="checkbox" name="attr_CoolCareer" value="1" />
 						</div>
 						<div class="sheet-col-4-10 sheet-pad-r-sm sheet-vert-middle">
-							<span data-i18n="COOL">Cool</span>
+							<span data-i18n="COOL">Cool</span><span  data-i18n-title="SKILLADV" title="Modified by Advantage" style="margin-left: 5px; font-family: pictos; color: gold; font-size: 10px; padding-bottom: 2px; vertical-align: top">S</span>
 						</div>
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<select class="sheet-select-no-arrow-center" name="attr_CoolChar">
@@ -7754,11 +8133,16 @@
 							<input class="sheet-center" type="number" name="attr_CoolMisc" value="0" />
 						</div>
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<input class="sheet-center" type="number" name="attr_Cool" value="@{CoolChar}+@{CoolAdv}+@{CoolMisc}+(@{Advantage}*10)+(@{condgen}*-1)" disabled="true" data-i18n-title="SKILLADV" title="Modified by Advantage"  />
+							<input class="sheet-center" type="number" name="attr_Cool" value="@{CoolChar}+@{CoolAdv}+@{CoolMisc}+(@{Advantage}*10)+(@{condgen}*-1)" disabled="true"  />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Cool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{COOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CoolChar}+@{CoolAdv}+@{CoolMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Cool_modtype1}]]}} {{mod1=@{Cool_mod1}}} {{mod2type=[[@{Cool_modtype2}]]}} {{mod2=@{Cool_mod2}}} {{mod3type=[[@{Cool_modtype3}]]}} {{mod3=@{Cool_mod3}}} {{reroll=@{RT-reroll}Cool)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Cool" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{COOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CoolChar}+@{CoolAdv}+@{CoolMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Cool_modtype1}]]}} {{mod1=@{Cool_mod1}}} {{mod2type=[[@{Cool_modtype2}]]}} {{mod2=@{Cool_mod2}}} {{mod3type=[[@{Cool_modtype3}]]}} {{mod3=@{Cool_mod3}}} {{reroll=@{RT-reroll}Cool)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Cool" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Cool_settings_hide" value="0"/>		
@@ -7822,7 +8206,7 @@
 							<input type="checkbox" name="attr_DodgeCareer" value="1" />
 						</div>
 						<div class="sheet-col-4-10 sheet-pad-r-sm sheet-vert-middle">
-							<span data-i18n="DODGE">Dodge</span>
+							<span data-i18n="DODGE">Dodge</span><span  data-i18n-title="SKILLADV" title="Modified by Advantage" style="margin-left: 5px; font-family: pictos; color: gold; font-size: 10px; padding-bottom: 2px; vertical-align: top">S</span>
 						</div>
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<select class="sheet-select-no-arrow-center" name="attr_DodgeChar">
@@ -7846,11 +8230,16 @@
 							<input class="sheet-center" type="number" name="attr_DodgeMisc" value="0" />
 						</div>
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<input class="sheet-center" type="number" name="attr_Dodge" value="@{DodgeChar}+@{DodgeAdv}+@{DodgeMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1)" disabled="true" data-i18n-title="SKILLADV" title="Modified by Advantage" />
+							<input class="sheet-center" type="number" name="attr_Dodge" value="@{DodgeChar}+@{DodgeAdv}+@{DodgeMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Dodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{DODGE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{DodgeChar}+@{DodgeAdv}+@{DodgeMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{qualities=@{armorQuality}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Dodge_modtype1}]]}} {{mod1=@{Dodge_mod1}}} {{mod2type=[[@{Dodge_modtype2}]]}} {{mod2=@{Dodge_mod2}}} {{mod3type=[[@{Dodge_modtype3}]]}} {{mod3=@{Dodge_mod3}}} {{reroll=@{RT-reroll}Dodge)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Dodge" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{DODGE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{DodgeChar}+@{DodgeAdv}+@{DodgeMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{qualities=@{armorQuality}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Dodge_modtype1}]]}} {{mod1=@{Dodge_mod1}}} {{mod2type=[[@{Dodge_modtype2}]]}} {{mod2=@{Dodge_mod2}}} {{mod3type=[[@{Dodge_modtype3}]]}} {{mod3=@{Dodge_mod3}}} {{reroll=@{RT-reroll}Dodge)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Dodge" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Dodge_settings_hide" value="0"/>		
@@ -7940,9 +8329,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Drive" value="@{DriveChar}+@{DriveAdv}+@{DriveMisc}+(@{condgen_see_move}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Drive" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{DRIVE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{DriveChar}+@{DriveAdv}+@{DriveMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Drive_modtype1}]]}} {{mod1=@{Drive_mod1}}} {{mod2type=[[@{Drive_modtype2}]]}} {{mod2=@{Drive_mod2}}} {{mod3type=[[@{Drive_modtype3}]]}} {{mod3=@{Drive_mod3}}} {{reroll=@{RT-reroll}Drive)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Drive" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{DRIVE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{DriveChar}+@{DriveAdv}+@{DriveMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Drive_modtype1}]]}} {{mod1=@{Drive_mod1}}} {{mod2type=[[@{Drive_modtype2}]]}} {{mod2=@{Drive_mod2}}} {{mod3type=[[@{Drive_modtype3}]]}} {{mod3=@{Drive_mod3}}} {{reroll=@{RT-reroll}Drive)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Drive" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Drive_settings_hide" value="0"/>		
@@ -8032,9 +8426,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Endurance" value="@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}+(@{condgen}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Endurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[0]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}  {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}} {{reroll=@{RT-reroll}Endurance)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Endurance" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[0]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}  {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}} {{reroll=@{RT-reroll}Endurance)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Endurance" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Endurance_settings_hide" value="0"/>		
@@ -8123,9 +8522,14 @@
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 								<input class="sheet-center" type="number" name="attr_Entertain" value="@{EntertainChar}+@{EntertainAdv}+@{EntertainMisc}+(@{condgen}*-1)" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_Entertain" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENTERTAIN}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EntertainChar}+@{EntertainAdv}+@{EntertainMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Entertain_modtype1}]]}} {{mod1=@{Entertain_mod1}}} {{mod2type=[[@{Entertain_modtype2}]]}} {{mod2=@{Entertain_mod2}}} {{mod3type=[[@{Entertain_modtype3}]]}} {{mod3=@{Entertain_mod3}}} {{reroll=@{RT-reroll}Entertain)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_Entertain" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENTERTAIN}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EntertainChar}+@{EntertainAdv}+@{EntertainMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Entertain_modtype1}]]}} {{mod1=@{Entertain_mod1}}} {{mod2type=[[@{Entertain_modtype2}]]}} {{mod2=@{Entertain_mod2}}} {{mod3type=[[@{Entertain_modtype3}]]}} {{mod3=@{Entertain_mod3}}} {{reroll=@{RT-reroll}Entertain)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Entertain" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Entertain_settings_hide" value="0"/>		
@@ -8184,6 +8588,8 @@
            </div>				
 		</div>				
 					</div>	
+					
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-row">
 							<fieldset class="repeating_entertainspecialization">
 								<div class="sheet-row">
@@ -8221,9 +8627,111 @@
 										<input class="sheet-center" type="number" name="attr_EntertainSpecialization" value="@{EntertainSpecializationChar}+@{EntertainSpecializationAdv}+@{EntertainSpecializationMisc}+(@{condgen}*-1)" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_EntertainSpecialization" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{EntertainSpecializationName}}} {{skill=^{ENTERTAIN}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EntertainSpecializationChar}+@{EntertainSpecializationAdv}+@{EntertainSpecializationMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Entertain_Custom_modtype1}]]}} {{mod1=@{Entertain_Custom_mod1}}} {{mod2type=[[@{Entertain_Custom_modtype2}]]}} {{mod2=@{Entertain_Custom_mod2}}} {{mod3type=[[@{Entertain_Custom_modtype3}]]}} {{mod3=@{Entertain_Custom_mod3}}} {{reroll=@{RT-rep}EntertainSpecialization)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_EntertainSpecialization" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{EntertainSpecializationName}}} {{skill=^{ENTERTAIN}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EntertainSpecializationChar}+@{EntertainSpecializationAdv}+@{EntertainSpecializationMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Entertain_Custom_modtype1}]]}} {{mod1=@{Entertain_Custom_mod1}}} {{mod2type=[[@{Entertain_Custom_modtype2}]]}} {{mod2=@{Entertain_Custom_mod2}}} {{mod3type=[[@{Entertain_Custom_modtype3}]]}} {{mod3=@{Entertain_Custom_mod3}}} {{reroll=@{RT-rep}EntertainSpecialization)}}"></button>
+									</div>
+						
+              <label class="sheet-col-1-14 talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_Entertain_Custom_settings_hide" value="0"/>		
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_Entertain_Custom_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_Entertain_Custom_settings_hide" class="sheet-hidden sheet-hider" value="1" />
+				
+				
+			<div class="Art_cust_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Entertain_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Entertain_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Entertain_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Entertain_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Entertain_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Entertain_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>								
+							<span class="sheet-spacer"></span>	
+           </div>				
+		</div>				
+					</div>	
+							</fieldset>
 						</div>
 						
+
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-row">
+							<fieldset class="repeating_entertainspecialization">
+								<div class="sheet-row">
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input type="checkbox" name="attr_EntertainSpecializationCareer" value="1" />
+									</div>
+									<div class="sheet-col-4-10 sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="text" name="attr_EntertainSpecializationName" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<select class="sheet-select-no-arrow-center" name="attr_EntertainSpecializationChar">
+											<option value="(@{WeaponSkill}+@{WeaponSkillMod})" data-i18n="ABBREVIATE-WEAPON-SKILL">WS</option>
+											<option value="(@{BallisticSkill}+@{BallisticSkillMod})" data-i18n="ABBREVIATE-BALLISTIC-SKILL">BS</option>
+											<option value="(@{Strength}+@{StrengthMod})" data-i18n="ABBREVIATE-STRENGTH">S</option>
+											<option value="(@{Toughness}+@{ToughnessMod})" data-i18n="ABBREVIATE-TOUGHNESS">T</option>
+											<option value="(@{Initiative}+@{InitiativeMod})" data-i18n="ABBREVIATE-INITIATIVE">I</option>
+											<option value="(@{Agility}+@{AgilityMod})" data-i18n="ABBREVIATE-AGILITY">Ag</option>
+											<option value="(@{Dexterity}+@{DexterityMod})" data-i18n="ABBREVIATE-DEXTERITY">Dex</option>
+											<option value="(@{Intelligence}+@{IntelligenceMod})" data-i18n="ABBREVIATE-INTELLIGENCE">Int</option>
+											<option value="(@{WillPower}+@{WillPowerMod})" data-i18n="ABBREVIATE-WILL-POWER">Wp</option>
+											<option value="(@{Fellowship}+@{FellowshipMod})" data-i18n="ABBREVIATE-FELLOWSHIP" selected="selected">Fel</option>
+										</select>
+									</div>
+									<input class="sheet-hidden" type="textarea" name="attr_Skill_rep_ID" />
+										<input class="sheet-hidden" type="number" name="attr_EntertainSpecializationXP" value="0" readonly />
+										<input class="sheet-hidden" type="textarea" name="attr_EntertainSpecializationDis" value="0" readonly />
+									<input class="sheet-hidden" type="textarea" name="attr_RT-rep" value="[1](~@{character_name}|repeating_EntertainSpecialization_@{Skill_rep_ID}_" />
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_EntertainSpecializationAdv" value="0" min="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_EntertainSpecializationMisc" value="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_EntertainSpecialization" value="@{EntertainSpecializationChar}+@{EntertainSpecializationAdv}+@{EntertainSpecializationMisc}+(@{condgen}*-1)" disabled="true" />
+									</div>
+									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<button type="action" class="sheet-roll" name="act_entertainspecialization" style="font-family: dicefontd20;">t</button>
+						</div>	
+						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Entertain_Custom_settings_hide" value="0"/>		
 		<input class="talsetshow-check__hide" type="checkbox" name="attr_Entertain_Custom_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
@@ -8282,7 +8790,8 @@
 		</div>				
 					</div>	
 							</fieldset>
-						</div>
+						</div>						
+
 					</div>
 					<div class="sheet-row" style="padding-left: 12px; padding-right: 12px;">
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -8315,9 +8824,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Gamble" value="@{GambleChar}+@{GambleAdv}+@{GambleMisc}+(@{condgen}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Gamble" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{GAMBLE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{GambleChar}+@{GambleAdv}+@{GambleMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Gamble_modtype1}]]}} {{mod1=@{Gamble_mod1}}} {{mod2type=[[@{Gamble_modtype2}]]}} {{mod2=@{Gamble_mod2}}} {{mod3type=[[@{Gamble_modtype3}]]}} {{mod3=@{Gamble_mod3}}} {{reroll=@{RT-reroll}Gamble)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Gamble" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{GAMBLE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{GambleChar}+@{GambleAdv}+@{GambleMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Gamble_modtype1}]]}} {{mod1=@{Gamble_mod1}}} {{mod2type=[[@{Gamble_modtype2}]]}} {{mod2=@{Gamble_mod2}}} {{mod3type=[[@{Gamble_modtype3}]]}} {{mod3=@{Gamble_mod3}}} {{reroll=@{RT-reroll}Gamble)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Gamble" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Gamble_settings_hide" value="0"/>		
@@ -8407,9 +8921,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Gossip" value="@{GossipChar}+@{GossipAdv}+@{GossipMisc}+(@{condgen}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Gossip" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{GOSSIP}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{GossipChar}+@{GossipAdv}+@{GossipMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{charstatus=@{status}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Gossip_modtype1}]]}} {{mod1=@{Gossip_mod1}}} {{mod2type=[[@{Gossip_modtype2}]]}} {{mod2=@{Gossip_mod2}}} {{mod3type=[[@{Gossip_modtype3}]]}} {{mod3=@{Gossip_mod3}}} {{reroll=@{RT-reroll}Gossip)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Gossip" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{GOSSIP}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{GossipChar}+@{GossipAdv}+@{GossipMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{charstatus=@{status}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Gossip_modtype1}]]}} {{mod1=@{Gossip_mod1}}} {{mod2type=[[@{Gossip_modtype2}]]}} {{mod2=@{Gossip_mod2}}} {{mod3type=[[@{Gossip_modtype3}]]}} {{mod3=@{Gossip_mod3}}} {{reroll=@{RT-reroll}Gossip)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Gossip" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Gossip_settings_hide" value="0"/>		
@@ -8499,9 +9018,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Haggle" value="@{HaggleChar}+@{HaggleAdv}+@{HaggleMisc}+(@{condgen}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Haggle" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{HAGGLE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{HaggleChar}+@{HaggleAdv}+@{HaggleMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Haggle_modtype1}]]}} {{mod1=@{Haggle_mod1}}} {{mod2type=[[@{Haggle_modtype2}]]}} {{mod2=@{Haggle_mod2}}} {{mod3type=[[@{Haggle_modtype3}]]}} {{mod3=@{Haggle_mod3}}} {{reroll=@{RT-reroll}Haggle)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Haggle" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{HAGGLE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{HaggleChar}+@{HaggleAdv}+@{HaggleMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Haggle_modtype1}]]}} {{mod1=@{Haggle_mod1}}} {{mod2type=[[@{Haggle_modtype2}]]}} {{mod2=@{Haggle_mod2}}} {{mod3type=[[@{Haggle_modtype3}]]}} {{mod3=@{Haggle_mod3}}} {{reroll=@{RT-reroll}Haggle)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Haggle" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Haggle_settings_hide" value="0"/>		
@@ -8591,9 +9115,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Intimidate" value="@{IntimidateChar}+@{IntimidateAdv}+@{IntimidateMisc}+(@{condgen}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Intimidate" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTIMIDATE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{IntimidateChar}+@{IntimidateAdv}+@{IntimidateMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{charstatus=@{status}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intimidate_modtype1}]]}} {{mod1=@{Intimidate_mod1}}} {{mod2type=[[@{Intimidate_modtype2}]]}} {{mod2=@{Intimidate_mod2}}} {{mod3type=[[@{Intimidate_modtype3}]]}} {{mod3=@{Intimidate_mod3}}} {{reroll=@{RT-reroll}Intimidate)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Intimidate" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTIMIDATE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{IntimidateChar}+@{IntimidateAdv}+@{IntimidateMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{charstatus=@{status}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intimidate_modtype1}]]}} {{mod1=@{Intimidate_mod1}}} {{mod2type=[[@{Intimidate_modtype2}]]}} {{mod2=@{Intimidate_mod2}}} {{mod3type=[[@{Intimidate_modtype3}]]}} {{mod3=@{Intimidate_mod3}}} {{reroll=@{RT-reroll}Intimidate)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Intimidate" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Intimidate_settings_hide" value="0"/>		
@@ -8683,9 +9212,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Intuition" value="@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}+(@{condgen_see_hear}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Intuition" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}} {{reroll=@{RT-reroll}Intuition)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Intuition" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}} {{reroll=@{RT-reroll}Intuition)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Intuition" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Intuition_settings_hide" value="0"/>		
@@ -8775,9 +9309,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Leadership" value="@{LeadershipChar}+@{LeadershipAdv}+@{LeadershipMisc}+(@{condgen}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Leadership" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{LEADERSHIP}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{LeadershipChar}+@{LeadershipAdv}+@{LeadershipMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{charstatus=@{status}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Leadership_modtype1}]]}} {{mod1=@{Leadership_mod1}}} {{mod2type=[[@{Leadership_modtype2}]]}} {{mod2=@{Leadership_mod2}}} {{mod3type=[[@{Leadership_modtype3}]]}} {{mod3=@{Leadership_mod3}}} {{reroll=@{RT-reroll}Leadership)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Leadership" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{LEADERSHIP}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{LeadershipChar}+@{LeadershipAdv}+@{LeadershipMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{charstatus=@{status}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Leadership_modtype1}]]}} {{mod1=@{Leadership_mod1}}} {{mod2type=[[@{Leadership_modtype2}]]}} {{mod2=@{Leadership_mod2}}} {{mod3type=[[@{Leadership_modtype3}]]}} {{mod3=@{Leadership_mod3}}} {{reroll=@{RT-reroll}Leadership)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Leadership" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Leadership_settings_hide" value="0"/>		
@@ -8845,7 +9384,7 @@
 		<input class="talsetshow-check__hide" type="checkbox" name="attr_Melee_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
               </label>
 						<div class="sheet-col-1-10 sheet-vert-middle">
-							<span data-i18n="MELEE" class="sheet-italic">Melee</span>
+							<span data-i18n="MELEE" class="sheet-italic">Melee</span><span  data-i18n-title="SKILLADV" title="Modified by Advantage" style="margin-left: 5px; font-family: pictos; color: gold; font-size: 10px; padding-bottom: 2px; vertical-align: top">S</span>
 						</div>
 		
 				<input type="checkbox" name="attr_Melee_settings_hide" class="sheet-hidden sheet-hider" value="1" />	
@@ -8858,7 +9397,7 @@
 								<span data-i18n="MELEE-BASIC" class="sheet-italic sheet-nowrap">Melee (Basic)</span>
 							</div>
 							<div class="sheet-col-1-3 sheet-center">			
-						<input class="meleeshow-check" type="checkbox" name="attr_MeleeBasic_hide" value="1"/>
+						<input class="meleeshow-check" type="checkbox" name="attr_MeleeBasic_hide" value="1" checked="checked" />
 							</div>
 						</div>
 						<div class="sheet-row">	
@@ -8925,7 +9464,7 @@
 						</div>						
 						
 						<!-- Melee (Basic) -->
-				<input type="checkbox" name="attr_MeleeBasic_hide" class="sheet-hidden sheet-hider" value="1" />	
+				<input type="checkbox" name="attr_MeleeBasic_hide" class="sheet-hidden sheet-hider" value="1" checked="checked" />	
 						<div class="sheet-row">	
 						
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -8959,9 +9498,14 @@
 								<input class="sheet-center" type="hidden" name="attr_MeleeBasic" value="@{MeleeBasicChar}+@{MeleeBasicAdv}+@{MeleeBasicMisc}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_MeleeBasicD" value="@{MeleeBasicChar}+@{MeleeBasicAdv}+@{MeleeBasicMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1)" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_MeleeBasic" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-BASIC}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeBasic}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeBasic_modtype1}]]}} {{mod1=@{MeleeBasic_mod1}}} {{mod2type=[[@{MeleeBasic_modtype2}]]}} {{mod2=@{MeleeBasic_mod2}}} {{mod3type=[[@{MeleeBasic_modtype3}]]}} {{mod3=@{MeleeBasic_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeBasic)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
-						</div>
+								<button type="roll" class="sheet-roll" name="roll_MeleeBasic" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-BASIC}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeBasic}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeBasic_modtype1}]]}} {{mod1=@{MeleeBasic_mod1}}} {{mod2type=[[@{MeleeBasic_modtype2}]]}} {{mod2=@{MeleeBasic_mod2}}} {{mod3type=[[@{MeleeBasic_modtype3}]]}} {{mod3=@{MeleeBasic_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeBasic)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_MeleeBasic" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_MeleeBasic_settings_hide" value="0"/>		
@@ -9055,9 +9599,14 @@
 								<input class="sheet-center" type="hidden" name="attr_MeleeBrawling" value="@{MeleeBrawlingChar}+@{MeleeBrawlingAdv}+@{MeleeBrawlingMisc}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_MeleeBrawlingD" value="@{MeleeBrawlingChar}+@{MeleeBrawlingAdv}+@{MeleeBrawlingMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1)" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_MeleeBrawling" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-BRAWLING}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeBrawling}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeBrawling_modtype1}]]}} {{mod1=@{MeleeBrawling_mod1}}} {{mod2type=[[@{MeleeBrawling_modtype2}]]}} {{mod2=@{MeleeBrawling_mod2}}} {{mod3type=[[@{MeleeBrawling_modtype3}]]}} {{mod3=@{MeleeBrawling_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeBrawling)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_MeleeBrawling" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-BRAWLING}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeBrawling}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeBrawling_modtype1}]]}} {{mod1=@{MeleeBrawling_mod1}}} {{mod2type=[[@{MeleeBrawling_modtype2}]]}} {{mod2=@{MeleeBrawling_mod2}}} {{mod3type=[[@{MeleeBrawling_modtype3}]]}} {{mod3=@{MeleeBrawling_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeBrawling)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_MeleeBrawling" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_MeleeBrawling_settings_hide" value="0"/>		
@@ -9151,9 +9700,14 @@
 								<input class="sheet-center" type="hidden" name="attr_MeleeCavalry" value="@{MeleeCavalryChar}+@{MeleeCavalryAdv}+@{MeleeCavalryMisc}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_MeleeCavalryD" value="@{MeleeCavalryChar}+@{MeleeCavalryAdv}+@{MeleeCavalryMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1)" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_MeleeCavalry" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-CAVALRY}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeCavalry}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeCavalry_modtype1}]]}} {{mod1=@{MeleeCavalry_mod1}}} {{mod2type=[[@{MeleeCavalry_modtype2}]]}} {{mod2=@{MeleeCavalry_mod2}}} {{mod3type=[[@{MeleeCavalry_modtype3}]]}} {{mod3=@{MeleeCavalry_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeCavalry)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_MeleeCavalry" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-CAVALRY}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeCavalry}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeCavalry_modtype1}]]}} {{mod1=@{MeleeCavalry_mod1}}} {{mod2type=[[@{MeleeCavalry_modtype2}]]}} {{mod2=@{MeleeCavalry_mod2}}} {{mod3type=[[@{MeleeCavalry_modtype3}]]}} {{mod3=@{MeleeCavalry_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeCavalry)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_MeleeCavalry" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_MeleeCavalry_settings_hide" value="0"/>		
@@ -9246,9 +9800,14 @@
 								<input class="sheet-center" type="hidden" name="attr_MeleeFencing" value="@{MeleeFencingChar}+@{MeleeFencingAdv}+@{MeleeFencingMisc}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_MeleeFencingD" value="@{MeleeFencingChar}+@{MeleeFencingAdv}+@{MeleeFencingMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1)" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_MeleeFencing" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-FENCING}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeFencing}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeFencing_modtype1}]]}} {{mod1=@{MeleeFencing_mod1}}} {{mod2type=[[@{MeleeFencing_modtype2}]]}} {{mod2=@{MeleeFencing_mod2}}} {{mod3type=[[@{MeleeFencing_modtype3}]]}} {{mod3=@{MeleeFencing_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeFencing)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_MeleeFencing" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-FENCING}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeFencing}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeFencing_modtype1}]]}} {{mod1=@{MeleeFencing_mod1}}} {{mod2type=[[@{MeleeFencing_modtype2}]]}} {{mod2=@{MeleeFencing_mod2}}} {{mod3type=[[@{MeleeFencing_modtype3}]]}} {{mod3=@{MeleeFencing_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeFencing)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_MeleeFencing" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_MeleeFencing_settings_hide" value="0"/>		
@@ -9341,9 +9900,14 @@
 								<input class="sheet-center" type="hidden" name="attr_MeleeFlail" value="@{MeleeFlailChar}+@{MeleeFlailAdv}+@{MeleeFlailMisc}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_MeleeFlailD" value="@{MeleeFlailChar}+@{MeleeFlailAdv}+@{MeleeFlailMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1)" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_MeleeFlail" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-FLAIL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeFlail}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeFlail_modtype1}]]}} {{mod1=@{MeleeFlail_mod1}}} {{mod2type=[[@{MeleeFlail_modtype2}]]}} {{mod2=@{MeleeFlail_mod2}}} {{mod3type=[[@{MeleeFlail_modtype3}]]}} {{mod3=@{MeleeFlail_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeFlail)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_MeleeFlail" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-FLAIL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeFlail}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeFlail_modtype1}]]}} {{mod1=@{MeleeFlail_mod1}}} {{mod2type=[[@{MeleeFlail_modtype2}]]}} {{mod2=@{MeleeFlail_mod2}}} {{mod3type=[[@{MeleeFlail_modtype3}]]}} {{mod3=@{MeleeFlail_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeFlail)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_MeleeFlail" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_MeleeFlail_settings_hide" value="0"/>		
@@ -9436,9 +10000,14 @@
 								<input class="sheet-center" type="hidden" name="attr_MeleeParry" value="@{MeleeParryChar}+@{MeleeParryAdv}+@{MeleeParryMisc}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_MeleeParryD" value="@{MeleeParryChar}+@{MeleeParryAdv}+@{MeleeParryMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1)" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_MeleeParry" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-PARRY}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeParry}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeParry_modtype1}]]}} {{mod1=@{MeleeParry_mod1}}} {{mod2type=[[@{MeleeParry_modtype2}]]}} {{mod2=@{MeleeParry_mod2}}} {{mod3type=[[@{MeleeParry_modtype3}]]}} {{mod3=@{MeleeParry_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeParry)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_MeleeParry" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-PARRY}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeParry}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeParry_modtype1}]]}} {{mod1=@{MeleeParry_mod1}}} {{mod2type=[[@{MeleeParry_modtype2}]]}} {{mod2=@{MeleeParry_mod2}}} {{mod3type=[[@{MeleeParry_modtype3}]]}} {{mod3=@{MeleeParry_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeParry)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_MeleeParry" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_MeleeParry_settings_hide" value="0"/>		
@@ -9531,9 +10100,14 @@
 								<input class="sheet-center" type="hidden" name="attr_MeleePolearm" value="@{MeleePolearmChar}+@{MeleePolearmAdv}+@{MeleePolearmMisc}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_MeleePolearmD" value="@{MeleePolearmChar}+@{MeleePolearmAdv}+@{MeleePolearmMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1)" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_MeleePolearm" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-POLEARM}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleePolearm}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleePolearm_modtype1}]]}} {{mod1=@{MeleePolearm_mod1}}} {{mod2type=[[@{MeleePolearm_modtype2}]]}} {{mod2=@{MeleePolearm_mod2}}} {{mod3type=[[@{MeleePolearm_modtype3}]]}} {{mod3=@{MeleePolearm_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleePolearm)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_MeleePolearm" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-POLEARM}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleePolearm}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleePolearm_modtype1}]]}} {{mod1=@{MeleePolearm_mod1}}} {{mod2type=[[@{MeleePolearm_modtype2}]]}} {{mod2=@{MeleePolearm_mod2}}} {{mod3type=[[@{MeleePolearm_modtype3}]]}} {{mod3=@{MeleePolearm_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleePolearm)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_MeleePolearm" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_MeleePolearm_settings_hide" value="0"/>		
@@ -9626,9 +10200,14 @@
 								<input class="sheet-center" type="hidden" name="attr_MeleeTwoHanded" value="@{MeleeTwoHandedChar}+@{MeleeTwoHandedAdv}+@{MeleeTwoHandedMisc}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_MeleeTwoHandedD" value="@{MeleeTwoHandedChar}+@{MeleeTwoHandedAdv}+@{MeleeTwoHandedMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1)" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_MeleeTwoHanded" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-TWOHANDED}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{MeleeTwoHanded} {SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeTwoHanded_modtype1}]]}} {{mod1=@{MeleeTwoHanded_mod1}}} {{mod2type=[[@{MeleeTwoHanded_modtype2}]]}} {{mod2=@{MeleeTwoHanded_mod2}}} {{mod3type=[[@{MeleeTwoHanded_modtype3}]]}} {{mod3=@{MeleeTwoHanded_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeTwoHanded)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_MeleeTwoHanded" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-TWOHANDED}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{MeleeTwoHanded} {SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeTwoHanded_modtype1}]]}} {{mod1=@{MeleeTwoHanded_mod1}}} {{mod2type=[[@{MeleeTwoHanded_modtype2}]]}} {{mod2=@{MeleeTwoHanded_mod2}}} {{mod3type=[[@{MeleeTwoHanded_modtype3}]]}} {{mod3=@{MeleeTwoHanded_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeTwoHanded)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_MeleeTwoHanded" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_MeleeTwoHanded_settings_hide" value="0"/>		
@@ -9720,9 +10299,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Navigation" value="@{NavigationChar}+@{NavigationAdv}+@{NavigationMisc}+(@{condgen_see_move}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Navigation" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{NAVIGATION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{NavigationChar}+@{NavigationAdv}+@{NavigationMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Navigation_modtype1}]]}} {{mod1=@{Navigation_mod1}}} {{mod2type=[[@{Navigation_modtype2}]]}} {{mod2=@{Navigation_mod2}}} {{mod3type=[[@{Navigation_modtype3}]]}} {{mod3=@{Navigation_mod3}}} {{reroll=@{RT-reroll}Navigation)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Navigation" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{NAVIGATION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{NavigationChar}+@{NavigationAdv}+@{NavigationMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Navigation_modtype1}]]}} {{mod1=@{Navigation_mod1}}} {{mod2type=[[@{Navigation_modtype2}]]}} {{mod2=@{Navigation_mod2}}} {{mod3type=[[@{Navigation_modtype3}]]}} {{mod3=@{Navigation_mod3}}} {{reroll=@{RT-reroll}Navigation)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Navigation" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Navigation_settings_hide" value="0"/>		
@@ -9812,9 +10396,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_OutdoorSurvival" value="@{OutdoorSurvivalChar}+@{OutdoorSurvivalAdv}+@{OutdoorSurvivalMisc}+(@{condgen_see_move}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_OutdoorSurvival" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{OUTDOOR-SURVIVAL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{OutdoorSurvival}]] [SKILL] +?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{OutdoorSurvival_modtype1}]]}} {{mod1=@{OutdoorSurvival_mod1}}} {{mod2type=[[@{OutdoorSurvival_modtype2}]]}} {{mod2=@{OutdoorSurvival_mod2}}} {{mod3type=[[@{OutdoorSurvival_modtype3}]]}} {{mod3=@{OutdoorSurvival_mod3}}} {{reroll=@{RT-reroll}OutdoorSurvival)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_OutdoorSurvival" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{OUTDOOR-SURVIVAL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{OutdoorSurvival}]] [SKILL] +?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{OutdoorSurvival_modtype1}]]}} {{mod1=@{OutdoorSurvival_mod1}}} {{mod2type=[[@{OutdoorSurvival_modtype2}]]}} {{mod2=@{OutdoorSurvival_mod2}}} {{mod3type=[[@{OutdoorSurvival_modtype3}]]}} {{mod3=@{OutdoorSurvival_mod3}}} {{reroll=@{RT-reroll}OutdoorSurvival)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_OutdoorSurvival" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_OutdoorSurvival_settings_hide" value="0"/>		
@@ -9878,7 +10467,7 @@
 							<input type="checkbox" name="attr_PerceptionCareer" value="1" />
 						</div>
 						<div class="sheet-col-4-10 sheet-pad-r-sm sheet-vert-middle">
-							<span data-i18n="PERCEPTION">Perception</span>
+							<span data-i18n="PERCEPTION">Perception</span><span class="sheet-pictos-three"  data-i18n-title="SKILL-ARMOR-PENALTIES" title="Modified by Armor Penalties" style="margin-left: 5px; black: gold; font-size: 10px; padding-bottom: 2px; vertical-align: top">b</span>
 						</div>
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<select class="sheet-select-no-arrow-center" name="attr_PerceptionChar">
@@ -9904,9 +10493,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Perception" value="@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}-@{armorcoifpenalty}-@{armorhelmpenalty}+(@{condgen_see_hear}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Perception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]] [PEN] + [[@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{armorpen=[[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}} {{reroll=@{RT-reroll}Perception)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Perception" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]] [PEN] + [[@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{armorpen=[[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}} {{reroll=@{RT-reroll}Perception)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Perception" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Perception_settings_hide" value="0"/>		
@@ -9995,9 +10589,14 @@
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 								<input class="sheet-center" type="number" name="attr_Ride" value="@{RideChar}+@{RideAdv}+@{RideMisc}+(@{condgen_see_move}*-1)" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_Ride" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RIDE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RideChar}+@{RideAdv}+@{RideMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Ride_modtype1}]]}} {{mod1=@{Ride_mod1}}} {{mod2type=[[@{Ride_modtype2}]]}} {{mod2=@{Ride_mod2}}} {{mod3type=[[@{Ride_modtype3}]]}} {{mod3=@{Ride_mod3}}} {{reroll=@{RT-reroll}Ride)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_Ride" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RIDE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RideChar}+@{RideAdv}+@{RideMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Ride_modtype1}]]}} {{mod1=@{Ride_mod1}}} {{mod2type=[[@{Ride_modtype2}]]}} {{mod2=@{Ride_mod2}}} {{mod3type=[[@{Ride_modtype3}]]}} {{mod3=@{Ride_mod3}}} {{reroll=@{RT-reroll}Ride)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Ride" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Ride_settings_hide" value="0"/>		
@@ -10056,6 +10655,10 @@
            </div>				
 		</div>				
 					</div>	
+					
+					
+					
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-row">
 							<fieldset class="repeating_ridespecialization">
 								<div class="sheet-row">
@@ -10093,7 +10696,7 @@
 										<input class="sheet-center" type="number" name="attr_RideSpecialization" value="@{RideSpecializationChar}+@{RideSpecializationAdv}+@{RideSpecializationMisc}+(@{condgen_see_move}*-1)" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_RideSpecialization" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{RideSpecializationName}}} {{skill=^{RIDE}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RideSpecializationChar}+@{RideSpecializationAdv}+@{RideSpecializationMisc}]] [SKILL] + ?{@{translation_modifier}|0} {MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Ride_Custom_modtype1}]]}} {{mod1=@{Ride_Custom_mod1}}} {{mod2type=[[@{Ride_Custom_modtype2}]]}} {{mod2=@{Ride_Custom_mod2}}} {{mod3type=[[@{Ride_Custom_modtype3}]]}} {{mod3=@{Ride_Custom_mod3}}} {{reroll=@{RT-rep}RideSpecialization)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_RideSpecialization" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{RideSpecializationName}}} {{skill=^{RIDE}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RideSpecializationChar}+@{RideSpecializationAdv}+@{RideSpecializationMisc}]] [SKILL] + ?{@{translation_modifier}|0} {MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Ride_Custom_modtype1}]]}} {{mod1=@{Ride_Custom_mod1}}} {{mod2type=[[@{Ride_Custom_modtype2}]]}} {{mod2=@{Ride_Custom_mod2}}} {{mod3type=[[@{Ride_Custom_modtype3}]]}} {{mod3=@{Ride_Custom_mod3}}} {{reroll=@{RT-rep}RideSpecialization)}}"></button>
 						</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
@@ -10155,6 +10758,112 @@
 					</div>	
 							</fieldset>
 						</div>
+						
+						
+			
+					
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-row">
+							<fieldset class="repeating_ridespecialization">
+								<div class="sheet-row">
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input type="checkbox" name="attr_RideSpecializationCareer" value="1" />
+									</div>
+									<div class="sheet-col-4-10 sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="text" name="attr_RideSpecializationName" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<select class="sheet-select-no-arrow-center" name="attr_RideSpecializationChar">
+											<option value="(@{WeaponSkill}+@{WeaponSkillMod})" data-i18n="ABBREVIATE-WEAPON-SKILL">WS</option>
+											<option value="(@{BallisticSkill}+@{BallisticSkillMod})" data-i18n="ABBREVIATE-BALLISTIC-SKILL">BS</option>
+											<option value="(@{Strength}+@{StrengthMod})" data-i18n="ABBREVIATE-STRENGTH">S</option>
+											<option value="(@{Toughness}+@{ToughnessMod})" data-i18n="ABBREVIATE-TOUGHNESS">T</option>
+											<option value="(@{Initiative}+@{InitiativeMod})" data-i18n="ABBREVIATE-INITIATIVE">I</option>
+											<option value="(@{Agility}+@{AgilityMod})" data-i18n="ABBREVIATE-AGILITY" selected="selected">Ag</option>
+											<option value="(@{Dexterity}+@{DexterityMod})" data-i18n="ABBREVIATE-DEXTERITY">Dex</option>
+											<option value="(@{Intelligence}+@{IntelligenceMod})" data-i18n="ABBREVIATE-INTELLIGENCE">Int</option>
+											<option value="(@{WillPower}+@{WillPowerMod})" data-i18n="ABBREVIATE-WILL-POWER">Wp</option>
+											<option value="(@{Fellowship}+@{FellowshipMod})" data-i18n="ABBREVIATE-FELLOWSHIP">Fel</option>
+										</select>
+									</div>
+								<input class="sheet-hidden" type="textarea" name="attr_Skill_rep_ID" />
+										<input class="sheet-hidden" type="number" name="attr_RideSpecializationXP" value="0" readonly />
+										<input class="sheet-hidden" type="textarea" name="attr_RideSpecializationDis" value="0" readonly />
+								<input class="sheet-hidden" type="textarea" name="attr_RT-rep" value="[1](~@{character_name}|repeating_RideSpecialization_@{Skill_rep_ID}_" />
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_RideSpecializationAdv" value="0" min="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_RideSpecializationMisc" value="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_RideSpecialization" value="@{RideSpecializationChar}+@{RideSpecializationAdv}+@{RideSpecializationMisc}+(@{condgen_see_move}*-1)" disabled="true" />
+									</div>
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_ridespecialization" style="font-family: dicefontd20;">t</button>
+							</div>
+							
+              <label class="sheet-col-1-14 talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_Ride_Custom_settings_hide" value="0"/>		
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_Ride_Custom_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_Ride_Custom_settings_hide" class="sheet-hidden sheet-hider" value="1" />
+				
+				
+			<div class="Art_cust_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Ride_Custom_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Ride_Custom_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Ride_Custom_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Ride_Custom_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Ride_Custom_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Ride_Custom_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>								
+							<span class="sheet-spacer"></span>	
+           </div>				
+		</div>				
+					</div>	
+							</fieldset>
+						</div>
+												
+						
 					</div>
 					<div class="sheet-row" style="padding-left: 12px; padding-right: 12px;">
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -10187,9 +10896,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Row" value="@{RowChar}+@{RowAdv}+@{RowMisc}+(@{condgen_see_move}*-1)" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Row" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condall}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{ROW}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RowChar}+@{RowAdv}+@{RowMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Row_modtype1}]]}} {{mod1=@{Row_mod1}}} {{mod2type=[[@{Row_modtype2}]]}} {{mod2=@{Row_mod2}}} {{mod3type=[[@{Row_modtype3}]]}} {{mod3=@{Row_mod3}}} {{reroll=@{RT-reroll}Row)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Row" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condall}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{ROW}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RowChar}+@{RowAdv}+@{RowMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Row_modtype1}]]}} {{mod1=@{Row_mod1}}} {{mod2type=[[@{Row_modtype2}]]}} {{mod2=@{Row_mod2}}} {{mod3type=[[@{Row_modtype3}]]}} {{mod3=@{Row_mod3}}} {{reroll=@{RT-reroll}Row)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Row" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Row_settings_hide" value="0"/>		
@@ -10253,7 +10967,7 @@
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							</div>
 							<div class="sheet-col-4-10 sheet-pad-r-sm sheet-vert-middle">
-								<span data-i18n="STEALTH" class="sheet-italic">Stealth</span>
+								<span data-i18n="STEALTH" class="sheet-italic">Stealth</span><span class="sheet-pictos-three"  data-i18n-title="SKILL-ARMOR-PENALTIES" title="Modified by Armor Penalties" style="margin-left: 5px; black: gold; font-size: 10px; padding-bottom: 2px; vertical-align: top">b</span>
 							</div>
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 								<select class="sheet-select-no-arrow-center" name="attr_StealthChar">
@@ -10278,9 +10992,14 @@
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 								<input class="sheet-center" type="number" name="attr_Stealth" value="@{StealthChar}+@{StealthAdv}+@{StealthMisc}-@{armormailpenalty}-@{armorplatepenalty}-@{armorplatelegspenalty}+(@{condgen_see_move}*-1)" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_Stealth" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{STEALTH}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]] [PEN] + [[@{StealthChar}+@{StealthAdv}+@{StealthMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{armorpen=[[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Stealth_modtype1}]]}} {{mod1=@{Stealth_mod1}}} {{mod2type=[[@{Stealth_modtype2}]]}} {{mod2=@{Stealth_mod2}}} {{mod3type=[[@{Stealth_modtype3}]]}} {{mod3=@{Stealth_mod3}}} {{reroll=@{RT-reroll}Stealth)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_Stealth" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{STEALTH}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]] [PEN] + [[@{StealthChar}+@{StealthAdv}+@{StealthMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{armorpen=[[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Stealth_modtype1}]]}} {{mod1=@{Stealth_mod1}}} {{mod2type=[[@{Stealth_modtype2}]]}} {{mod2=@{Stealth_mod2}}} {{mod3type=[[@{Stealth_modtype3}]]}} {{mod3=@{Stealth_mod3}}} {{reroll=@{RT-reroll}Stealth)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Stealth" style="font-family: dicefontd20;">t</button>
+							</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
 		<input class="talsetshow-check__hide" type="hidden" name="attr_Stealth_settings_hide" value="0"/>		
@@ -10339,6 +11058,9 @@
            </div>				
 		</div>				
 					</div>	
+					
+					
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-row">
 							<fieldset class="repeating_StealthSpecialization">
 								<div class="sheet-row">
@@ -10376,7 +11098,7 @@
 										<input class="sheet-center" type="number" name="attr_StealthSpecialization" value="@{StealthSpecializationChar}+@{StealthSpecializationAdv}+@{StealthSpecializationMisc}-@{armormailpenalty}-@{armorplatepenalty}-@{armorplatelegspenalty}+(@{condgen_see_move}*-1)" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_StealthSpecialization" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{StealthSpecializationName}}} {{skill=^{STEALTH}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]] [PEN] + [[@{StealthSpecializationChar}+@{StealthSpecializationAdv}+@{StealthSpecializationMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{armorpen=[[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]]}} {{mod1type=[[@{Stealth_Custom_modtype1}]]}} {{mod1=@{Stealth_Custom_mod1}}} {{mod2type=[[@{Stealth_Custom_modtype2}]]}} {{mod2=@{Stealth_Custom_mod2}}} {{mod3type=[[@{Stealth_Custom_modtype3}]]}} {{mod3=@{Stealth_Custom_mod3}}} {{reroll=@{RT-rep}StealthSpecialization)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_StealthSpecialization" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{StealthSpecializationName}}} {{skill=^{STEALTH}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]] [PEN] + [[@{StealthSpecializationChar}+@{StealthSpecializationAdv}+@{StealthSpecializationMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{armorpen=[[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]]}} {{mod1type=[[@{Stealth_Custom_modtype1}]]}} {{mod1=@{Stealth_Custom_mod1}}} {{mod2type=[[@{Stealth_Custom_modtype2}]]}} {{mod2=@{Stealth_Custom_mod2}}} {{mod3type=[[@{Stealth_Custom_modtype3}]]}} {{mod3=@{Stealth_Custom_mod3}}} {{reroll=@{RT-rep}StealthSpecialization)}}"></button>
 						</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
@@ -10438,6 +11160,110 @@
 					</div>	
 							</fieldset>
 						</div>
+						
+				
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-row">
+							<fieldset class="repeating_StealthSpecialization">
+								<div class="sheet-row">
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input type="checkbox" name="attr_StealthSpecializationCareer" value="1" />
+									</div>
+									<div class="sheet-col-4-10 sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="text" name="attr_StealthSpecializationName" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<select class="sheet-select-no-arrow-center" name="attr_StealthSpecializationChar">
+											<option value="(@{WeaponSkill}+@{WeaponSkillMod})" data-i18n="ABBREVIATE-WEAPON-SKILL">WS</option>
+											<option value="(@{BallisticSkill}+@{BallisticSkillMod})" data-i18n="ABBREVIATE-BALLISTIC-SKILL">BS</option>
+											<option value="(@{Strength}+@{StrengthMod})" data-i18n="ABBREVIATE-STRENGTH">S</option>
+											<option value="(@{Toughness}+@{ToughnessMod})" data-i18n="ABBREVIATE-TOUGHNESS">T</option>
+											<option value="(@{Initiative}+@{InitiativeMod})" data-i18n="ABBREVIATE-INITIATIVE">I</option>
+											<option value="(@{Agility}+@{AgilityMod})" data-i18n="ABBREVIATE-AGILITY" selected="selected">Ag</option>
+											<option value="(@{Dexterity}+@{DexterityMod})" data-i18n="ABBREVIATE-DEXTERITY">Dex</option>
+											<option value="(@{Intelligence}+@{IntelligenceMod})" data-i18n="ABBREVIATE-INTELLIGENCE">Int</option>
+											<option value="(@{WillPower}+@{WillPowerMod})" data-i18n="ABBREVIATE-WILL-POWER">Wp</option>
+											<option value="(@{Fellowship}+@{FellowshipMod})" data-i18n="ABBREVIATE-FELLOWSHIP">Fel</option>
+										</select>
+									</div>
+								<input class="sheet-hidden" type="textarea" name="attr_Skill_rep_ID" />
+										<input class="sheet-hidden" type="number" name="attr_StealthSpecializationXP" value="0" readonly />
+										<input class="sheet-hidden" type="textarea" name="attr_StealthSpecializationDis" value="0" readonly />
+								<input class="sheet-hidden" type="textarea" name="attr_RT-rep" value="[1](~@{character_name}|repeating_StealthSpecialization_@{Skill_rep_ID}_" />
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_StealthSpecializationAdv" value="0" min="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_StealthSpecializationMisc" value="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_StealthSpecialization" value="@{StealthSpecializationChar}+@{StealthSpecializationAdv}+@{StealthSpecializationMisc}-@{armormailpenalty}-@{armorplatepenalty}-@{armorplatelegspenalty}+(@{condgen_see_move}*-1)" disabled="true" />
+									</div>
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_stealthspecialization" style="font-family: dicefontd20;">t</button>
+							</div>
+							
+              <label class="sheet-col-1-14 talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_Stealth_Custom_settings_hide" value="0"/>		
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_Stealth_Custom_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_Stealth_Custom_settings_hide" class="sheet-hidden sheet-hider" value="1" />
+				
+				
+			<div class="Art_cust_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Stealth_Custom_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Stealth_Custom_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Stealth_Custom_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Stealth_Custom_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Stealth_Custom_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Stealth_Custom_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>								
+							<span class="sheet-spacer"></span>	
+           </div>				
+		</div>				
+					</div>	
+							</fieldset>
+						</div>		
+						
+						
 					</div>
 				</div>
 				<div class="sheet-col-1-2  sheet-pad-r-md sheet-vert-top">
@@ -10491,9 +11317,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_AnimalCare" value="(@{AnimalCareChar}+@{AnimalCareAdv}+@{AnimalCareMisc}+(@{condgen}*-1))*@{AnimalCareTaken}" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_AnimalCare" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ANIMAL-CARE}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[(@{AnimalCareChar}+@{AnimalCareAdv}+@{AnimalCareMisc})*@{AnimalCareTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{AnimalCare_modtype1}]]}} {{mod1=@{AnimalCare_mod1}}} {{mod2type=[[@{AnimalCare_modtype2}]]}} {{mod2=@{AnimalCare_mod2}}} {{mod3type=[[@{AnimalCare_modtype3}]]}} {{mod3=@{AnimalCare_mod3}}} {{reroll=@{RT-reroll}AnimalCare)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_AnimalCare" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ANIMAL-CARE}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[(@{AnimalCareChar}+@{AnimalCareAdv}+@{AnimalCareMisc})*@{AnimalCareTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{AnimalCare_modtype1}]]}} {{mod1=@{AnimalCare_mod1}}} {{mod2type=[[@{AnimalCare_modtype2}]]}} {{mod2=@{AnimalCare_mod2}}} {{mod3type=[[@{AnimalCare_modtype3}]]}} {{mod3=@{AnimalCare_mod3}}} {{reroll=@{RT-reroll}AnimalCare)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_AnimalCare" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_AnimalCareTaken" value="1" />
 						</div>
@@ -10563,6 +11394,10 @@
 						<div class="sheet-col-3-8 sheet-vert-middle">
 							<span data-i18n="ANIMAL-TRAINING" class="sheet-italic">Animal Training</span>
 						</div>
+						
+						
+						
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-row">
 							<fieldset class="repeating_animaltraining">
 								<div class="sheet-row">
@@ -10589,7 +11424,7 @@
 								<input class="sheet-hidden" type="textarea" name="attr_Skill_rep_ID" />
 										<input class="sheet-hidden" type="number" name="attr_AnimalTrainingSpecializationXP" value="0" readonly />
 										<input class="sheet-hidden" type="textarea" name="attr_AnimalTrainingSpecializationDis" value="0" readonly />
-								<input class="sheet-hidden" type="textarea" name="attr_RT-rep" value="[1](~@{character_name}|repeating_AnimalTraining_@{Skill_rep_ID}_" />
+								<input class="sheet-hidden" type="textarea" name="attr_RT-rep" value="[1](~@{character_name}|repeating_AnimalTraining_@{repeating_artspecializationr_Skill_rep_ID}_" />
 									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 										<input class="sheet-center" type="number" name="attr_AnimalTrainingAdv" value="0" min="0" />
 									</div>
@@ -10599,9 +11434,9 @@
 									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 										<input class="sheet-center" type="number" name="attr_AnimalTraining" value="(@{AnimalTrainingChar}+@{AnimalTrainingAdv}+@{AnimalTrainingMisc}+(@{condgen}*-1))*@{AnimalTrainingTaken}" disabled="true" />
 									</div>
-									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_AnimalTraining" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{AnimalTrainingSpecialization}}} {{skill=^{ANIMAL-TRAINING}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[(@{AnimalTrainingChar}+@{AnimalTrainingAdv}+@{AnimalTrainingMisc})*@{AnimalTrainingTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{AnimalTraining_modtype1}]]}} {{mod1=@{AnimalTraining_mod1}}} {{mod2type=[[@{AnimalTraining_modtype2}]]}} {{mod2=@{AnimalTraining_mod2}}} {{mod3type=[[@{AnimalTraining_modtype3}]]}} {{mod3=@{AnimalTraining_mod3}}} {{reroll=@{RT-rep}AnimalTraining)}}"></button>
-						</div>
+									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle sheet-dev">
+										<button type="roll" class="sheet-roll" name="roll_AnimalTraining" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{AnimalTrainingSpecialization}}} {{skill=^{ANIMAL-TRAINING}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[(@{AnimalTrainingChar}+@{AnimalTrainingAdv}+@{AnimalTrainingMisc})*@{AnimalTrainingTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{AnimalTraining_modtype1}]]}} {{mod1=@{AnimalTraining_mod1}}} {{mod2type=[[@{AnimalTraining_modtype2}]]}} {{mod2=@{AnimalTraining_mod2}}} {{mod3type=[[@{AnimalTraining_modtype3}]]}} {{mod3=@{AnimalTraining_mod3}}} {{reroll=@{RT-rep}AnimalTraining)}}"></button>
+									</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_AnimalTrainingTaken" value="1" />
 						</div>
@@ -10666,6 +11501,116 @@
 					</div>						
 							</fieldset>
 						</div>
+						
+						
+						
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-row">
+							<fieldset class="repeating_animaltraining">
+								<div class="sheet-row">
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input type="checkbox" name="attr_AnimalTrainingCareer" value="1" />
+									</div>
+									<div class="sheet-col-3-8 sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="text" name="attr_AnimalTrainingSpecialization" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<select class="sheet-select-no-arrow-center" name="attr_AnimalTrainingChar">
+											<option value="(@{WeaponSkill}+@{WeaponSkillMod})" data-i18n="ABBREVIATE-WEAPON-SKILL">WS</option>
+											<option value="(@{BallisticSkill}+@{BallisticSkillMod})" data-i18n="ABBREVIATE-BALLISTIC-SKILL">BS</option>
+											<option value="(@{Strength}+@{StrengthMod})" data-i18n="ABBREVIATE-STRENGTH">S</option>
+											<option value="(@{Toughness}+@{ToughnessMod})" data-i18n="ABBREVIATE-TOUGHNESS">T</option>
+											<option value="(@{Initiative}+@{InitiativeMod})" data-i18n="ABBREVIATE-INITIATIVE">I</option>
+											<option value="(@{Agility}+@{AgilityMod})" data-i18n="ABBREVIATE-AGILITY">Ag</option>
+											<option value="(@{Dexterity}+@{DexterityMod})" data-i18n="ABBREVIATE-DEXTERITY">Dex</option>
+											<option value="(@{Intelligence}+@{IntelligenceMod})" data-i18n="ABBREVIATE-INTELLIGENCE">Int</option>
+											<option value="(@{WillPower}+@{WillPowerMod})" data-i18n="ABBREVIATE-WILL-POWER" selected="selected">Wp</option>
+											<option value="(@{Fellowship}+@{FellowshipMod})" data-i18n="ABBREVIATE-FELLOWSHIP">Fel</option>
+										</select>
+									</div>
+								<input class="sheet-hidden" type="textarea" name="attr_Skill_rep_ID" />
+										<input class="sheet-hidden" type="number" name="attr_AnimalTrainingSpecializationXP" value="0" readonly />
+										<input class="sheet-hidden" type="textarea" name="attr_AnimalTrainingSpecializationDis" value="0" readonly />
+								<input class="sheet-hidden" type="textarea" name="attr_RT-rep" value="[1](~@{character_name}|repeating_AnimalTraining_@{repeating_artspecializationr_Skill_rep_ID}_" />
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_AnimalTrainingAdv" value="0" min="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_AnimalTrainingMisc" value="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_AnimalTraining" value="(@{AnimalTrainingChar}+@{AnimalTrainingAdv}+@{AnimalTrainingMisc}+(@{condgen}*-1))*@{AnimalTrainingTaken}" disabled="true" />
+									</div>
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_animaltraining" style="font-family: dicefontd20;">t</button>
+							</div>
+						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
+							<input type="checkbox" name="attr_AnimalTrainingTaken" value="1" />
+						</div>
+					
+								
+              <label class="sheet-col-1-30 talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_AnimalTraining_settings_hide" value="0"/>		
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_AnimalTraining_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_AnimalTraining_settings_hide" class="sheet-hidden sheet-hider" value="1" />
+				
+				
+			<div class="Art_cust_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_AnimalTraining_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_AnimalTraining_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_AnimalTraining_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_AnimalTraining_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_AnimalTraining_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_AnimalTraining_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>								
+							<span class="sheet-spacer"></span>	
+           </div>				
+		</div>				
+					</div>						
+							</fieldset>
+						</div>						
+						
+						
+						
 					</div>
 									
 					<!-- CHANNELLING SKILL SECTION -->
@@ -10824,9 +11769,14 @@
 								<input class="sheet-center" type="hidden" name="attr_ChannellingFire" value="(@{ChannellingFireChar}+@{ChannellingFireAdv}+@{ChannellingFireMisc})*@{ChannellingFireTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_ChannellingFireD" value="(@{ChannellingFireChar}+@{ChannellingFireAdv}+@{ChannellingFireMisc}+(@{condgen_see_move}*-1))*@{ChannellingFireTaken}" disabled="true" />
 							</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingFire" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-FIRE}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingFire}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingFire_modtype1}]]}} {{mod1=@{ChannellingFire_mod1}}} {{mod2type=[[@{ChannellingFire_modtype2}]]}} {{mod2=@{ChannellingFire_mod2}}} {{mod3type=[[@{ChannellingFire_modtype3}]]}} {{mod3=@{ChannellingFire_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingFire)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingFire" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-FIRE}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingFire}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingFire_modtype1}]]}} {{mod1=@{ChannellingFire_mod1}}} {{mod2type=[[@{ChannellingFire_modtype2}]]}} {{mod2=@{ChannellingFire_mod2}}} {{mod3type=[[@{ChannellingFire_modtype3}]]}} {{mod3=@{ChannellingFire_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingFire)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_channellingfire" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_ChannellingFireTaken" value="1" />
 						</div>
@@ -10924,9 +11874,14 @@
 								<input class="sheet-center" type="hidden" name="attr_ChannellingHeavens" value="(@{ChannellingHeavensChar}+@{ChannellingHeavensAdv}+@{ChannellingHeavensMisc})*@{ChannellingHeavensTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_ChannellingHeavensD" value="(@{ChannellingHeavensChar}+@{ChannellingHeavensAdv}+@{ChannellingHeavensMisc}+(@{condgen_see_move}*-1))*@{ChannellingHeavensTaken}" disabled="true" />
 							</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingHeavens" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-HEAVENS}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{ChannellingHeavensChar}+@{ChannellingHeavensAdv}+@{ChannellingHeavensMisc})*@{ChannellingHeavensTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingHeavens_modtype1}]]}} {{mod1=@{ChannellingHeavens_mod1}}} {{mod2type=[[@{ChannellingHeavens_modtype2}]]}} {{mod2=@{ChannellingHeavens_mod2}}} {{mod3type=[[@{ChannellingHeavens_modtype3}]]}} {{mod3=@{ChannellingHeavens_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingHeavens)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingHeavens" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-HEAVENS}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{ChannellingHeavensChar}+@{ChannellingHeavensAdv}+@{ChannellingHeavensMisc})*@{ChannellingHeavensTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingHeavens_modtype1}]]}} {{mod1=@{ChannellingHeavens_mod1}}} {{mod2type=[[@{ChannellingHeavens_modtype2}]]}} {{mod2=@{ChannellingHeavens_mod2}}} {{mod3type=[[@{ChannellingHeavens_modtype3}]]}} {{mod3=@{ChannellingHeavens_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingHeavens)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_channellingheavens" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_ChannellingHeavensTaken" value="1" />
 						</div>
@@ -11024,9 +11979,14 @@
 								<input class="sheet-center" type="hidden" name="attr_ChannellingMetal" value="(@{ChannellingMetalChar}+@{ChannellingMetalAdv}+@{ChannellingMetalMisc})*@{ChannellingMetalTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_ChannellingMetalD" value="(@{ChannellingMetalChar}+@{ChannellingMetalAdv}+@{ChannellingMetalMisc}+(@{condgen_see_move}*-1))*@{ChannellingMetalTaken}" disabled="true" />
 							</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingMetal" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-METAL}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{ChannellingMetalChar}+@{ChannellingMetalAdv}+@{ChannellingMetalMisc})*@{ChannellingMetalTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingMetal_modtype1}]]}} {{mod1=@{ChannellingMetal_mod1}}} {{mod2type=[[@{ChannellingMetal_modtype2}]]}} {{mod2=@{ChannellingMetal_mod2}}} {{mod3type=[[@{ChannellingMetal_modtype3}]]}} {{mod3=@{ChannellingMetal_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingMetal)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingMetal" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-METAL}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{ChannellingMetalChar}+@{ChannellingMetalAdv}+@{ChannellingMetalMisc})*@{ChannellingMetalTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingMetal_modtype1}]]}} {{mod1=@{ChannellingMetal_mod1}}} {{mod2type=[[@{ChannellingMetal_modtype2}]]}} {{mod2=@{ChannellingMetal_mod2}}} {{mod3type=[[@{ChannellingMetal_modtype3}]]}} {{mod3=@{ChannellingMetal_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingMetal)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_channellingmetal" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_ChannellingMetalTaken" value="1" />
 						</div>
@@ -11124,9 +12084,14 @@
 								<input class="sheet-center" type="hidden" name="attr_ChannellingBeasts" value="(@{ChannellingBeastsChar}+@{ChannellingBeastsAdv}+@{ChannellingBeastsMisc})*@{ChannellingBeastsTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_ChannellingBeastsD" value="(@{ChannellingBeastsChar}+@{ChannellingBeastsAdv}+@{ChannellingBeastsMisc}+(@{condgen_see_move}*-1))*@{ChannellingBeastsTaken}" disabled="true" />
 							</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingBeasts" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-BEASTS}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingBeastsChar}+@{ChannellingBeastsAdv}+@{ChannellingBeastsMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingBeasts_modtype1}]]}} {{mod1=@{ChannellingBeasts_mod1}}} {{mod2type=[[@{ChannellingBeasts_modtype2}]]}} {{mod2=@{ChannellingBeasts_mod2}}} {{mod3type=[[@{ChannellingBeasts_modtype3}]]}} {{mod3=@{ChannellingBeasts_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingBeasts)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingBeasts" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-BEASTS}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingBeastsChar}+@{ChannellingBeastsAdv}+@{ChannellingBeastsMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingBeasts_modtype1}]]}} {{mod1=@{ChannellingBeasts_mod1}}} {{mod2type=[[@{ChannellingBeasts_modtype2}]]}} {{mod2=@{ChannellingBeasts_mod2}}} {{mod3type=[[@{ChannellingBeasts_modtype3}]]}} {{mod3=@{ChannellingBeasts_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingBeasts)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_channellingbeasts" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_ChannellingBeastsTaken" value="1" />
 						</div>
@@ -11224,9 +12189,14 @@
 								<input class="sheet-center" type="hidden" name="attr_ChannellingLife" value="(@{ChannellingLifeChar}+@{ChannellingLifeAdv}+@{ChannellingLifeMisc})*@{ChannellingLifeTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_ChannellingLifeD" value="(@{ChannellingLifeChar}+@{ChannellingLifeAdv}+@{ChannellingLifeMisc}+(@{condgen_see_move}*-1))*@{ChannellingLifeTaken}" disabled="true" />
 							</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingLife" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-LIFE}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingLifeChar}+@{ChannellingLifeAdv}+@{ChannellingLifeMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingLife_modtype1}]]}} {{mod1=@{ChannellingLife_mod1}}} {{mod2type=[[@{ChannellingLife_modtype2}]]}} {{mod2=@{ChannellingLife_mod2}}} {{mod3type=[[@{ChannellingLife_modtype3}]]}} {{mod3=@{ChannellingLife_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingLife)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingLife" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-LIFE}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingLifeChar}+@{ChannellingLifeAdv}+@{ChannellingLifeMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingLife_modtype1}]]}} {{mod1=@{ChannellingLife_mod1}}} {{mod2type=[[@{ChannellingLife_modtype2}]]}} {{mod2=@{ChannellingLife_mod2}}} {{mod3type=[[@{ChannellingLife_modtype3}]]}} {{mod3=@{ChannellingLife_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingLife)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_channellinglife" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_ChannellingLifeTaken" value="1" />
 						</div>
@@ -11324,9 +12294,14 @@
 								<input class="sheet-center" type="hidden" name="attr_ChannellingLight" value="(@{ChannellingLightChar}+@{ChannellingLightAdv}+@{ChannellingLightMisc})*@{ChannellingLightTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_ChannellingLightD" value="(@{ChannellingLightChar}+@{ChannellingLightAdv}+@{ChannellingLightMisc}+(@{condgen_see_move}*-1))*@{ChannellingLightTaken}" disabled="true" />
 							</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingLight" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-LIGHT}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingLightChar}+@{ChannellingLightAdv}+@{ChannellingLightMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingLight_modtype1}]]}} {{mod1=@{ChannellingLight_mod1}}} {{mod2type=[[@{ChannellingLight_modtype2}]]}} {{mod2=@{ChannellingLight_mod2}}} {{mod3type=[[@{ChannellingLight_modtype3}]]}} {{mod3=@{ChannellingLight_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingLight)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingLight" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-LIGHT}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingLightChar}+@{ChannellingLightAdv}+@{ChannellingLightMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingLight_modtype1}]]}} {{mod1=@{ChannellingLight_mod1}}} {{mod2type=[[@{ChannellingLight_modtype2}]]}} {{mod2=@{ChannellingLight_mod2}}} {{mod3type=[[@{ChannellingLight_modtype3}]]}} {{mod3=@{ChannellingLight_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingLight)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_channellinglight" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_ChannellingLightTaken" value="1" />
 						</div>
@@ -11424,9 +12399,14 @@
 								<input class="sheet-center" type="hidden" name="attr_ChannellingDeath" value="(@{ChannellingDeathChar}+@{ChannellingDeathAdv}+@{ChannellingDeathMisc})*@{ChannellingDeathTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_ChannellingDeath" value="(@{ChannellingDeathChar}+@{ChannellingDeathAdv}+@{ChannellingDeathMisc}+(@{condgen_see_move}*-1))*@{ChannellingDeathTaken}" disabled="true" />
 							</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingDeath" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-DEATH}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingDeathChar}+@{ChannellingDeathAdv}+@{ChannellingDeathMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingDeath_modtype1}]]}} {{mod1=@{ChannellingDeath_mod1}}} {{mod2type=[[@{ChannellingDeath_modtype2}]]}} {{mod2=@{ChannellingDeath_mod2}}} {{mod3type=[[@{ChannellingDeath_modtype3}]]}} {{mod3=@{ChannellingDeath_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingDeath)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingDeath" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-DEATH}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingDeathChar}+@{ChannellingDeathAdv}+@{ChannellingDeathMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingDeath_modtype1}]]}} {{mod1=@{ChannellingDeath_mod1}}} {{mod2type=[[@{ChannellingDeath_modtype2}]]}} {{mod2=@{ChannellingDeath_mod2}}} {{mod3type=[[@{ChannellingDeath_modtype3}]]}} {{mod3=@{ChannellingDeath_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingDeath)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_channellingdeath" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_ChannellingDeathTaken" value="1" />
 						</div>
@@ -11524,9 +12504,14 @@
 								<input class="sheet-center" type="hidden" name="attr_ChannellingShadows" value="(@{ChannellingShadowsChar}+@{ChannellingShadowsAdv}+@{ChannellingShadowsMisc})*@{ChannellingShadowsTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_ChannellingShadowsD" value="(@{ChannellingShadowsChar}+@{ChannellingShadowsAdv}+@{ChannellingShadowsMisc}+(@{condgen_see_move}*-1))*@{ChannellingShadowsTaken}" disabled="true" />
 							</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingShadows" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-SHADOWS}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingShadowsChar}+@{ChannellingShadowsAdv}+@{ChannellingShadowsMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingShadows_modtype1}]]}} {{mod1=@{ChannellingShadows_mod1}}} {{mod2type=[[@{ChannellingShadows_modtype2}]]}} {{mod2=@{ChannellingShadows_mod2}}} {{mod3type=[[@{ChannellingShadows_modtype3}]]}} {{mod3=@{ChannellingShadows_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingShadows)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingShadows" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-SHADOWS}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingShadowsChar}+@{ChannellingShadowsAdv}+@{ChannellingShadowsMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingShadows_modtype1}]]}} {{mod1=@{ChannellingShadows_mod1}}} {{mod2type=[[@{ChannellingShadows_modtype2}]]}} {{mod2=@{ChannellingShadows_mod2}}} {{mod3type=[[@{ChannellingShadows_modtype3}]]}} {{mod3=@{ChannellingShadows_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingShadows)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_channellingshadows" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_ChannellingShadowsTaken" value="1" />
 						</div>
@@ -11623,9 +12608,14 @@
 								<input class="sheet-center" type="hidden" name="attr_ChannellingWitch" value="(@{ChannellingWitchChar}+@{ChannellingWitchAdv}+@{ChannellingWitchMisc})*@{ChannellingWitchTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_ChannellingWitchD" value="(@{ChannellingWitchChar}+@{ChannellingWitchAdv}+@{ChannellingWitchMisc}+(@{condgen_see_move}*-1))*@{ChannellingWitchTaken}" disabled="true" />
 							</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingWitch" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-WITCH}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingWitchChar}+@{ChannellingWitchAdv}+@{ChannellingWitchMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingWitch_modtype1}]]}} {{mod1=@{ChannellingWitch_mod1}}} {{mod2type=[[@{ChannellingWitch_modtype2}]]}} {{mod2=@{ChannellingWitch_mod2}}} {{mod3type=[[@{ChannellingWitch_modtype3}]]}} {{mod3=@{ChannellingWitch_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingWitch)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingWitch" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-WITCH}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingWitchChar}+@{ChannellingWitchAdv}+@{ChannellingWitchMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingWitch_modtype1}]]}} {{mod1=@{ChannellingWitch_mod1}}} {{mod2type=[[@{ChannellingWitch_modtype2}]]}} {{mod2=@{ChannellingWitch_mod2}}} {{mod3type=[[@{ChannellingWitch_modtype3}]]}} {{mod3=@{ChannellingWitch_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingWitch)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_channellingwitch" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_ChannellingWitchTaken" value="1" />
 						</div>
@@ -11723,9 +12713,14 @@
 								<input class="sheet-center" type="hidden" name="attr_ChannellingDark" value="(@{ChannellingDarkChar}+@{ChannellingDarkAdv}+@{ChannellingDarkMisc})*@{ChannellingDarkTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_ChannellingDarkD" value="(@{ChannellingDarkChar}+@{ChannellingDarkAdv}+@{ChannellingDarkMisc}+(@{condgen_see_move}*-1))*@{ChannellingDarkTaken}" disabled="true" />
 							</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingDark" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-DARK}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingDarkChar}+@{ChannellingDarkAdv}+@{ChannellingDarkMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingDark_modtype1}]]}} {{mod1=@{ChannellingDark_mod1}}} {{mod2type=[[@{ChannellingDark_modtype2}]]}} {{mod2=@{ChannellingDark_mod2}}} {{mod3type=[[@{ChannellingDark_modtype3}]]}} {{mod3=@{ChannellingDark_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingDark)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingDark" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-DARK}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingDarkChar}+@{ChannellingDarkAdv}+@{ChannellingDarkMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingDark_modtype1}]]}} {{mod1=@{ChannellingDark_mod1}}} {{mod2type=[[@{ChannellingDark_modtype2}]]}} {{mod2=@{ChannellingDark_mod2}}} {{mod3type=[[@{ChannellingDark_modtype3}]]}} {{mod3=@{ChannellingDark_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingDark)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_channellingdark" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_ChannellingDarkTaken" value="1" />
 						</div>
@@ -11823,9 +12818,14 @@
 								<input class="sheet-center" type="hidden" name="attr_ChannellingChaos" value="(@{ChannellingChaosChar}+@{ChannellingChaosAdv}+@{ChannellingChaosMisc})*@{ChannellingChaosTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_ChannellingChaosD" value="(@{ChannellingChaosChar}+@{ChannellingChaosAdv}+@{ChannellingChaosMisc}+(@{condgen_see_move}*-1))*@{ChannellingChaosTaken}" disabled="true" />
 							</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingChaos" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-CHAOS}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingChaosChar}+@{ChannellingChaosAdv}+@{ChannellingChaosMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingChaos_modtype1}]]}} {{mod1=@{ChannellingChaos_mod1}}} {{mod2type=[[@{ChannellingChaos_modtype2}]]}} {{mod2=@{ChannellingChaos_mod2}}} {{mod3type=[[@{ChannellingChaos_modtype3}]]}} {{mod3=@{ChannellingChaos_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingChaos)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingChaos" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-CHAOS}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingChaosChar}+@{ChannellingChaosAdv}+@{ChannellingChaosMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingChaos_modtype1}]]}} {{mod1=@{ChannellingChaos_mod1}}} {{mod2type=[[@{ChannellingChaos_modtype2}]]}} {{mod2=@{ChannellingChaos_mod2}}} {{mod3type=[[@{ChannellingChaos_modtype3}]]}} {{mod3=@{ChannellingChaos_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingChaos)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_channellingchaos" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_ChannellingChaosTaken" value="1" />
 						</div>
@@ -11922,9 +12922,14 @@
 								<input class="sheet-center" type="hidden" name="attr_ChannellingMisc" value="(@{ChannellingMiscChar}+@{ChannellingMiscAdv}+@{ChannellingMiscMisc})*@{ChannellingMiscTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_ChannellingMiscD" value="(@{ChannellingMiscChar}+@{ChannellingMiscAdv}+@{ChannellingMiscMisc}+(@{condgen_see_move}*-1))*@{ChannellingMiscTaken}" disabled="true" />
 							</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingMisc" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-MISC}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingMiscChar}+@{ChannellingMiscAdv}+@{ChannellingMiscMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingMisc_modtype1}]]}} {{mod1=@{ChannellingMisc_mod1}}} {{mod2type=[[@{ChannellingMisc_modtype2}]]}} {{mod2=@{ChannellingMisc_mod2}}} {{mod3type=[[@{ChannellingMisc_modtype3}]]}} {{mod3=@{ChannellingMisc_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingMisc)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingMisc" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-MISC}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingMiscChar}+@{ChannellingMiscAdv}+@{ChannellingMiscMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingMisc_modtype1}]]}} {{mod1=@{ChannellingMisc_mod1}}} {{mod2type=[[@{ChannellingMisc_modtype2}]]}} {{mod2=@{ChannellingMisc_mod2}}} {{mod3type=[[@{ChannellingMisc_modtype3}]]}} {{mod3=@{ChannellingMisc_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingMisc)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_channellingmisc" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_ChannellingMiscTaken" value="1" />
 						</div>
@@ -12021,9 +13026,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Evaluate" value="(@{EvaluateChar}+@{EvaluateAdv}+@{EvaluateMisc}+(@{condgen_see}*-1))*@{EvaluateTaken}" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Evaluate" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{EVALUATE}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{EvaluateChar}+@{EvaluateAdv}+@{EvaluateMisc})*@{EvaluateTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Evaluate_modtype1}]]}} {{mod1=@{Evaluate_mod1}}} {{mod2type=[[@{Evaluate_modtype2}]]}} {{mod2=@{Evaluate_mod2}}} {{mod3type=[[@{Evaluate_modtype3}]]}} {{mod3=@{Evaluate_mod3}}} {{reroll=@{RT-reroll}Evaluate)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Evaluate" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{EVALUATE}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{EvaluateChar}+@{EvaluateAdv}+@{EvaluateMisc})*@{EvaluateTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Evaluate_modtype1}]]}} {{mod1=@{Evaluate_mod1}}} {{mod2type=[[@{Evaluate_modtype2}]]}} {{mod2=@{Evaluate_mod2}}} {{mod3type=[[@{Evaluate_modtype3}]]}} {{mod3=@{Evaluate_mod3}}} {{reroll=@{RT-reroll}Evaluate)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Evaluate" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_EvaluateTaken" value="1" />
 						</div>
@@ -12117,9 +13127,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Heal" value="(@{HealChar}+@{HealAdv}+@{HealMisc}+(@{condgen_see}*-1))*@{HealTaken}" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Heal" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{HEAL}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{HealChar}+@{HealAdv}+@{HealMisc})*@{HealTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{healtest=1}} {{intBns=[[@{IntelligenceBonus}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Heal_modtype1}]]}} {{mod1=@{Heal_mod1}}} {{mod2type=[[@{Heal_modtype2}]]}} {{mod2=@{Heal_mod2}}} {{mod3type=[[@{Heal_modtype3}]]}} {{mod3=@{Heal_mod3}}} {{reroll=@{RT-reroll}Heal)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Heal" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{HEAL}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{HealChar}+@{HealAdv}+@{HealMisc})*@{HealTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{healtest=1}} {{intBns=[[@{IntelligenceBonus}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Heal_modtype1}]]}} {{mod1=@{Heal_mod1}}} {{mod2type=[[@{Heal_modtype2}]]}} {{mod2=@{Heal_mod2}}} {{mod3type=[[@{Heal_modtype3}]]}} {{mod3=@{Heal_mod3}}} {{reroll=@{RT-reroll}Heal)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Heal" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_HealTaken" value="1" />
 						</div>
@@ -12201,7 +13216,7 @@
 								<input type="checkbox" name="attr_LangMagickCareer" value="1">
 							</div>
 							<div class="sheet-col-3-8 sheet-pad-r-sm sheet-vert-middle">
-								<span data-i18n="LANG-MAGICK">Language (Magick)</span>
+								<span data-i18n="LANG-MAGICK">Language (Magick)</span><span  data-i18n-title="SKILLADV" title="Modified by Advantage" style="margin-left: 5px; font-family: pictos; color: gold; font-size: 10px; padding-bottom: 2px; vertical-align: top">S</span>
 							</div>
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 								<select class="sheet-select-no-arrow-center" name="attr_LangMagickChar">
@@ -12228,9 +13243,14 @@
 								<input class="sheet-center" type="hidden" name="attr_LangMagick" value="(@{LangMagickChar}+@{LangMagickAdv}+@{LangMagickMisc})*@{LangMagickTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_LangMagickD" value="(@{Advantage}*10*@{Advantage_casting})+(@{LangMagickChar}+@{LangMagickAdv}+@{LangMagickMisc}+(@{condgen_see}*-1))*@{LangMagickTaken}" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_LangMagick" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{rolltype=[[5]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{LANG-MAGICK}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{LangMagick}]] [SKILL] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{LangMagick_modtype1}]]}} {{mod1=@{LangMagick_mod1}}} {{mod2type=[[@{LangMagick_modtype2}]]}} {{mod2=@{LangMagick_mod2}}} {{mod3type=[[@{LangMagick_modtype3}]]}} {{mod3=@{LangMagick_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RT-reroll}LangMagick)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_LangMagick" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{rolltype=[[5]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{LANG-MAGICK}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{LangMagick}]] [SKILL] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{LangMagick_modtype1}]]}} {{mod1=@{LangMagick_mod1}}} {{mod2type=[[@{LangMagick_modtype2}]]}} {{mod2=@{LangMagick_mod2}}} {{mod3type=[[@{LangMagick_modtype3}]]}} {{mod3=@{LangMagick_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RT-reroll}LangMagick)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_LangMagick" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_LangMagickTaken" value="1" />
 						</div>
@@ -12295,6 +13315,7 @@
 					</div>			
 						
 						
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-row">
 							<fieldset class="repeating_language">
 								<div class="sheet-row">
@@ -12332,7 +13353,7 @@
 										<input class="sheet-center" type="number" name="attr_Language" value="(@{LanguageChar}+@{LanguageAdv}+@{LanguageMisc}+(@{condgen_see}*-1))*@{LanguageTaken}" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_Language" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{LanguageSpecialization}}} {{title=@{LanguageSpecialization}}} {{skill=^{LANGUAGE}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{LanguageChar}+@{LanguageAdv}+@{LanguageMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Language_modtype1}]]}} {{mod1=@{Language_mod1}}} {{mod2type=[[@{Language_modtype2}]]}} {{mod2=@{Language_mod2}}} {{mod3type=[[@{Language_modtype3}]]}} {{mod3=@{Language_mod3}}} {{reroll=@{RT-rep}Language)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_Language" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{LanguageSpecialization}}} {{skill=^{LANGUAGE}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{LanguageChar}+@{LanguageAdv}+@{LanguageMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Language_modtype1}]]}} {{mod1=@{Language_mod1}}} {{mod2type=[[@{Language_modtype2}]]}} {{mod2=@{Language_mod2}}} {{mod3type=[[@{Language_modtype3}]]}} {{mod3=@{Language_mod3}}} {{reroll=@{RT-rep}Language)}}"></button>
 						</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_LanguageTaken" value="1" />
@@ -12394,12 +13415,122 @@
 					</div>			
 							</fieldset>
 						</div>
+						
+												
+						
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-row">
+							<fieldset class="repeating_language">
+								<div class="sheet-row">
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input type="checkbox" name="attr_LanguageCareer" value="1" />
+									</div>
+									<div class="sheet-col-3-8 sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" class="sheet-center" type="text" name="attr_LanguageSpecialization" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<select class="sheet-select-no-arrow-center" name="attr_LanguageChar">
+											<option value="(@{WeaponSkill}+@{WeaponSkillMod})" data-i18n="ABBREVIATE-WEAPON-SKILL">WS</option>
+											<option value="(@{BallisticSkill}+@{BallisticSkillMod})" data-i18n="ABBREVIATE-BALLISTIC-SKILL">BS</option>
+											<option value="(@{Strength}+@{StrengthMod})" data-i18n="ABBREVIATE-STRENGTH">S</option>
+											<option value="(@{Toughness}+@{ToughnessMod})" data-i18n="ABBREVIATE-TOUGHNESS">T</option>
+											<option value="(@{Initiative}+@{InitiativeMod})" data-i18n="ABBREVIATE-INITIATIVE">I</option>
+											<option value="(@{Agility}+@{AgilityMod})" data-i18n="ABBREVIATE-AGILITY">Ag</option>
+											<option value="(@{Dexterity}+@{DexterityMod})" data-i18n="ABBREVIATE-DEXTERITY">Dex</option>
+											<option value="(@{Intelligence}+@{IntelligenceMod})" data-i18n="ABBREVIATE-INTELLIGENCE" selected="selected">Int</option>
+											<option value="(@{WillPower}+@{WillPowerMod})" data-i18n="ABBREVIATE-WILL-POWER">Wp</option>
+											<option value="(@{Fellowship}+@{FellowshipMod})" data-i18n="ABBREVIATE-FELLOWSHIP">Fel</option>
+										</select>
+									</div>
+								<input class="sheet-hidden" type="textarea" name="attr_Skill_rep_ID" />
+										<input class="sheet-hidden" type="number" name="attr_LanguageSpecializationXP" value="0" readonly />
+										<input class="sheet-hidden" type="textarea" name="attr_LanguageSpecializationDis" value="0" readonly />
+								<input class="sheet-hidden" type="textarea" name="attr_RT-rep" value="[1](~@{character_name}|repeating_Language_@{Skill_rep_ID}_" />
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_LanguageAdv" value="0" min="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_LanguageMisc" value="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_Language" value="(@{LanguageChar}+@{LanguageAdv}+@{LanguageMisc}+(@{condgen_see}*-1))*@{LanguageTaken}" disabled="true" />
+									</div>
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_language" style="font-family: dicefontd20;">t</button>
+							</div>
+						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
+							<input type="checkbox" name="attr_LanguageTaken" value="1" />
+						</div>
+              <label class="sheet-col-1-30 talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_Language_settings_hide" value="0"/>		
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_Language_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_Language_settings_hide" class="sheet-hidden sheet-hider" value="1" />
+			<div class="Language_cust_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Language_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Language_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Language_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Language_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Language_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Language_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>								
+							<span class="sheet-spacer"></span>	
+           </div>				
+		</div>				
+					</div>			
+							</fieldset>
+						</div>
+						
+						
+						
+						
 					</div>	
 					<div class="sheet-row sheet-area-border">
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle"><span>&nbsp;</span></div>
 						<div class="sheet-col-3-8 sheet-vert-middle">
 							<span data-i18n="LORE" class="sheet-italic">Lore</span>
 						</div>
+						
+						
+	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-row">
 							<fieldset class="repeating_lore">
 								<div class="sheet-row">
@@ -12437,7 +13568,7 @@
 										<input class="sheet-center" type="number" name="attr_Lore" value="(@{LoreChar}+@{LoreAdv}+@{LoreMisc}+(@{condgen_see}*-1))*@{LoreTaken}" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_Lore" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{LoreSpecialization}}} {{title=@{LoreSpecialization}}} {{skill=^{LORE}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{LoreChar}+@{LoreAdv}+@{LoreMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Lore_modtype1}]]}} {{mod1=@{Lore_mod1}}} {{mod2type=[[@{Lore_modtype2}]]}} {{mod2=@{Lore_mod2}}} {{mod3type=[[@{Lore_modtype3}]]}} {{mod3=@{Lore_mod3}}} {{reroll=@{RT-rep}Lore)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_Lore" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{LoreSpecialization}}} {{title=@{LoreSpecialization}}} {{skill=^{LORE}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{LoreChar}+@{LoreAdv}+@{LoreMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Lore_modtype1}]]}} {{mod1=@{Lore_mod1}}} {{mod2type=[[@{Lore_modtype2}]]}} {{mod2=@{Lore_mod2}}} {{mod3type=[[@{Lore_modtype3}]]}} {{mod3=@{Lore_mod3}}} {{reroll=@{RT-rep}Lore)}}"></button>
 						</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_LoreTaken" value="1" />
@@ -12499,12 +13630,118 @@
 					</div>	
 							</fieldset>
 						</div>
+						
+<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-row">
+							<fieldset class="repeating_lore">
+								<div class="sheet-row">
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input type="checkbox" name="attr_LoreCareer" value="1" />
+									</div>
+									<div class="sheet-col-3-8 sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="text" name="attr_LoreSpecialization" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<select class="sheet-select-no-arrow-center" name="attr_LoreChar">
+											<option value="(@{WeaponSkill}+@{WeaponSkillMod})" data-i18n="ABBREVIATE-WEAPON-SKILL">WS</option>
+											<option value="(@{BallisticSkill}+@{BallisticSkillMod})" data-i18n="ABBREVIATE-BALLISTIC-SKILL">BS</option>
+											<option value="(@{Strength}+@{StrengthMod})" data-i18n="ABBREVIATE-STRENGTH">S</option>
+											<option value="(@{Toughness}+@{ToughnessMod})" data-i18n="ABBREVIATE-TOUGHNESS">T</option>
+											<option value="(@{Initiative}+@{InitiativeMod})" data-i18n="ABBREVIATE-INITIATIVE">I</option>
+											<option value="(@{Agility}+@{AgilityMod})" data-i18n="ABBREVIATE-AGILITY">Ag</option>
+											<option value="(@{Dexterity}+@{DexterityMod})" data-i18n="ABBREVIATE-DEXTERITY">Dex</option>
+											<option value="(@{Intelligence}+@{IntelligenceMod})" data-i18n="ABBREVIATE-INTELLIGENCE" selected="selected">Int</option>
+											<option value="(@{WillPower}+@{WillPowerMod})" data-i18n="ABBREVIATE-WILL-POWER">Wp</option>
+											<option value="(@{Fellowship}+@{FellowshipMod})" data-i18n="ABBREVIATE-FELLOWSHIP">Fel</option>
+										</select>
+									</div>
+								<input class="sheet-hidden" type="textarea" name="attr_Skill_rep_ID" />
+										<input class="sheet-hidden" type="number" name="attr_LoreSpecializationXP" value="0" readonly />
+										<input class="sheet-hidden" type="textarea" name="attr_LoreSpecializationDis" value="0" readonly />
+								<input class="sheet-hidden" type="textarea" name="attr_RT-rep" value="[1](~@{character_name}|repeating_Lore_@{Skill_rep_ID}_" />
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_LoreAdv" value="0" min="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_LoreMisc" value="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_Lore" value="(@{LoreChar}+@{LoreAdv}+@{LoreMisc}+(@{condgen_see}*-1))*@{LoreTaken}" disabled="true" />
+									</div>
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_lore" style="font-family: dicefontd20;">t</button>
+							</div>
+						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
+							<input type="checkbox" name="attr_LoreTaken" value="1" />
+						</div>
+              <label class="sheet-col-1-30 talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_Lore_settings_hide" value="0"/>		
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_Lore_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_Lore_settings_hide" class="sheet-hidden sheet-hider" value="1" />
+			<div class="Lore_cust_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Lore_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Lore_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Lore_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Lore_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Lore_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Lore_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>								
+							<span class="sheet-spacer"></span>	
+           </div>				
+		</div>				
+					</div>	
+							</fieldset>
+						</div>						
+						
 					</div>
 					<div class="sheet-row sheet-area-border">
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle"><span>&nbsp;</span></div>
 						<div class="sheet-col-3-8 sheet-vert-middle">
 							<span data-i18n="PERFORM" class="sheet-italic">Perform</span>
 						</div>
+						
+						
+						
+<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-row">
 							<fieldset class="repeating_perform">
 								<div class="sheet-row">
@@ -12515,7 +13752,7 @@
 										<input class="sheet-center" type="text" name="attr_PerformSpecialization" />
 									</div>
 									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<select class="sheet-select-no-arrow-center" name="attr_PerformSpecializationChar">
+										<select class="sheet-select-no-arrow-center" name="attr_PerformChar">
 											<option value="(@{WeaponSkill}+@{WeaponSkillMod})" data-i18n="ABBREVIATE-WEAPON-SKILL">WS</option>
 											<option value="(@{BallisticSkill}+@{BallisticSkillMod})" data-i18n="ABBREVIATE-BALLISTIC-SKILL">BS</option>
 											<option value="(@{Strength}+@{StrengthMod})" data-i18n="ABBREVIATE-STRENGTH">S</option>
@@ -12539,10 +13776,10 @@
 										<input class="sheet-center" type="number" name="attr_PerformMisc" value="0" />
 									</div>
 									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<input class="sheet-center" type="number" name="attr_Perform" value="(@{PerformSpecializationChar}+@{PerformAdv}+@{PerformMisc}+(@{condgen_see_move}*-1))*@{PerformTaken}" disabled="true" />
+										<input class="sheet-center" type="number" name="attr_Perform" value="(@{PerformChar}+@{PerformAdv}+@{PerformMisc}+(@{condgen_see_move}*-1))*@{PerformTaken}" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_Perform" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{PerformSpecialization}}} {{title=@{PerformSpecialization}}} {{skill=^{PERFORM}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{PerformSpecializationChar}+@{PerformAdv}+@{PerformMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perform_modtype1}]]}} {{mod1=@{Perform_mod1}}} {{mod2type=[[@{Perform_modtype2}]]}} {{mod2=@{Perform_mod2}}} {{mod3type=[[@{Perform_modtype3}]]}} {{mod3=@{Perform_mod3}}} {{reroll=@{RT-rep}Perform)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_Perform" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{PerformSpecialization}}} {{skill=^{PERFORM}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{PerformChar}+@{PerformAdv}+@{PerformMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perform_modtype1}]]}} {{mod1=@{Perform_mod1}}} {{mod2type=[[@{Perform_modtype2}]]}} {{mod2=@{Perform_mod2}}} {{mod3type=[[@{Perform_modtype3}]]}} {{mod3=@{Perform_mod3}}} {{reroll=@{RT-rep}Perform)}}"></button>
 						</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_PerformTaken" value="1" />
@@ -12604,6 +13841,108 @@
 					</div>	
 							</fieldset>
 						</div>
+						
+<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-row">
+							<fieldset class="repeating_perform">
+								<div class="sheet-row">
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input type="checkbox" name="attr_PerformCareer" value="1" />
+									</div>
+									<div class="sheet-col-3-8 sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="text" name="attr_PerformSpecialization" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<select class="sheet-select-no-arrow-center" name="attr_PerformChar">
+											<option value="(@{WeaponSkill}+@{WeaponSkillMod})" data-i18n="ABBREVIATE-WEAPON-SKILL">WS</option>
+											<option value="(@{BallisticSkill}+@{BallisticSkillMod})" data-i18n="ABBREVIATE-BALLISTIC-SKILL">BS</option>
+											<option value="(@{Strength}+@{StrengthMod})" data-i18n="ABBREVIATE-STRENGTH">S</option>
+											<option value="(@{Toughness}+@{ToughnessMod})" data-i18n="ABBREVIATE-TOUGHNESS">T</option>
+											<option value="(@{Initiative}+@{InitiativeMod})" data-i18n="ABBREVIATE-INITIATIVE">I</option>
+											<option value="(@{Agility}+@{AgilityMod})" data-i18n="ABBREVIATE-AGILITY" selected="selected">Ag</option>
+											<option value="(@{Dexterity}+@{DexterityMod})" data-i18n="ABBREVIATE-DEXTERITY">Dex</option>
+											<option value="(@{Intelligence}+@{IntelligenceMod})" data-i18n="ABBREVIATE-INTELLIGENCE">Int</option>
+											<option value="(@{WillPower}+@{WillPowerMod})" data-i18n="ABBREVIATE-WILL-POWER">Wp</option>
+											<option value="(@{Fellowship}+@{FellowshipMod})" data-i18n="ABBREVIATE-FELLOWSHIP">Fel</option>
+										</select>
+									</div>
+								<input class="sheet-hidden" type="textarea" name="attr_Skill_rep_ID" />
+										<input class="sheet-hidden" type="number" name="attr_PerformSpecializationXP" value="0" readonly />
+										<input class="sheet-hidden" type="textarea" name="attr_PerformSpecializationDis" value="0" readonly />
+								<input class="sheet-hidden" type="textarea" name="attr_RT-rep" value="[1](~@{character_name}|repeating_Perform_@{Skill_rep_ID}_" />
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_PerformAdv" value="0" min="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_PerformMisc" value="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_Perform" value="(@{PerformChar}+@{PerformAdv}+@{PerformMisc}+(@{condgen_see_move}*-1))*@{PerformTaken}" disabled="true" />
+									</div>
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_perform" style="font-family: dicefontd20;">t</button>
+							</div>
+						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
+							<input type="checkbox" name="attr_PerformTaken" value="1" />
+						</div>
+              <label class="sheet-col-1-30 talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_Perform_settings_hide" value="0"/>		
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_Perform_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_Perform_settings_hide" class="sheet-hidden sheet-hider" value="1" />
+			<div class="Art_cust_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Perform_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Perform_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Perform_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Perform_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Perform_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Perform_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>								
+							<span class="sheet-spacer"></span>	
+           </div>				
+		</div>				
+					</div>	
+							</fieldset>
+						</div>						
+						
 					</div>
 					
 					
@@ -12638,9 +13977,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_PickLock" value="(@{PickLockChar}+@{PickLockAdv}+@{PickLockMisc}+(@{condgen_see}*-1))*@{PickLockTaken}" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_PickLock" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PICK-LOCK}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[@{PickLockChar}+@{PickLockAdv}+@{PickLockMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{PickLock_modtype1}]]}} {{mod1=@{PickLock_mod1}}} {{mod2type=[[@{PickLock_modtype2}]]}} {{mod2=@{PickLock_mod2}}} {{mod3type=[[@{PickLock_modtype3}]]}} {{mod3=@{PickLock_mod3}}} {{reroll=@{RT-reroll}PickLock)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_PickLock" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PICK-LOCK}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[@{PickLockChar}+@{PickLockAdv}+@{PickLockMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{PickLock_modtype1}]]}} {{mod1=@{PickLock_mod1}}} {{mod2type=[[@{PickLock_modtype2}]]}} {{mod2=@{PickLock_mod2}}} {{mod3type=[[@{PickLock_modtype3}]]}} {{mod3=@{PickLock_mod3}}} {{reroll=@{RT-reroll}PickLock)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_PickLock" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_PickLockTaken" value="1" />
 						</div>
@@ -12706,6 +14050,8 @@
 						<div class="sheet-col-3-8 sheet-vert-middle">
 							<span data-i18n="PLAY" class="sheet-italic">Play</span>
 						</div>
+						
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-row">
 							<fieldset class="repeating_play">
 								<div class="sheet-row">
@@ -12740,10 +14086,10 @@
 										<input class="sheet-center" type="number" name="attr_PlayMisc" value="0" />
 									</div>
 									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<input class="sheet-center" type="number" name="attr_Play" value="(@{PlaySpecializationChar}+@{PlayAdv}+@{PlayMisc}+(@{condgen_see}*-1))*@{PlayTaken}" disabled="true" />
+										<input class="sheet-center" type="number" name="attr_Play" value="(@{PlayChar}+@{PlayAdv}+@{PlayMisc}+(@{condgen_see}*-1))*@{PlayTaken}" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_Play" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{PlaySpecialization}}} {{title=@{PlaySpecialization}}} {{skill=^{PLAY}}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[@{PlaySpecializationChar}+@{PlayAdv}+@{PlayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Play_modtype1}]]}} {{mod1=@{Play_mod1}}} {{mod2type=[[@{Play_modtype2}]]}} {{mod2=@{Play_mod2}}} {{mod3type=[[@{Play_modtype3}]]}} {{mod3=@{Play_mod3}}} {{reroll=@{RT-rep}Play)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_Play" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{PlaySpecialization}}} {{title=@{PlaySpecialization}}} {{skill=^{PLAY}}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[@{PlaySpecializationChar}+@{PlayAdv}+@{PlayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Play_modtype1}]]}} {{mod1=@{Play_mod1}}} {{mod2type=[[@{Play_modtype2}]]}} {{mod2=@{Play_mod2}}} {{mod3type=[[@{Play_modtype3}]]}} {{mod3=@{Play_mod3}}} {{reroll=@{RT-rep}Play)}}"></button>
 						</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_PlayTaken" value="1" />
@@ -12805,6 +14151,110 @@
 					</div>	
 							</fieldset>
 						</div>
+						
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-row">
+							<fieldset class="repeating_play">
+								<div class="sheet-row">
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input type="checkbox" name="attr_PlayCareer" value="1" />
+									</div>
+									<div class="sheet-col-3-8 sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="text" name="attr_PlaySpecialization" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<select class="sheet-select-no-arrow-center" name="attr_PlayChar">
+											<option value="(@{WeaponSkill}+@{WeaponSkillMod})" data-i18n="ABBREVIATE-WEAPON-SKILL">WS</option>
+											<option value="(@{BallisticSkill}+@{BallisticSkillMod})" data-i18n="ABBREVIATE-BALLISTIC-SKILL">BS</option>
+											<option value="(@{Strength}+@{StrengthMod})" data-i18n="ABBREVIATE-STRENGTH">S</option>
+											<option value="(@{Toughness}+@{ToughnessMod})" data-i18n="ABBREVIATE-TOUGHNESS">T</option>
+											<option value="(@{Initiative}+@{InitiativeMod})" data-i18n="ABBREVIATE-INITIATIVE">I</option>
+											<option value="(@{Agility}+@{AgilityMod})" data-i18n="ABBREVIATE-AGILITY">Ag</option>
+											<option value="(@{Dexterity}+@{DexterityMod})" data-i18n="ABBREVIATE-DEXTERITY" selected="selected">Dex</option>
+											<option value="(@{Intelligence}+@{IntelligenceMod})" data-i18n="ABBREVIATE-INTELLIGENCE">Int</option>
+											<option value="(@{WillPower}+@{WillPowerMod})" data-i18n="ABBREVIATE-WILL-POWER">Wp</option>
+											<option value="(@{Fellowship}+@{FellowshipMod})" data-i18n="ABBREVIATE-FELLOWSHIP">Fel</option>
+										</select>
+									</div>
+								<input class="sheet-hidden" type="textarea" name="attr_Skill_rep_ID" />
+										<input class="sheet-hidden" type="number" name="attr_PlaySpecializationXP" value="0" readonly />
+										<input class="sheet-hidden" type="textarea" name="attr_PlaySpecializationDis" value="0" readonly />
+								<input class="sheet-hidden" type="textarea" name="attr_RT-rep" value="[1](~@{character_name}|repeating_Play_@{Skill_rep_ID}_" />
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_PlayAdv" value="0" min="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_PlayMisc" value="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_Play" value="(@{PlayChar}+@{PlayAdv}+@{PlayMisc}+(@{condgen_see}*-1))*@{PlayTaken}" disabled="true" />
+									</div>
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_play" style="font-family: dicefontd20;">t</button>
+							</div>
+						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
+							<input type="checkbox" name="attr_PlayTaken" value="1" />
+						</div>
+              <label class="sheet-col-1-30 talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_Play_settings_hide" value="0"/>		
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_Play_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_Play_settings_hide" class="sheet-hidden sheet-hider" value="1" />
+			<div class="Art_cust_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Play_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Play_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Play_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Play_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Play_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Play_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>								
+							<span class="sheet-spacer"></span>	
+           </div>				
+		</div>				
+					</div>	
+							</fieldset>
+						</div>						
+						
+						
+						
 					</div>
 					
 						<!-- Pray -->
@@ -12839,9 +14289,14 @@
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 								<input class="sheet-center" type="number" name="attr_Pray" value="(@{PrayChar}+@{PrayAdv}+@{PrayMisc}+(@{condgen}*-1))*@{PrayTaken}" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_Pray" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=^{PRAY}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{rolltype=[[5]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Pray_modtype1}]]}} {{mod1=@{Pray_mod1}}} {{mod2type=[[@{Pray_modtype2}]]}} {{mod2=@{Pray_mod2}}} {{mod3type=[[@{Pray_modtype3}]]}} {{mod3=@{Pray_mod3}}} {{NPC=[[0]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}Pray)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_Pray" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=^{PRAY}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{rolltype=[[5]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Pray_modtype1}]]}} {{mod1=@{Pray_mod1}}} {{mod2type=[[@{Pray_modtype2}]]}} {{mod2=@{Pray_mod2}}} {{mod3type=[[@{Pray_modtype3}]]}} {{mod3=@{Pray_mod3}}} {{NPC=[[0]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}Pray)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Pray" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_PrayTaken" value="1" />
 						</div>
@@ -12909,7 +14364,7 @@
 		<input class="talsetshow-check__hide" type="checkbox" name="attr_Ranged_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
               </label>
 						<div class="sheet-col-1-7 sheet-vert-middle">
-							<span data-i18n="RANGED" class="sheet-italic">Ranged</span>
+							<span data-i18n="RANGED" class="sheet-italic">Ranged</span><span  data-i18n-title="SKILLADV" title="Modified by Advantage" style="margin-left: 5px; font-family: pictos; color: gold; font-size: 10px; padding-bottom: 2px; vertical-align: top">S</span>
 						</div>
 		
 				<input type="checkbox" name="attr_Ranged_settings_hide" class="sheet-hidden sheet-hider" value="1" />	
@@ -13019,9 +14474,14 @@
 								<input class="sheet-center" type="hidden" name="attr_RangedBlackpowder" value="(@{RangedBlackpowderChar}+@{RangedBlackpowderAdv}+@{RangedBlackpowderMisc})*@{RangedBlackpowderTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_RangedBlackpowderD" value="(@{RangedBlackpowderChar}+@{RangedBlackpowderAdv}+@{RangedBlackpowderMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1))*@{RangedBlackpowderTaken}" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_RangedBlackpowder" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{RANGED-BLACKPOWDER}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedBlackpowder}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedBlackpowder_modtype1}]]}} {{mod1=@{RangedBlackpowder_mod1}}} {{mod2type=[[@{RangedBlackpowder_modtype2}]]}} {{mod2=@{RangedBlackpowder_mod2}}} {{mod3type=[[@{RangedBlackpowder_modtype3}]]}} {{mod3=@{RangedBlackpowder_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedBlackpowder)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_RangedBlackpowder" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{RANGED-BLACKPOWDER}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedBlackpowder}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedBlackpowder_modtype1}]]}} {{mod1=@{RangedBlackpowder_mod1}}} {{mod2type=[[@{RangedBlackpowder_modtype2}]]}} {{mod2=@{RangedBlackpowder_mod2}}} {{mod3type=[[@{RangedBlackpowder_modtype3}]]}} {{mod3=@{RangedBlackpowder_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedBlackpowder)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_RangedBlackpowder" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_RangedBlackpowderTaken" value="1" />
 						</div>
@@ -13114,9 +14574,14 @@
 								<input class="sheet-center" type="hidden" name="attr_RangedBow" value="(@{RangedBowChar}+@{RangedBowAdv}+@{RangedBowMisc})*@{RangedBowTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_RangedBowD" value="(@{RangedBowChar}+@{RangedBowAdv}+@{RangedBowMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1))*@{RangedBowTaken}" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_RangedBow" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-BOW}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedBow}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedBow_modtype1}]]}} {{mod1=@{RangedBow_mod1}}} {{mod2type=[[@{RangedBow_modtype2}]]}} {{mod2=@{RangedBow_mod2}}} {{mod3type=[[@{RangedBow_modtype3}]]}} {{mod3=@{RangedBow_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedBow)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_RangedBow" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-BOW}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedBow}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedBow_modtype1}]]}} {{mod1=@{RangedBow_mod1}}} {{mod2type=[[@{RangedBow_modtype2}]]}} {{mod2=@{RangedBow_mod2}}} {{mod3type=[[@{RangedBow_modtype3}]]}} {{mod3=@{RangedBow_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedBow)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_RangedBow" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_RangedBowTaken" value="1" />
 						</div>
@@ -13209,9 +14674,14 @@
 								<input class="sheet-center" type="hidden" name="attr_RangedCrossbow" value="(@{RangedCrossbowChar}+@{RangedCrossbowAdv}+@{RangedCrossbowMisc})" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_RangedCrossbowD" value="(@{RangedCrossbowChar}+@{RangedCrossbowAdv}+@{RangedCrossbowMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1))" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_RangedCrossbow" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-CROSSBOW}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedCrossbow}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedCrossbow_modtype1}]]}} {{mod1=@{RangedCrossbow_mod1}}} {{mod2type=[[@{RangedCrossbow_modtype2}]]}} {{mod2=@{RangedCrossbow_mod2}}} {{mod3type=[[@{RangedCrossbow_modtype3}]]}} {{mod3=@{RangedCrossbow_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedCrossbow)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_RangedCrossbow" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-CROSSBOW}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedCrossbow}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedCrossbow_modtype1}]]}} {{mod1=@{RangedCrossbow_mod1}}} {{mod2type=[[@{RangedCrossbow_modtype2}]]}} {{mod2=@{RangedCrossbow_mod2}}} {{mod3type=[[@{RangedCrossbow_modtype3}]]}} {{mod3=@{RangedCrossbow_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedCrossbow)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_RangedCrossbow" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_RangedCrossbowTaken" value="1" />
 						</div>
@@ -13306,9 +14776,14 @@
 								<input class="sheet-center" type="hidden" name="attr_RangedEngineering" value="(@{RangedEngineeringChar}+@{RangedEngineeringAdv}+@{RangedEngineeringMisc})*@{RangedEngineeringTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_RangedEngineeringD" value="(@{RangedEngineeringChar}+@{RangedEngineeringAdv}+@{RangedEngineeringMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1))*@{RangedEngineeringTaken}" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_RangedEngineering" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-ENGINEERING}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedEngineering}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedEngineering_modtype1}]]}} {{mod1=@{RangedEngineering_mod1}}} {{mod2type=[[@{RangedEngineering_modtype2}]]}} {{mod2=@{RangedEngineering_mod2}}} {{mod3type=[[@{RangedEngineering_modtype3}]]}} {{mod3=@{RangedEngineering_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedEngineering)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_RangedEngineering" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-ENGINEERING}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedEngineering}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedEngineering_modtype1}]]}} {{mod1=@{RangedEngineering_mod1}}} {{mod2type=[[@{RangedEngineering_modtype2}]]}} {{mod2=@{RangedEngineering_mod2}}} {{mod3type=[[@{RangedEngineering_modtype3}]]}} {{mod3=@{RangedEngineering_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedEngineering)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_RangedEngineering" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_RangedEngineeringTaken" value="1" />
 						</div>
@@ -13403,9 +14878,14 @@
 								<input class="sheet-center" type="hidden" name="attr_RangedEntangling" value="(@{RangedEntanglingChar}+@{RangedEntanglingAdv}+@{RangedEntanglingMisc})*@{RangedEntanglingTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_RangedEntanglingD" value="(@{RangedEntanglingChar}+@{RangedEntanglingAdv}+@{RangedEntanglingMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1))*@{RangedEntanglingTaken}" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_RangedEntangling" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-ENTANGLING}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedEntangling}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedEntangling_modtype1}]]}} {{mod1=@{RangedEntangling_mod1}}} {{mod2type=[[@{RangedEntangling_modtype2}]]}} {{mod2=@{RangedEntangling_mod2}}} {{mod3type=[[@{RangedEntangling_modtype3}]]}} {{mod3=@{RangedEntangling_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedEntangling)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_RangedEntangling" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-ENTANGLING}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedEntangling}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedEntangling_modtype1}]]}} {{mod1=@{RangedEntangling_mod1}}} {{mod2type=[[@{RangedEntangling_modtype2}]]}} {{mod2=@{RangedEntangling_mod2}}} {{mod3type=[[@{RangedEntangling_modtype3}]]}} {{mod3=@{RangedEntangling_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedEntangling)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_RangedEntangling" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_RangedEntanglingTaken" value="1" />
 						</div>
@@ -13500,9 +14980,14 @@
 								<input class="sheet-center" type="hidden" name="attr_RangedExplosives" value="(@{RangedExplosivesChar}+@{RangedExplosivesAdv}+@{RangedExplosivesMisc})*@{RangedExplosivesTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_RangedExplosivesD" value="(@{RangedExplosivesChar}+@{RangedExplosivesAdv}+@{RangedExplosivesMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1))*@{RangedExplosivesTaken}" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_RangedExplosives" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-EXPLOSIVES}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedExplosives}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedExplosives_modtype1}]]}} {{mod1=@{RangedExplosives_mod1}}} {{mod2type=[[@{RangedExplosives_modtype2}]]}} {{mod2=@{RangedExplosives_mod2}}} {{mod3type=[[@{RangedExplosives_modtype3}]]}} {{mod3=@{RangedExplosives_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedExplosives)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_RangedExplosives" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-EXPLOSIVES}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedExplosives}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedExplosives_modtype1}]]}} {{mod1=@{RangedExplosives_mod1}}} {{mod2type=[[@{RangedExplosives_modtype2}]]}} {{mod2=@{RangedExplosives_mod2}}} {{mod3type=[[@{RangedExplosives_modtype3}]]}} {{mod3=@{RangedExplosives_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedExplosives)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_RangedExplosives" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_RangedExplosivesTaken" value="1" />
 						</div>
@@ -13599,9 +15084,14 @@
 								<input class="sheet-center" type="hidden" name="attr_RangedSling" value="(@{RangedSlingChar}+@{RangedSlingAdv}+@{RangedSlingMisc})*@{RangedSlingTaken}" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_RangedSlingD" value="(@{RangedSlingChar}+@{RangedSlingAdv}+@{RangedSlingMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1))*@{RangedSlingTaken}" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_RangedSling" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-SLING}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedSling}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedSling_modtype1}]]}} {{mod1=@{RangedSling_mod1}}} {{mod2type=[[@{RangedSling_modtype2}]]}} {{mod2=@{RangedSling_mod2}}} {{mod3type=[[@{RangedSling_modtype3}]]}} {{mod3=@{RangedSling_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedSling)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_RangedSling" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-SLING}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedSling}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedSling_modtype1}]]}} {{mod1=@{RangedSling_mod1}}} {{mod2type=[[@{RangedSling_modtype2}]]}} {{mod2=@{RangedSling_mod2}}} {{mod3type=[[@{RangedSling_modtype3}]]}} {{mod3=@{RangedSling_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedSling)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_RangedSling" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_RangedSlingTaken" value="1" />
 						</div>
@@ -13696,9 +15186,14 @@
 								<input class="sheet-center" type="hidden" name="attr_RangedThrowing" value="(@{RangedThrowingChar}+@{RangedThrowingAdv}+@{RangedThrowingMisc})" disabled="true" />
 								<input class="sheet-center" type="number" name="attr_RangedThrowingD" value="(@{RangedThrowingChar}+@{RangedThrowingAdv}+@{RangedThrowingMisc}+(@{Advantage}*10)+(@{condgen_see_move}*-1))" disabled="true" />
 							</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_RangedThrowing" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-THROWING}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedThrowing}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedThrowing_modtype1}]]}} {{mod1=@{RangedThrowing_mod1}}} {{mod2type=[[@{RangedThrowing_modtype2}]]}} {{mod2=@{RangedThrowing_mod2}}} {{mod3type=[[@{RangedThrowing_modtype3}]]}} {{mod3=@{RangedThrowing_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedThrowing)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_RangedThrowing" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-THROWING}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedThrowing}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedThrowing_modtype1}]]}} {{mod1=@{RangedThrowing_mod1}}} {{mod2type=[[@{RangedThrowing_modtype2}]]}} {{mod2=@{RangedThrowing_mod2}}} {{mod3type=[[@{RangedThrowing_modtype3}]]}} {{mod3=@{RangedThrowing_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedThrowing)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_RangedThrowing" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_RangedThrowingTaken" value="1" />
 						</div>
@@ -13796,9 +15291,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Research" value="(@{ResearchChar}+@{ResearchAdv}+@{ResearchMisc}+(@{condgen_see}*-1))*@{ResearchTaken}" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Research" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{RESEARCH}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{ResearchChar}+@{ResearchAdv}+@{ResearchMisc})*@{ResearchTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Research_modtype1}]]}} {{mod1=@{Research_mod1}}} {{mod2type=[[@{Research_modtype2}]]}} {{mod2=@{Research_mod2}}} {{mod3type=[[@{Research_modtype3}]]}} {{mod3=@{Research_mod3}}} {{reroll=@{RT-reroll}Research)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Research" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{RESEARCH}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{ResearchChar}+@{ResearchAdv}+@{ResearchMisc})*@{ResearchTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Research_modtype1}]]}} {{mod1=@{Research_mod1}}} {{mod2type=[[@{Research_modtype2}]]}} {{mod2=@{Research_mod2}}} {{mod3type=[[@{Research_modtype3}]]}} {{mod3=@{Research_mod3}}} {{reroll=@{RT-reroll}Research)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Research" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_ResearchTaken" value="1" />
 						</div>
@@ -13864,6 +15364,9 @@
 						<div class="sheet-col-3-8 sheet-vert-middle">
 							<span data-i18n="SAIL" class="sheet-italic">Sail</span>
 						</div>
+						
+						
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-row">
 							<fieldset class="repeating_sail">
 								<div class="sheet-row">
@@ -13901,7 +15404,7 @@
 										<input class="sheet-center" type="number" name="attr_Sail" value="(@{SailSpecializationChar}+@{SailAdv}+@{SailMisc}+(@{condgen_see}*-1))*@{SailTaken}" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_Sail" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{SailSpecialization}}} {{skill=@{SailSpecialization}}} {{skill=^{SAIL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{SailSpecializationChar}+@{SailAdv}+@{SailMisc})*@{SailTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Sail_modtype1}]]}} {{mod1=@{Sail_mod1}}} {{mod2type=[[@{Sail_modtype2}]]}} {{mod2=@{Sail_mod2}}} {{mod3type=[[@{Sail_modtype3}]]}} {{mod3=@{Sail_mod3}}} {{reroll=@{RT-rep}Sail)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_Sail" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{SailSpecialization}}} {{skill=@{SailSpecialization}}} {{skill=^{SAIL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{SailSpecializationChar}+@{SailAdv}+@{SailMisc})*@{SailTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Sail_modtype1}]]}} {{mod1=@{Sail_mod1}}} {{mod2type=[[@{Sail_modtype2}]]}} {{mod2=@{Sail_mod2}}} {{mod3type=[[@{Sail_modtype3}]]}} {{mod3=@{Sail_mod3}}} {{reroll=@{RT-rep}Sail)}}"></button>
 						</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_SailTaken" value="1" />
@@ -13967,12 +15470,124 @@
 		</div>			
 							</fieldset>
 						</div>
+						
+						
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-row">
+							<fieldset class="repeating_sail">
+								<div class="sheet-row">
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input type="checkbox" name="attr_SailCareer" value="1" />
+									</div>
+									<div class="sheet-col-3-8 sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="text" name="attr_SailSpecialization" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<select class="sheet-select-no-arrow-center" name="attr_SailChar">
+											<option value="(@{WeaponSkill}+@{WeaponSkillMod})" data-i18n="ABBREVIATE-WEAPON-SKILL">WS</option>
+											<option value="(@{BallisticSkill}+@{BallisticSkillMod})" data-i18n="ABBREVIATE-BALLISTIC-SKILL">BS</option>
+											<option value="(@{Strength}+@{StrengthMod})" data-i18n="ABBREVIATE-STRENGTH">S</option>
+											<option value="(@{Toughness}+@{ToughnessMod})" data-i18n="ABBREVIATE-TOUGHNESS">T</option>
+											<option value="(@{Initiative}+@{InitiativeMod})" data-i18n="ABBREVIATE-INITIATIVE">I</option>
+											<option value="(@{Agility}+@{AgilityMod})" data-i18n="ABBREVIATE-AGILITY" selected="selected">Ag</option>
+											<option value="(@{Dexterity}+@{DexterityMod})" data-i18n="ABBREVIATE-DEXTERITY">Dex</option>
+											<option value="(@{Intelligence}+@{IntelligenceMod})" data-i18n="ABBREVIATE-INTELLIGENCE">Int</option>
+											<option value="(@{WillPower}+@{WillPowerMod})" data-i18n="ABBREVIATE-WILL-POWER">Wp</option>
+											<option value="(@{Fellowship}+@{FellowshipMod})" data-i18n="ABBREVIATE-FELLOWSHIP">Fel</option>
+										</select>
+									</div>
+								<input class="sheet-hidden" type="textarea" name="attr_Skill_rep_ID" />
+										<input class="sheet-hidden" type="number" name="attr_SailSpecializationXP" value="0" readonly />
+										<input class="sheet-hidden" type="textarea" name="attr_SailSpecializationDis" value="0" readonly />
+								<input class="sheet-hidden" type="textarea" name="attr_RT-rep" value="[1](~@{character_name}|repeating_Sail_@{Skill_rep_ID}_" />
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_SailAdv" value="0" min="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_SailMisc" value="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_Sail" value="(@{SailChar}+@{SailAdv}+@{SailMisc}+(@{condgen_see}*-1))*@{SailTaken}" disabled="true" />
+									</div>
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_sail" style="font-family: dicefontd20;">t</button>
+							</div>
+						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
+							<input type="checkbox" name="attr_SailTaken" value="1" />
+						</div>
+					
+								
+              <label class="sheet-col-1-30 talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_Sail_settings_hide" value="0"/>		
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_Sail_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_Sail_settings_hide" class="sheet-hidden sheet-hider" value="1" />
+				
+				
+			<div class="Sail_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Sail_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Sail_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Sail_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Sail_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Sail_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Sail_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>								
+							<span class="sheet-spacer"></span>	
+           </div>				
+		</div>						
+		</div>			
+							</fieldset>
+						</div>						
+						
+						
+						
 					</div>
 					<div class="sheet-row sheet-area-border">
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle"><span>&nbsp;</span></div>
 						<div class="sheet-col-3-8 sheet-vert-middle">
 							<span data-i18n="SECRET-SIGNS" class="sheet-italic">Secret Signs</span>
 						</div>
+						
+						
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-row">
 							<fieldset class="repeating_secretsigns">
 								<div class="sheet-row">
@@ -14010,7 +15625,7 @@
 										<input class="sheet-center" type="number" name="attr_SecretSigns" value="(@{SecretSignsChar}+@{SecretSignsAdv}+@{SecretSignsMisc}+(@{condgen_see}*-1))*@{SecretSignsTaken}" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_SecretSigns" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{SecretSignsSpecialization}}} {{skill=^{SECRET-SIGNS}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{SecretSignsChar}+@{SecretSignsAdv}+@{SecretSignsMisc})*@{SecretSignsTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{SecretSigns_modtype1}]]}} {{mod1=@{SecretSigns_mod1}}} {{mod2type=[[@{SecretSigns_modtype2}]]}} {{mod2=@{SecretSigns_mod2}}} {{mod3type=[[@{SecretSigns_modtype3}]]}} {{mod3=@{SecretSigns_mod3}}} {{reroll=@{RT-rep}SecretSigns)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_SecretSigns" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{SecretSignsSpecialization}}} {{skill=^{SECRET-SIGNS}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{SecretSignsChar}+@{SecretSignsAdv}+@{SecretSignsMisc})*@{SecretSignsTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{SecretSigns_modtype1}]]}} {{mod1=@{SecretSigns_mod1}}} {{mod2type=[[@{SecretSigns_modtype2}]]}} {{mod2=@{SecretSigns_mod2}}} {{mod3type=[[@{SecretSigns_modtype3}]]}} {{mod3=@{SecretSigns_mod3}}} {{reroll=@{RT-rep}SecretSigns)}}"></button>
 						</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_SecretSignsTaken" value="1" />
@@ -14076,6 +15691,114 @@
 		</div>			
 							</fieldset>
 						</div>
+						
+						
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-row">
+							<fieldset class="repeating_secretsigns">
+								<div class="sheet-row">
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input type="checkbox" name="attr_SecretSignsCareer" value="1" />
+									</div>
+									<div class="sheet-col-3-8 sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="text" name="attr_SecretSignsSpecialization" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<select class="sheet-select-no-arrow-center" name="attr_SecretSignsChar">
+											<option value="(@{WeaponSkill}+@{WeaponSkillMod})" data-i18n="ABBREVIATE-WEAPON-SKILL">WS</option>
+											<option value="(@{BallisticSkill}+@{BallisticSkillMod})" data-i18n="ABBREVIATE-BALLISTIC-SKILL">BS</option>
+											<option value="(@{Strength}+@{StrengthMod})" data-i18n="ABBREVIATE-STRENGTH">S</option>
+											<option value="(@{Toughness}+@{ToughnessMod})" data-i18n="ABBREVIATE-TOUGHNESS">T</option>
+											<option value="(@{Initiative}+@{InitiativeMod})" data-i18n="ABBREVIATE-INITIATIVE">I</option>
+											<option value="(@{Agility}+@{AgilityMod})" data-i18n="ABBREVIATE-AGILITY">Ag</option>
+											<option value="(@{Dexterity}+@{DexterityMod})" data-i18n="ABBREVIATE-DEXTERITY">Dex</option>
+											<option value="(@{Intelligence}+@{IntelligenceMod})" data-i18n="ABBREVIATE-INTELLIGENCE" selected="selected">Int</option>
+											<option value="(@{WillPower}+@{WillPowerMod})" data-i18n="ABBREVIATE-WILL-POWER">Wp</option>
+											<option value="(@{Fellowship}+@{FellowshipMod})" data-i18n="ABBREVIATE-FELLOWSHIP">Fel</option>
+										</select>
+									</div>
+								<input class="sheet-hidden" type="textarea" name="attr_Skill_rep_ID" />
+										<input class="sheet-hidden" type="number" name="attr_SecretSignsSpecializationXP" value="0" readonly />
+										<input class="sheet-hidden" type="textarea" name="attr_SecretSignsSpecializationDis" value="0" readonly />
+								<input class="sheet-hidden" type="textarea" name="attr_RT-rep" value="[1](~@{character_name}|repeating_SecretSigns_@{Skill_rep_ID}_" />
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_SecretSignsAdv" value="0" min="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_SecretSignsMisc" value="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_SecretSigns" value="(@{SecretSignsChar}+@{SecretSignsAdv}+@{SecretSignsMisc}+(@{condgen_see}*-1))*@{SecretSignsTaken}" disabled="true" />
+									</div>
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_secretsigns" style="font-family: dicefontd20;">t</button>
+							</div>
+						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
+							<input type="checkbox" name="attr_SecretSignsTaken" value="1" />
+						</div>
+					
+								
+              <label class="sheet-col-1-30 talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_SecretSigns_settings_hide" value="0"/>		
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_SecretSigns_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_SecretSigns_settings_hide" class="sheet-hidden sheet-hider" value="1" />
+				
+				
+			<div class="SecretSigns_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_SecretSigns_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_SecretSigns_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_SecretSigns_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_SecretSigns_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_SecretSigns_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_SecretSigns_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>								
+							<span class="sheet-spacer"></span>	
+           </div>				
+		</div>						
+		</div>			
+							</fieldset>
+						</div>						
+						
+						
 					</div>
 					<div class="sheet-row" style="padding-left: 12px; padding-right: 12px;">
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -14108,9 +15831,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_SetTrap" value="(@{SetTrapChar}+@{SetTrapAdv}+@{SetTrapMisc}+(@{condgen_see_move}*-1))*@{SetTrapTaken}" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_SetTrap" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{SET-TRAP}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{SetTrapChar}+@{SetTrapAdv}+@{SetTrapMisc})*@{SetTrapTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{SetTrap_modtype1}]]}} {{mod1=@{SetTrap_mod1}}} {{mod2type=[[@{SetTrap_modtype2}]]}} {{mod2=@{SetTrap_mod2}}} {{mod3type=[[@{SetTrap_modtype3}]]}} {{mod3=@{SetTrap_mod3}}} {{reroll=@{RT-reroll}SetTrap)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_SetTrap" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{SET-TRAP}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{SetTrapChar}+@{SetTrapAdv}+@{SetTrapMisc})*@{SetTrapTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{SetTrap_modtype1}]]}} {{mod1=@{SetTrap_mod1}}} {{mod2type=[[@{SetTrap_modtype2}]]}} {{mod2=@{SetTrap_mod2}}} {{mod3type=[[@{SetTrap_modtype3}]]}} {{mod3=@{SetTrap_mod3}}} {{reroll=@{RT-reroll}SetTrap)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_SetTrap" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_SetTrapTaken" value="1" />
 						</div>
@@ -14202,9 +15930,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_SleightofHand" value="(@{SleightofHandChar}+@{SleightofHandAdv}+@{SleightofHandMisc}+(@{condgen_see_move}*-1))*@{SleightofHandTaken}" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_SleightofHand" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{SLEIGHT-OF-HAND}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{SleightofHandChar}+@{SleightofHandAdv}+@{SleightofHandMisc})*@{SleightofHandTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{SleightofHand_modtype1}]]}} {{mod1=@{SleightofHand_mod1}}} {{mod2type=[[@{SleightofHand_modtype2}]]}} {{mod2=@{SleightofHand_mod2}}} {{mod3type=[[@{SleightofHand_modtype3}]]}} {{mod3=@{SleightofHand_mod3}}} {{reroll=@{RT-reroll}SleightofHand)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_SleightofHand" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{SLEIGHT-OF-HAND}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{SleightofHandChar}+@{SleightofHandAdv}+@{SleightofHandMisc})*@{SleightofHandTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{SleightofHand_modtype1}]]}} {{mod1=@{SleightofHand_mod1}}} {{mod2type=[[@{SleightofHand_modtype2}]]}} {{mod2=@{SleightofHand_mod2}}} {{mod3type=[[@{SleightofHand_modtype3}]]}} {{mod3=@{SleightofHand_mod3}}} {{reroll=@{RT-reroll}SleightofHand)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_SleightofHand" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_SleightofHandTaken" value="1" />
 						</div>
@@ -14297,9 +16030,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Swim" value="(@{SwimChar}+@{SwimAdv}+@{SwimMisc}+(@{condgen_see_move}*-1))*@{SwimTaken}" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Swim" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{SWIM}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{SwimChar}+@{SwimAdv}+@{SwimMisc})*@{SwimTaken}]] [SKILL] +?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Swim_modtype1}]]}} {{mod1=@{Swim_mod1}}} {{mod2type=[[@{Swim_modtype2}]]}} {{mod2=@{Swim_mod2}}} {{mod3type=[[@{Swim_modtype3}]]}} {{mod3=@{Swim_mod3}}} {{reroll=@{RT-reroll}Swim)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Swim" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{SWIM}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{SwimChar}+@{SwimAdv}+@{SwimMisc})*@{SwimTaken}]] [SKILL] +?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Swim_modtype1}]]}} {{mod1=@{Swim_mod1}}} {{mod2type=[[@{Swim_modtype2}]]}} {{mod2=@{Swim_mod2}}} {{mod3type=[[@{Swim_modtype3}]]}} {{mod3=@{Swim_mod3}}} {{reroll=@{RT-reroll}Swim)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Swim" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_SwimTaken" value="1" />
 						</div>
@@ -14392,9 +16130,14 @@
 						<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input class="sheet-center" type="number" name="attr_Track" value="(@{TrackChar}+@{TrackAdv}+@{TrackMisc}+(@{condgen_see}*-1))*@{TrackTaken}" disabled="true" />
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Track" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{TRACK}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{TrackChar}+@{TrackAdv}+@{TrackMisc})*@{TrackTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Track_modtype1}]]}} {{mod1=@{Track_mod1}}} {{mod2type=[[@{Track_modtype2}]]}} {{mod2=@{Track_mod2}}} {{mod3type=[[@{Track_modtype3}]]}} {{mod3=@{Track_mod3}}} {{reroll=@{RT-reroll}Track)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Track" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{TRACK}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{TrackChar}+@{TrackAdv}+@{TrackMisc})*@{TrackTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Track_modtype1}]]}} {{mod1=@{Track_mod1}}} {{mod2type=[[@{Track_modtype2}]]}} {{mod2=@{Track_mod2}}} {{mod3type=[[@{Track_modtype3}]]}} {{mod3=@{Track_mod3}}} {{reroll=@{RT-reroll}Track)}}"></button>
 						</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_Track" style="font-family: dicefontd20;">t</button>
+							</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_TrackTaken" value="1" />
 						</div>
@@ -14461,6 +16204,9 @@
 						<div class="sheet-col-3-8 sheet-vert-middle">
 							<span data-i18n="TRADE" class="sheet-italic">Trade</span>
 						</div>
+						
+						
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-row">
 							<fieldset class="repeating_Trade">
 								<div class="sheet-row">
@@ -14495,10 +16241,10 @@
 										<input class="sheet-center" type="number" name="attr_TradeMisc" value="0" />
 									</div>
 									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<input class="sheet-center" type="number" name="attr_Trade" value="(@{TradeSpecializationChar}+@{TradeAdv}+@{TradeMisc}+(@{condgen}*-1))*@{TradeTaken}" disabled="true" />
+										<input class="sheet-center" type="number" name="attr_Trade" value="(@{TradeChar}+@{TradeAdv}+@{TradeMisc}+(@{condgen}*-1))*@{TradeTaken}" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_Trade" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{TradeSpecialization}}} {{skill=^{TRADE}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[(@{TradeSpecializationChar}+@{TradeAdv}+@{TradeMisc})*@{TradeTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Trade_modtype1}]]}} {{mod1=@{Trade_mod1}}} {{mod2type=[[@{Trade_modtype2}]]}} {{mod2=@{Trade_mod2}}} {{mod3type=[[@{Trade_modtype3}]]}} {{mod3=@{Trade_mod3}}} {{reroll=@{RT-rep}Trade)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_Trade" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{TradeSpecialization}}} {{skill=^{TRADE}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[(@{TradeSpecializationChar}+@{TradeAdv}+@{TradeMisc})*@{TradeTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Trade_modtype1}]]}} {{mod1=@{Trade_mod1}}} {{mod2type=[[@{Trade_modtype2}]]}} {{mod2=@{Trade_mod2}}} {{mod3type=[[@{Trade_modtype3}]]}} {{mod3=@{Trade_mod3}}} {{reroll=@{RT-rep}Trade)}}"></button>
 						</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_TradeTaken" value="1" />
@@ -14564,6 +16310,113 @@
 		</div>			
 							</fieldset>
 						</div>
+						
+						
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-row">
+							<fieldset class="repeating_Trade">
+								<div class="sheet-row">
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input type="checkbox" name="attr_TradeCareer" value="1" />
+									</div>
+									<div class="sheet-col-3-8 sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="text" name="attr_TradeSpecialization" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<select class="sheet-select-no-arrow-center" name="attr_TradeChar">
+											<option value="(@{WeaponSkill}+@{WeaponSkillMod})" data-i18n="ABBREVIATE-WEAPON-SKILL">WS</option>
+											<option value="(@{BallisticSkill}+@{BallisticSkillMod})" data-i18n="ABBREVIATE-BALLISTIC-SKILL">BS</option>
+											<option value="(@{Strength}+@{StrengthMod})" data-i18n="ABBREVIATE-STRENGTH">S</option>
+											<option value="(@{Toughness}+@{ToughnessMod})" data-i18n="ABBREVIATE-TOUGHNESS">T</option>
+											<option value="(@{Initiative}+@{InitiativeMod})" data-i18n="ABBREVIATE-INITIATIVE">I</option>
+											<option value="(@{Agility}+@{AgilityMod})" data-i18n="ABBREVIATE-AGILITY">Ag</option>
+											<option value="(@{Dexterity}+@{DexterityMod})" data-i18n="ABBREVIATE-DEXTERITY" selected="selected">Dex</option>
+											<option value="(@{Intelligence}+@{IntelligenceMod})" data-i18n="ABBREVIATE-INTELLIGENCE">Int</option>
+											<option value="(@{WillPower}+@{WillPowerMod})" data-i18n="ABBREVIATE-WILL-POWER">Wp</option>
+											<option value="(@{Fellowship}+@{FellowshipMod})" data-i18n="ABBREVIATE-FELLOWSHIP">Fel</option>
+										</select>
+									</div>
+								<input class="sheet-hidden" type="textarea" name="attr_Skill_rep_ID" />
+										<input class="sheet-hidden" type="number" name="attr_TradeSpecializationXP" value="0" readonly />
+										<input class="sheet-hidden" type="textarea" name="attr_TradeSpecializationDis" value="0" readonly />
+								<input class="sheet-hidden" type="textarea" name="attr_RT-rep" value="[1](~@{character_name}|repeating_Trade_@{Skill_rep_ID}_" />
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_TradeAdv" value="0" min="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_TradeMisc" value="0" />
+									</div>
+									<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
+										<input class="sheet-center" type="number" name="attr_Trade" value="(@{TradeChar}+@{TradeAdv}+@{TradeMisc}+(@{condgen}*-1))*@{TradeTaken}" disabled="true" />
+									</div>
+							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
+								<button type="action" class="sheet-roll" name="act_trade" style="font-family: dicefontd20;">t</button>
+							</div>
+						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
+							<input type="checkbox" name="attr_TradeTaken" value="1" />
+						</div>
+					
+								
+              <label class="sheet-col-1-30 talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_Trade_settings_hide" value="0"/>		
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_Trade_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_Trade_settings_hide" class="sheet-hidden sheet-hider" value="1" />
+				
+				
+			<div class="Trade_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Trade_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Trade_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Trade_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Trade_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_Trade_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_Trade_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>								
+							<span class="sheet-spacer"></span>	
+           </div>				
+		</div>						
+		</div>			
+							</fieldset>
+						</div>						
+						
 					</div>
 				</div>
 			</div>
@@ -14574,12 +16427,609 @@
 			<div class="sheet-row sheet-area-border" style="padding-left: 20px; padding-right: 20px;">
 				<div class="sheet-row">
 					<div class="sheet-col-1">
+				<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-pad-t-lg sheet-mar-l-md">
-								<span  style="font-size: 14px" data-i18n="TALENTS-CAP">TALENTS</span>				
+								<span  style="font-size: 14px" data-i18n="TALENTS-CAP">TALENTS</span>
+								</div>	
+				<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+							<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-pad-t-lg sheet-mar-l-md">
+								<span  style="font-size: 14px" data-i18n="TALENTS-CAP">TALENTS</span>
+								
+				<label class="talsetshow-check" style="display: inline; padding-right: 0px; margin-bottom: 0px; line-height: 12px;">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_Talents_settings_hide" value="0"/>		
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_Talents_settings_hide" value="1"/><span class="talsetshow-check__span" style="vertical-align: text-top; font-size: 12px; line-height: 12px;" checked="unchecked">y</span>
+              </label>
+
+				<input type="checkbox" name="attr_Talents_settings_hide" class="sheet-hidden sheet-hider" value="1" />	
+		<div class="talsetshow">
+			
+							<span class="sheet-spacer-l"></span>							
+
+					<div class="sheet-col-1-5 sheet-center sheet-vert-top" style="padding-left: 10px">
+						<div class="sheet-row">	
+							<div class="sheet-col-3-4 sheet-left">	
+								<span data-i18n="ACCURATE-SHOT" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-4 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowAccurateShot" value="1"/>
+							</div>
+						</div>
+						<div class="sheet-row">	
+							<div class="sheet-col-3-4 sheet-left">	
+								<span data-i18n="ACUTE-SENSE" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-4 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowAcuteSense" value="1"/>
+							</div>
+						</div>
+						<div class="sheet-row">	
+							<div class="sheet-col-3-4 sheet-left">	
+								<span data-i18n="AETHYRIC-ATTUNEMENT" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-4 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowAethyricAttunement" value="1"/>
+							</div>
+						</div>
+						<div class="sheet-row">	
+							<div class="sheet-col-3-4 sheet-left">	
+								<span data-i18n="ALLEY-CAT" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-4 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowAlleyCat" value="1"/>
+							</div>
+						</div>
+						<div class="sheet-row">	
+							<div class="sheet-col-3-4 sheet-left">	
+								<span data-i18n="AMBIDEXTROUS" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-4 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowAmbidextrous" value="1"/>
+							</div>
+						</div>
+						<div class="sheet-row">	
+							<div class="sheet-col-3-4 sheet-left">	
+								<span data-i18n="ANIMAL-AFFINITY" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-4 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowAnimalAffinity" value="1"/>
+							</div>
+						</div>
+						<div class="sheet-row">	
+							<div class="sheet-col-3-4 sheet-left">	
+								<span data-i18n="ARCANE-MAGIC-LORE" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-4 sheet-center">			
+								<label class="talsetshow-check" style="display: inline; padding-right: 0px; margin-bottom: 0px; line-height: 12px;">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_Acrane_talents_settings_hide" value="0"/>		
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_Acrane_talents_settings_hide" value="1"/><span class="talsetshow-check__span" style="vertical-align: text-top; font-size: 12px; line-height: 12px;" checked="unchecked">y</span>
+              </label>
+							</div>
+						</div>
+						
+					
+				<input type="checkbox" name="attr_Acrane_talents_settings_hide" class="sheet-hidden sheet-hider" value="1" />		
+						<div class="sheet-row">	
+							<div class="sheet-col-3-4 sheet-left">- 
+								<span data-i18n="LORE" class="sheet-nowrap"></span> <span data-i18n="FIRE" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-4 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowArcaneFire" value="1"/>
+							</div>
+						</div>
+				<input type="checkbox" name="attr_Acrane_talents_settings_hide" class="sheet-hidden sheet-hider" value="1" />		
+						<div class="sheet-row">	
+							<div class="sheet-col-3-4 sheet-left">- 
+								<span data-i18n="LORE" class="sheet-nowrap"></span> <span data-i18n="HEAVENS" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-4 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowArcaneHeavens" value="1"/>
+							</div>
+						</div>
+				<input type="checkbox" name="attr_Acrane_talents_settings_hide" class="sheet-hidden sheet-hider" value="1" />		
+						<div class="sheet-row">	
+							<div class="sheet-col-3-4 sheet-left">- 
+								<span data-i18n="LORE" class="sheet-nowrap"></span> <span data-i18n="METAL" class="sheet-nowrap"></span> 
+							</div>
+							<div class="sheet-col-1-4 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowArcaneMetal" value="1"/>
+							</div>
+						</div>
+				<input type="checkbox" name="attr_Acrane_talents_settings_hide" class="sheet-hidden sheet-hider" value="1" />		
+						<div class="sheet-row">	
+							<div class="sheet-col-3-4 sheet-left">- 
+								<span data-i18n="LORE" class="sheet-nowrap"></span> <span data-i18n="LIFE" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-4 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowArcaneLife" value="1"/>
+							</div>
+						</div>
+												
+					</div>
+
+					<div class="sheet-col-1-5 sheet-center sheet-vert-top" style="padding-left: 10px">
+						<div class="sheet-row">	
+							<div class="sheet-col-2-3 sheet-left">	
+								<span data-i18n="GUNNER" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-3 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowGunner" value="1"/>
+							</div>
+						</div>
+						<div class="sheet-row">	
+							<div class="sheet-col-2-3 sheet-left">	
+								<span data-i18n="HOLY-HATRED" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-3 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowHolyHatred" value="1"/>
+							</div>
+						</div>
+						<div class="sheet-row">	
+							<div class="sheet-col-2-3 sheet-left">	
+								<span data-i18n="INSTICTIVE-DICTION" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-3 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowInstinctiveDiction" value="1"/>
+							</div>
+						</div>
+						<div class="sheet-row">	
+							<div class="sheet-col-2-3 sheet-left">	
+								<span data-i18n="PERFECT-PITCH" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-3 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowPerfectPitch" value="1"/>
+							</div>
+						</div>
+					</div>
+
+					<div class="sheet-col-1-5 sheet-center sheet-vert-top" style="padding-left: 20px">
+						<div class="sheet-row">	
+							<div class="sheet-col-2-3 sheet-left">	
+								<span data-i18n="REVERSAL" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-3 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowReversal" value="1"/>
+							</div>
+						</div>
+						<div class="sheet-row">	
+							<div class="sheet-col-2-3 sheet-left">	
+								<span data-i18n="RIPOSTE" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-3 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowRiposte" value="1"/>
+							</div>
+						</div>
+						<div class="sheet-row">	
+							<div class="sheet-col-2-3 sheet-left">	
+								<span data-i18n="SHIELDSMAN" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-3 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowShieldsman" value="1"/>
+							</div>
+						</div>
+						<div class="sheet-row">	
+							<div class="sheet-col-2-3 sheet-left">	
+								<span data-i18n="STRIKE-TO-INJURE" class="sheet-nowrap"></span>
+							</div>
+							<div class="sheet-col-1-3 sheet-center">			
+						<input class="meleeshow-check" type="checkbox" name="attr_ShowStrikeToInjure" value="1"/>
+							</div>
+						</div>
+					</div>					
+					
+					
+							<span class="sheet-spacer"></span>		
+		</div>		
+			  
 							</div>	
 							<img src="https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/seperator-center-full.png?raw=true">	
 					</div>
-				</div>
+				</div>	
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+		<div class="sheet-row">
+			<div class="sheet-col-1-2">									
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-8 sheet-center sheet-small-label sheet-vert-top" data-i18n="CAREER">Career</div>
+						<div class="sheet-col-1-2 sheet-left sheet-small-label sheet-vert-top" data-i18n="TALENT">Talent</div>
+						<div class="sheet-col-8-100 sheet-center sheet-small-label sheet-vert-top" style="margin-left: 5px" data-i18n="ABBREVIATE-CHARACTERISTIC">Char</div>
+						<div class="sheet-col-8-100 sheet-center sheet-small-label sheet-vert-top" style="margin-left: 4px" data-i18n="LEVEL">Level</div>
+						<div class="sheet-col-8-100 sheet-center sheet-small-label sheet-vert-top" style="margin-left: 3px" data-i18n="MAX">Max</div>
+					</div>		
+			</div>
+
+			<div class="sheet-col-1-2" style="position: relative">									
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-8 sheet-center sheet-small-label" data-i18n="CAREER">Career</div>
+						<div class="sheet-col-1-2 sheet-left sheet-small-label" data-i18n="TALENT">Talent</div>
+						<div class="sheet-col-8-100 sheet-center sheet-small-label" style="margin-left: 5px" data-i18n="ABBREVIATE-CHARACTERISTIC">Char</div>
+						<div class="sheet-col-8-100 sheet-center sheet-small-label" style="margin-left: 4px" data-i18n="LEVEL">Level</div>
+						<div class="sheet-col-8-100 sheet-center sheet-small-label" style="margin-left: 3px" data-i18n="MAX">Max</div>
+					</div>							
+			</div>								
+			</div>				
+					
+		<input type="checkbox" name="attr_ShowAccurateShot" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierAccurateShot" value="1" />
+							</div>
+							<div class="sheet-col-1-2 sheet-left sheet-vert-middle">
+								<span data-i18n="ACCURATE-SHOT">Accurate Shot</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span data-i18n="ABBREVIATE-BALLISTIC-SKILL"></span>
+								<input class="sheet-center" type="hidden" name="attr_Talent_AccurateShotChar" value="(@{BallisticSkillBonus})" readonly />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_AccurateShotLvl" value="0" min="0" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_AccurateShotMax" value="@{Talent_AccurateShotChar}" disabled />
+							</div>
+							<span style="margin-left: 7px; font-family: pictos; color: #55b800;" data-i18n-title="SHEET-INTEGRATION" >3</span>
+						</div>
+		<input type="checkbox" name="attr_ShowAcuteSense" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierAcuteSense" value="1" />
+							</div>
+							<div class="sheet-col-1-2 sheet-left sheet-vert-middle">
+								<span data-i18n="ACUTE-SENSE">Acute Sense (Sense)</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span data-i18n="ABBREVIATE-INITIATIVE"></span>
+								<input class="sheet-center" type="hidden" name="attr_Talent_AcuteSenseChar" value="(@{BallisticSkillBonus})" readonly />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_AcuteSenseLvl" value="0" min="0" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_AcuteSenseMax" value="@{Talent_AcuteSenseChar}" disabled />
+							</div>
+						</div>
+		<input type="checkbox" name="attr_ShowAethyricAttunement" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierAethyricAttunement" value="1" />
+							</div>
+							<div class="sheet-col-1-2 sheet-left sheet-vert-middle">
+								<span data-i18n="AETHYRIC-ATTUNEMENT">Aethyric Attunement</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span data-i18n="ABBREVIATE-INITIATIVE"></span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_AethyricAttunementLvl" value="0" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_AethyricAttunementMax" value="@{InitiativeBonus}" disabled />
+							</div>
+							<span style="margin-left: 7px; font-family: pictos; color: #55b800;" data-i18n-title="SHEET-INTEGRATION" >3</span>
+						</div>
+		<input type="checkbox" name="attr_ShowAlleyCat" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierAlleyCat" value="1" />
+							</div>
+							<div class="sheet-col-1-2 sheet-left sheet-vert-middle">
+								<span data-i18n="ALLEY-CAT">Alley Cat</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span data-i18n="ABBREVIATE-INITIATIVE"></span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_AlleyCatLvl" value="0" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_AlleyCatMax" value="@{InitiativeBonus}" disabled />
+							</div>
+						</div>
+		<input type="checkbox" name="attr_ShowAmbidextrous" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierAmbidextrous" value="1" />
+							</div>
+							<div class="sheet-col-1-2 sheet-left sheet-vert-middle">
+								<span data-i18n="AMBIDEXTROUS">Ambidextrous</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span style="color: white">/</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_AmbidextrousLvl" value="0" min="0" max="2" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_AmbidextrousMax" value="2" disabled />
+							</div>
+							<span style="margin-left: 7px; font-family: pictos; color: #55b800;" data-i18n-title="SHEET-INTEGRATION" >3</span>
+						</div>
+		<input type="checkbox" name="attr_ShowAnimalAffinity" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierAnimalAffinity" value="1" />
+							</div>
+							<div class="sheet-col-1-2 sheet-left sheet-vert-middle">
+								<span data-i18n="ANIMAL-AFFINITY">Animal Affinity</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span data-i18n="ABBREVIATE-WILL-POWER"></span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_AnimalAffinityLvl" value="0"  />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_AnimalAffinityMax" value="@{WillPowerBonus}" disabled />
+							</div>
+						</div>
+		<input type="checkbox" name="attr_ShowArcaneFire" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierArcaneFire" value="1" />
+							</div>
+							<div class="sheet-col-35-100 sheet-left sheet-vert-middle">
+								<span data-i18n="ARCANE-MAGIC">Arcane Magic</span> (<span data-i18n="FIRE">Fire</span>)
+							</div>
+							<div class="sheet-col-1-10 sheet-right sheet-vert-middle">
+								<span style="text-align: right; font-size: 9px" >Learned Spells:</span> 
+							</div>
+							<div class="sheet-col-1-22 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_ArcaneFireSpells" value="0" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span style="color: white">/</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_ArcaneFireLvl" value="0" min="0" max="1" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_ArcaneFireMax" value="1" disabled />
+							</div>
+						</div>
+		<input type="checkbox" name="attr_ShowArcaneHeavens" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierArcaneHeavens" value="1" />
+							</div>
+							<div class="sheet-col-35-100 sheet-left sheet-vert-middle">
+								<span data-i18n="ARCANE-MAGIC">Arcane Magic</span> (<span data-i18n="HEAVENS">Heavens</span>)
+							</div>
+							<div class="sheet-col-1-10 sheet-right sheet-vert-middle">
+								<span style="text-align: right; font-size: 9px" >Learned Spells:</span> 
+							</div>
+							<div class="sheet-col-1-22 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_ArcaneHeavensSpells" value="0" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span style="color: white">/</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_ArcaneHeavensLvl" value="0" min="0" max="1" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_ArcaneHeavensMax" value="1" disabled />
+							</div>
+						</div>
+		<input type="checkbox" name="attr_ShowArcaneMetal" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierArcaneMetal" value="1" />
+							</div>
+							<div class="sheet-col-35-100 sheet-left sheet-vert-middle">
+								<span data-i18n="ARCANE-MAGIC">Arcane Magic</span> (<span data-i18n="METAL">Metal</span>)
+							</div>
+							<div class="sheet-col-1-10 sheet-right sheet-vert-middle">
+								<span style="text-align: right; font-size: 9px" >Learned Spells:</span> 
+							</div>
+							<div class="sheet-col-1-22 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_ArcaneMetalSpells" value="0" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span style="color: white">/</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_ArcaneMetalLvl" value="0" min="0" max="1" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_ArcaneMetalMax" value="1" disabled />
+							</div>
+						</div>
+		<input type="checkbox" name="attr_ShowArcaneLife" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierArcaneLife" value="1" />
+							</div>
+							<div class="sheet-col-35-100 sheet-left sheet-vert-middle">
+								<span data-i18n="ARCANE-MAGIC">Arcane Magic</span> (<span data-i18n="LIFE">Life</span>)
+							</div>
+							<div class="sheet-col-1-10 sheet-right sheet-vert-middle">
+								<span style="text-align: right; font-size: 9px" >Learned Spells:</span> 
+							</div>
+							<div class="sheet-col-1-22 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_ArcaneLifeSpells" value="0" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span style="color: white">/</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_ArcaneLifeLvl" value="0" min="0" max="1" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_ArcaneLifeMax" value="1" disabled />
+							</div>
+						</div>
+		<input type="checkbox" name="attr_ShowInstinctiveDiction" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierInstinctiveDiction" value="1" />
+							</div>
+							<div class="sheet-col-1-2 sheet-left sheet-vert-middle">
+								<span data-i18n="INSTICTIVE-DICTION">Instinctive Diction</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span data-i18n="ABBREVIATE-DEXTERITY"></span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_InstinctiveDictionLvl" value="0" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_InstinctiveDictionMax" value="@{DexterityBonus}" disabled />
+							</div>
+							<span style="margin-left: 7px; font-family: pictos; color: #55b800;" data-i18n-title="SHEET-INTEGRATION" >3</span>
+						</div>
+		<input type="checkbox" name="attr_ShowHolyHatred" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierHolyHatred" value="1" />
+							</div>
+							<div class="sheet-col-1-2 sheet-left sheet-vert-middle">
+								<span data-i18n="HOLY-HATRED">Holy Hatred</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span data-i18n="ABBREVIATE-FELLOWSHIP"></span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_HolyHatredLvl" value="0" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_HolyHatredMax" value="@{FellowshipBonus}" disabled />
+							</div>
+							<span style="margin-left: 7px; font-family: pictos; color: #55b800;" data-i18n-title="SHEET-INTEGRATION" >3</span>
+						</div>
+		<input type="checkbox" name="attr_ShowReversal" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierReversal" value="1" />
+							</div>
+							<div class="sheet-col-1-2 sheet-left sheet-vert-middle">
+								<span data-i18n="REVERSAL">Reversal</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span data-i18n="ABBREVIATE-WEAPON-SKILL"></span>
+								<input class="sheet-center" type="hidden" name="attr_Talent_ReversalChar" value="(@{WeaponSkillBonus})" readonly />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_ReversalLvl" value="0" min="0" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_ReversalMax" value="@{Talent_ReversalChar}" disabled />
+							</div>
+							<span style="margin-left: 7px; font-family: pictos; color: #55b800;" data-i18n-title="SHEET-INTEGRATION" >3</span>
+						</div>
+		<input type="checkbox" name="attr_ShowRiposte" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierRiposte" value="1" />
+							</div>
+							<div class="sheet-col-1-2 sheet-left sheet-vert-middle">
+								<span data-i18n="RIPOSTE">Riposte</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span data-i18n="ABBREVIATE-AGILITY"></span>
+								<input class="sheet-center" type="hidden" name="attr_Talent_RiposteChar" value="(@{AgilityBonus})" readonly />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_RiposteLvl" value="0" min="0" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_RiposteMax" value="@{Talent_RiposteChar}" disabled />
+							</div>
+							<span style="margin-left: 7px; font-family: pictos; color: #55b800;" data-i18n-title="SHEET-INTEGRATION" >3</span>
+						</div>
+		<input type="checkbox" name="attr_ShowShieldsman" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierShieldsman" value="1" />
+							</div>
+							<div class="sheet-col-1-2 sheet-left sheet-vert-middle">
+								<span data-i18n="SHIELDSMAN">Shieldsman</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span data-i18n="ABBREVIATE-STRENGTH"></span>
+								<input class="sheet-center" type="hidden" name="attr_Talent_RiposteChar" value="(@{AgilityBonus})" readonly />
+								<select class="sheet-hidden" name="attr_Talent_ShieldsmanChar">
+										<option value="(@{WeaponSkillBonus})" data-i18n="ABBREVIATE-WEAPON-SKILL">WS</option>
+										<option value="(@{BallisticSkillBonus})" data-i18n="ABBREVIATE-BALLISTIC-SKILL">BS</option>
+										<option value="(@{StrengthBonus})" data-i18n="ABBREVIATE-STRENGTH" selected="selected">S</option>
+										<option value="(@{ToughnessBonus})" data-i18n="ABBREVIATE-TOUGHNESS">T</option>
+										<option value="(@{InitiativeBonus})" data-i18n="ABBREVIATE-INITIATIVE">I</option>
+										<option value="(@{AgilityBonus})" data-i18n="ABBREVIATE-AGILITY" selected="selected">Ag</option>
+										<option value="(@{DexterityBonus})" data-i18n="ABBREVIATE-DEXTERITY">Dex</option>
+										<option value="(@{IntelligenceBonus})" data-i18n="ABBREVIATE-INTELLIGENCE">Int</option>
+										<option value="(@{WillPowerBonus})" data-i18n="ABBREVIATE-WILL-POWER">Wp</option>
+										<option value="(@{FellowshipBonus})" data-i18n="ABBREVIATE-FELLOWSHIP">Fel</option>
+								</select>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_ShieldsmanLvl" value="0" min="0" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_ShieldsmanMax" value="@{Talent_ShieldsmanChar}" disabled />
+							</div>
+							<span style="margin-left: 7px; font-family: pictos; color: #55b800;" data-i18n-title="SHEET-INTEGRATION" >3</span>
+						</div>
+			
+			
+		<input type="checkbox" name="attr_ShowGunner" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierGunner" value="1" />
+							</div>
+							<div class="sheet-col-1-2 sheet-left sheet-vert-middle">
+								<span data-i18n="GUNNER">Gunner</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span data-i18n="ABBREVIATE-DEXTERITY"></span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_GunnerLvl" value="0" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_GunnerMax" value="@{DexterityBonus}" disabled />
+							</div>
+							<span style="margin-left: 7px; font-family: pictos; color: #55b800;" data-i18n-title="SHEET-INTEGRATION" >3</span>
+						</div>
+		<input type="checkbox" name="attr_ShowPerfectPitch" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierPerfectPitch" value="1" />
+							</div>
+							<div class="sheet-col-1-2 sheet-left sheet-vert-middle">
+								<span data-i18n="PERFECT-PITCH">Perfect Pitch</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span data-i18n="ABBREVIATE-INITIATIVE"></span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_PerfectPitchLvl" value="0" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_PerfectPitchMax" value="@{InitiativeBonus}" disabled />
+							</div>
+							<span style="margin-left: 7px; font-family: pictos; color: #55b800;" data-i18n-title="SHEET-INTEGRATION" >3</span>
+						</div>
+		<input type="checkbox" name="attr_ShowStrikeToInjure" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-col-1-2 sheet-vert-top">
+							<div class="sheet-col-1-8 sheet-center sheet-vert-middle">
+								<input type="checkbox" name="attr_CarrierStrikeToInjure" value="1" />
+							</div>
+							<div class="sheet-col-1-2 sheet-left sheet-vert-middle">
+								<span data-i18n="STRIKE-TO-INJURE">Strike To Injure</span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-talents-border">
+								<span data-i18n="ABBREVIATE-INITIATIVE"></span>
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_StrikeToInjureLvl" value="0" />
+							</div>
+							<div class="sheet-col-8-100 sheet-center sheet-vert-middle">
+								<input class="sheet-center" type="number" name="attr_Talent_StrikeToInjureMax" value="@{InitiativeBonus}" disabled />
+							</div>
+							<span style="margin-left: 7px; font-family: pictos; color: #55b800;" data-i18n-title="SHEET-INTEGRATION" >3</span>
+						</div>
+		
+							<span class="sheet-spacer-xl"></span>						
+							
+							
+							
 				<div class="sheet-row sheet-sub-header">
 					<div class="sheet-col-2-11 sheet-center sheet-pad-r-sm sheet-small-label">
 						<span data-i18n="TALENT">Talent</span>
@@ -14604,7 +17054,7 @@
 					</div>
 				</div>
 				<fieldset class="repeating_talents">
-					<div class="sheet-row sheet-text-middle">
+					<div class="sheet-row sheet-center sheet-text-middle">
 						<div class="sheet-col-2-11 sheet-pad-r-sm sheet-vert-top" style="height: 20px">
 							<input type="text" name="attr_TalentName" />
 						</div>
@@ -14642,7 +17092,7 @@
 							<input type="checkbox" name="attr_TalentCareer" value="1" />
 						</div>									
 						<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-talent-show" name="roll_Talents" title="Display in Chat" value="@{Whisper} &{template:whfrp2e} {{talent=true}} {{title=@{TalentName}}} {{skill=Talent}} {{character_name=@{character_name}}} {{talent=true}} {{talenttest=@{TalentTest}}} {{talentdesc=@{TalentDesc}}} {{talentchar=@{TalentChar}}} {{talentlevel=@{TalentLevel}}} {{talentmax=@{TalentMax}}}"><span class="talsetshow-check__span" checked="unchecked">w</span></button>
+							<button type="roll" class="sheet-talent-show" name="roll_Talents" title="Display in Chat" value="@{Whisper} &{template:wfrp4e} {{talent=true}} {{title=@{TalentName}}} {{skill=Talent}} {{character_name=@{character_name}}} {{talent=true}} {{talenttest=@{TalentTest}}} {{talentdesc=@{TalentDesc}}} {{talentchar=@{TalentChar}}} {{talentlevel=@{TalentLevel}}} {{talentmax=@{TalentMax}}}"><span class="talsetshow-check__span" checked="unchecked">w</span></button>
 						</div>	
 						<span class="sheet-spacer"></span>
 					</div>
@@ -14833,20 +17283,59 @@
 			<div class=" sheet-area-border" style="padding-left: 20px; padding-right: 20px;">
 				<div class="sheet-row">
 					<div class="sheet-col-1">
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+						<div class="sheet-row sheet-center sheet-sub-header sheet-right">
+							<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" style="width: 152px; border: 1px solid black; border-radius: 5px 5px 0px 0px; background-color: #D3D3D3; padding-top: 3px;" >Mainhand</div>
+							<div class="sheet-col-25-2 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" style="width: 15px"  ></div>
+							<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" style="width: 152.5px; border: 1px solid black; border-radius: 5px 5px 0px 0px; background-color: #D3D3D3; margin-right: 10px; padding-top: 3px;">Off-Hand</div>
+						</div>
+
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />						
+						<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-mar-l-md">	
+							<span  style="font-size: 14px;" data-i18n="MELEE-WEAPONS">MELEE WEAPONS</span>		
+							<div class="sheet-col-1-10 sheet-center"style="float: right; margin-right: 15px;">
+								<button type="action" class="sheet-combat-actions-rep" name="act_MeleeOpposedOff" >
+								<span ata-i18n="OPPOSED">Opposed</span></button>
+							</div>		
+							<div class="sheet-col-1-10 sheet-center" style="float: right;">
+								<button type="action" class="sheet-combat-actions-rep" name="act_MeleeAttackOff"  >
+							<span data-i18n="ATTACK">Attack</span></button>
+							</div>					
+							<div class="sheet-col-1-40 sheet-center"style="float: right;">
+								<button type="action" data-i18n-title="CHARGE" class="sheet-combat-actions-rep" name="act_meleechargeoff" >
+								<span style='font-family: "pictos"'>8</span></button>
+							</div>			
+							<div class="sheet-col-1-10 sheet-center"style="float: right; margin-right: 15px;">
+								<button type="action" class="sheet-combat-actions-rep" name="act_MeleeOpposedMain" >
+								<span data-i18n="OPPOSED">Opposed</span></button>
+							</div>	
+							<div class="sheet-col-1-10 sheet-center" style="float: right;">
+								<button type="action" class="sheet-combat-actions-rep" name="act_MeleeAttackMain"  >
+							<span data-i18n="ATTACK">Attack</span></button>
+							</div>			
+							<div class="sheet-col-1-40 sheet-center"style="float: right;">
+								<button type="action" data-i18n-title="CHARGE" class="sheet-combat-actions-rep" name="act_meleechargemain" >
+								<span style='font-family: "pictos"'>8</span></button>
+							</div>					
+						</div>	
+
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-mar-t-lg sheet-mar-l-md">
 							<span  style="font-size: 14px;" data-i18n="MELEE-WEAPONS">MELEE WEAPONS</span>		
 							<div class="sheet-col-1-13 sheet-center"style="float: right; margin-right: 15px;">
-								<button type="roll" class="sheet-combat-actions-rep" name="roll_MeleeOpposed" value="@{Whisper} &{template:whfrp2e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Opposed Defense Roll, Add Modifier (Adv. already added)|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{attacktype=^{OPPOSED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Opposed Defense Roll, Add Modifier (Adv. already added)|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{Used_DefenseDefensive}]]}} {{test=$[[0]]}} {{reach=@{Used_DefenseReach}}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{showdmg=[[@{Used_DefenseOpposedDmg}]]}} {{hitlocation=true}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{armorqualities=@{armorQuality}}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeOpposed)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
+								<button type="roll" class="sheet-combat-actions-rep" name="roll_MeleeOpposed" value="@{Whisper} &{template:wfrp4e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Opposed Defense Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{attacktype=^{OPPOSED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Opposed Defense Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{Used_DefenseDefensive}]]}} {{test=$[[0]]}} {{reach=@{Used_DefenseReach}}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{showdmg=[[@{Used_DefenseOpposedDmg}]]}} {{hitlocation=true}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{armorqualities=@{armorQuality}}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeOpposed)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
 								<span data-i18n="OPPOSED">Opposed</span></button>
 							</div>	
 							<div class="sheet-col-1-13 sheet-center" style="float: right;">
-								<button type="roll" class="sheet-combat-actions-rep" name="roll_MeleeAttack"  value="@{Whisper} &{template:whfrp2e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Opposed Attack Roll, Add Modifier (Adv. already added)|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{character_name=@{character_name}}} {{attacktype=^{MELEE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Opposed Attack Roll, Add Modifier (Adv. already added)|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=$[[0]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
+								<button type="roll" class="sheet-combat-actions-rep" name="roll_MeleeAttack"  value="@{Whisper} &{template:wfrp4e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Opposed Attack Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{character_name=@{character_name}}} {{attacktype=^{MELEE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Opposed Attack Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=$[[0]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
 							<span data-i18n="ATTACK">Attack</span></button>
 							</div>				
-						</div>						
+						</div>	
+
 						<img src="https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/seperator-center-full.png?raw=true">	
-					</div>
+					</div>	
 				</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 				<div class="sheet-row sheet-center sheet-sub-header">
 					<div class="sheet-col-19-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="WEAPON">Weapon</div>
 					<div class="sheet-col-4-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="ABBREVIATE-ENCUMBRANCE">Enc</div>
@@ -14863,6 +17352,307 @@
 					<div class="sheet-col-3-100 sheet-center sheet-small-label sheet-vert-middle " data-i18n="OPP">Opp?</div>
 					<div class="sheet-col-4-100 sheet-center sheet-small-label sheet-vert-middle "></div>
 				</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+				<div class="sheet-row sheet-center sheet-sub-header">
+					<div class="sheet-col-19-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" style="margin-left: -15px" data-i18n="WEAPON">Weapon</div>
+					<div class="sheet-col-4-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="ABBREVIATE-ENCUMBRANCE">Enc</div>
+					<div class="sheet-col-16-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="WEAPON-SKILL">WS</div>
+					<div class="sheet-col-9-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="REACH">Reach</div>
+					<div class="sheet-col-4-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SB">SB</div>
+					<div class="sheet-col-4-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="+DMG">+Dmg</div>
+					<div class="sheet-col-4-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="DMG">Dmg</div>
+					<div class="sheet-col-19-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="QUALITIES-AND-FLAWS">Qualities and Flaws</div>
+					<div class="sheet-col-4-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="MOD" data-i18n="MOD">Mod</div>
+					<div class="sheet-col-4-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="TARGET2">Target</div>
+					<div class="sheet-col-1-10 sheet-center sheet-small-label sheet-vert-middle" style="white-space: nowrap; padding-left: 4px" data-i18n="MAIN-WEAPON">Main hand</div>
+				</div>
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+				<div class="sheet-row">
+					<fieldset class="repeating_melee">
+						<div class="sheet-row sheet-center sheet-text-middle">
+							<div class="sheet-col-19-100 sheet-pad-r-sm" style="height: 20px;margin-left: 6px;">
+								<input type="text" name="attr_MeleeWeapon" />
+							</div>
+							<div class="sheet-col-4-100 sheet-pad-r-sm">
+								<input type="number" name="attr_MeleeEnc" value="0" />
+							</div>
+							<!-- MELEE SKILL SELECTION -->
+							<div class="sheet-col-16-100 sheet-pad-r-sm" style="height: 20px; padding-top: 1px">
+								<select class="sheet-select-no-arrow-center sheet-select-sizing" style="height: 20px; padding-top: 0px" name="attr_MeleeWeaponSkill">
+									<option value="(@{MeleeBasic})" data-i18n="MELEE-BASIC" selected="selected">Melee (Basic)</option>
+									<option value="(@{MeleeBrawling})" data-i18n="MELEE-BRAWLING">Melee (Brawling)</option>
+									<option value="(@{MeleeCavalry})" data-i18n="MELEE-CAVALRY">Melee (Cavalry)</option>
+									<option value="(@{MeleeFencing})" data-i18n="MELEE-FENCING">Melee (Fencing)</option>
+									<option value="(@{MeleeFlail})" data-i18n="MELEE-FLAIL">Melee (Flail)</option>
+									<option value="(@{MeleeParry} [PARRY])" data-i18n="MELEE-PARRY">Melee (Parry)</option>
+									<option value="(@{MeleePolearm})" data-i18n="MELEE-POLEARM">Melee (Polearm)</option>
+									<option value="(@{MeleeTwoHanded})" data-i18n="MELEE-TWOHANDED">Melee (Two Handed)</option>
+								</select>
+							</div>
+							<!-- MELEE SKILL SELECTION END -->
+							<div class="sheet-col-9-100 sheet-pad-r-sm" style="height: 20px; padding-top: 1px">
+								<select class="sheet-select-no-arrow-center sheet-select-sizing" style="height: 20px; padding-top: 0px" name="attr_MeleeReach">
+									<option data-i18n="PERSONAL">Personal</option>
+									<option data-i18n="VERY-SHORT">Very Short</option>
+									<option data-i18n="SHORT">Short</option>
+									<option data-i18n="AVERAGE" selected>Average</option>
+									<option data-i18n="LONG">Long</option>
+									<option data-i18n="VERY-LONG">Very Long</option>
+									<option data-i18n="MASSIVE">Massive</option>
+								</select>
+							</div>
+							<div class="sheet-col-4-100 sheet-pad-r-sm sheet-center">
+								<input class="sheet-center" type="number" name="attr_MeleeStrengthBonus" value="@{StrengthBonus}" disabled="true" />
+							</div>
+							<div class="sheet-col-4-100 sheet-pad-r-sm sheet-center">
+								<input class="sheet-center" type="number" name="attr_MeleeDamageBonus" value="0" />
+							</div>
+							<div class="sheet-col-4-100 sheet-pad-r-sm sheet-center">
+								<input class="sheet-center" type="number" name="attr_MeleeDamageTotal" value="@{MeleeStrengthBonus}+@{MeleeDamageBonus}" disabled="true" />
+							</div>
+							<div class="sheet-col-19-100 sheet-pad-r-sm">
+								<textarea class="sheet-left sheet-xs-textarea" style="height: 20px" name="attr_MeleeQualities"></textarea>
+							</div>
+							<div class="sheet-col-4-100 sheet-pad-r-sm">
+								<input type="number" name="attr_MeleeBonus" value="0" />
+							</div>
+							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
+								<input type="value" class="sheet-center" name="attr_targetmelee" value="(@{MeleeWeaponSkill}+@{MeleeBonus}+(@{Advantage}*10))+(@{condgen_see_move}*-1)" disabled />
+							</div>
+							<div class="sheet-col-1-30 sheet-center sheet-vert-middle"  style="padding-left: 8px">
+								<input type="checkbox" name="attr_UsedWeapon" value="1" />
+							</div>
+							<div class="sheet-col-1-30 sheet-center sheet-vert-middle">
+								<input  style="margin-left: 13px" type="checkbox" name="attr_UsedDefense" value="1" />
+							</div>
+							
+              <label class="sheet-col-3-100 sheet-center talsetshow-check" style="margin-left: 15px;">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_MeleeWeapon_settings_hide" value="0"/>			  
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_MeleeWeapon_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow" style="padding-left: 10px">
+				<input type="checkbox" name="attr_MeleeWeapon_settings_hide" class="sheet-hidden sheet-hider" value="1"/>
+				
+				
+			<div class="MeleeWeapon_settings">	
+				
+				<div class="col-7-8 sheet-wrap-box">	
+					<div class="sheet-row sheet-left sheet-wrap-box">		
+						<div class="sheet-col-1-6 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="ONE-HANDED">One-Handed</span>
+						</div>	
+						<div class="sheet-col-1-15 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_UsedTwoHanded" value="0" />
+						</div>		
+						<div class="sheet-col-1-6 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="TWO-HANDED">Two-Handed</span>
+						</div>	
+						<div class="sheet-col-1-15 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_UsedTwoHanded" value="1" />
+						</div>		
+						<div class="sheet-col-1-6 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="SHIELD">Shield</span>
+						</div>	
+						<div class="sheet-col-1-15 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_UsedShield" value="1" />
+						</div>	
+				<input type="checkbox" name="attr_UsedShield" class="sheet-hidden sheet-hider" value="1"/>		
+						<div class="sheet-col-1-18 sheet-left">	
+						<span style="padding-left: 0px; font-size: 11px" data-i18n="RATING">Rating</span>
+						</div>	
+				<input type="checkbox" name="attr_UsedShield" class="sheet-hidden sheet-hider" value="1"/>	
+						<div class="sheet-col-1-30 sheet-left sheet-pad-l-sm">
+							<input type="number" name="attr_UsedShieldRating" value="1" min="1" max="3"  style="height: 14px;"/>
+						</div>			
+					</div>
+						
+		<span class="sheet-spacer"></span>	
+								
+					<div class="sheet-row sheet-left">
+						
+						<div class="sheet-col-1-10 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="DAMAGING">Damaging</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_UsedDamaging" value="1" />
+						</div>	
+						<div class="sheet-col-1-10 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="HACK">Hack</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_MeleeHack" value="1" />
+						</div>	
+						<div class="sheet-col-1-13 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="IMPALE">Impale</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_MeleeImpale"  value="3" />
+						</div>
+						<div class="sheet-col-1-13 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="IMPACT">Impact</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_MeleeImpact"  value="3" />
+						</div>
+						<div class="sheet-col-1-13 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="TIRING">Tiring</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_MeleeTiring" value="1" />
+						</div>	
+						<div class="sheet-col-1-13 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="FAST">Fast</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_MeleeFast" value="1" />
+						</div>
+						<div class="sheet-col-1-13 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="SLOW">Slow</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_MeleeSlow" value="1" />
+						</div>	
+	
+					</div>	
+					
+		
+		<span class="sheet-spacer"></span>	
+					<div class="sheet-row sheet-left">
+						<div class="sheet-col-1-10 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="DEFENSIVE">Defensive</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_MeleeDefensive" value="1" />
+						</div>	
+						<div class="sheet-col-1-10 sheet-right">
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="PRACTICAL">Practical</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_MeleePractical" value="1" />
+						</div>	
+						<div class="sheet-col-1-13 sheet-right">		
+						<span style="padding-left: 13px; font-size: 11px" data-i18n="PRECISE">Precise</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_MeleePrecise" value="1" />
+						</div>
+						<div class="sheet-col-1-10 sheet-right">		
+						<span style="padding-left: 5px; font-size: 11px" data-i18n="PENETRATING">Penetrating</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_MeleePenetrating" value="1" />
+						</div>
+						<div class="sheet-col-1-13 sheet-right">		
+						<span style="padding-left: 8px; font-size: 11px" data-i18n="PUMMEL">Pummel</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_MeleePummel" value="1" />
+						</div>
+					</div>				
+					
+					
+		<span class="sheet-spacer"></span>	
+					<div class="sheet-row sheet-sub-header">				
+						<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME-ATK">Attack Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_MeleeWeapon_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_MeleeWeapon_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_MeleeWeapon_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_MeleeWeapon_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_MeleeWeapon_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_MeleeWeapon_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME-OPP" style="padding-left: 22px;">Opposed Roll Outcome</div>
+						<div class="sheet-col-3-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" style="padding-left: 123px;" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+						<div class="sheet-col-3-20 sheet-center sheet-small-label sheet-vert-middle" style="text-align: right; padding-right: 4px;" data-i18n="OPPOSED-SHOWDMG">Show Dmg/Hitloc</div>
+						<div class="sheet-col-1-50 sheet-center  sheet-vert-middle" style="margin-right: 12px;"><input type="checkbox" style="right: 15px" name="attr_OpposedDmg" value="1" /></div>					
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_DefenseWeapon_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_DefenseWeapon_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_DefenseWeapon_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_DefenseWeapon_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_DefenseWeapon_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_DefenseWeapon_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>							
+							<span class="sheet-spacer"></span>		
+            </div>	
+							
+		</div>
+		<span class="sheet-spacer"></span>				   
+		</div>
+						</div>
+					</fieldset>
+				</div>
+				
+
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 				<div class="sheet-row">
 					<fieldset class="repeating_melee">
 						<div class="sheet-row sheet-center sheet-text-middle">
@@ -14934,7 +17724,9 @@
 				<input type="checkbox" name="attr_MeleeWeapon_settings_hide" class="sheet-hidden sheet-hider" value="1"/>
 				
 				
-			<div class="MeleeWeapon_settings">				
+			<div class="MeleeWeapon_settings">	
+				
+				<div class="col-7-8 sheet-wrap-box">				
 					<div class="sheet-row sheet-sub-header">
 						<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME-ATK">Attack Roll Outcome</div>
 						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
@@ -15024,26 +17816,45 @@
 				</div>
               </div>							
 							<span class="sheet-spacer"></span>		
-           </div>			   
+			</div>			   
+              </div>
 		</div>
 						</div>
 					</fieldset>
-				</div>
+				</div>		
+				
+				
 			</div>
-			<span class="sheet-spacer"></span>
+			<span class="sheet-spacer"></span>			
 			<div class=" sheet-area-border" style="padding-left: 20px; padding-right: 20px;">
 				<div class="sheet-row">
 					<div class="sheet-col-1">
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />						
+						<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-mar-l-md">
+							<span  style="font-size: 14px;" data-i18n="RANGED-WEAPONS">RANGED WEAPONS</span>						
+							<div class="sheet-col-1-10 sheet-center"style="float: right; margin-right: 15px;">
+								<button type="action" class="sheet-combat-actions-rep" name="act_RangedWeaponRld" >
+								<span ata-i18n="RELOAD">Reload</span></button>
+							</div>			
+							<div class="sheet-col-1-10 sheet-center"style="float: right;">
+								<button type="action" class="sheet-combat-actions-rep" name="act_RangedAtk" >
+								<span ata-i18n="SHOOT">Shoot</span></button>
+							</div>				
+						</div>	
+
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-mar-t-lg sheet-mar-l-md">
 								<span  style="font-size: 14px" data-i18n="RANGED-WEAPONS">RANGED WEAPONS</span>		
 							<div class="sheet-col-1-13 sheet-center"style="float: right; margin-right: 10px;">
-					<button type="roll" class="sheet-combat-actions-rep" name="roll_RangedAttack" value="@{Whisper} &{template:whfrp2e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Ranged Attack Roll, Add Modifier (Adv. already added)|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Roll, Add Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{showdmg=1}} {{test=$[[0]]}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{range=@{Used_WeaponRange}}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"><span data-i18n="SHOOT">Shoot</span>
+					<button type="roll" class="sheet-combat-actions-rep" name="roll_RangedAttack" value="@{Whisper} &{template:wfrp4e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Ranged Attack Roll Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Roll Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=$[[0]]}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{range=@{Used_WeaponRange}}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"><span data-i18n="SHOOT">Shoot</span>
 					</button>
 							</div>					
 							</div>	
 					</div>	
 							<img src="https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/seperator-center-full.png?raw=true">
 				</div>
+				
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 				<div class="sheet-row sheet-center sheet-sub-header">
 					<div class="sheet-col-18-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="WEAPON">Weapon</div>
 					<div class="sheet-col-1-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="ABBREVIATE-ENCUMBRANCE">Enc</div>
@@ -15051,15 +17862,253 @@
 					<div class="sheet-col-1-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="MOD">Mod</div>
 					<div class="sheet-col-1-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="TARGET2">Target</div>
 					<div class="sheet-col-3-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SB?">SB?</div>
-					<div class="sheet-col-1-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="DMG">Dmg</div>
+					<div class="sheet-col-1-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="+DMG">+Dmg</div>
 					<div class="sheet-col-1-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="RANGE">Range</div>
 					<div class="sheet-col-1-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="ABBREVIATE-AMMUNITION">Ammo</div>
-					<div class="sheet-col-2-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="AMMO-TYPE">Ammo Type</div>
+					<div class="sheet-col-2-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="TYPE">Ammo Type</div>
 					<div class="sheet-col-19-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="QUALITIES-AND-FLAWS">Qualities and Flaws</div>
 					<div class="sheet-col-3-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="ABBREVIATE-IMPALE">Imp</div>
 					<div class="sheet-col-3-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="ABBREVIATE-RANGED">Rgd?</div>
 					<div class="sheet-col-4-100 sheet-center sheet-small-label sheet-vert-middle "></div>
 				</div>
+				
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />
+				<div class="sheet-row sheet-center sheet-sub-header">
+					<div class="sheet-col-18-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="WEAPON">Weapon</div>
+					<div class="sheet-col-1-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="ABBREVIATE-ENCUMBRANCE">Enc</div>
+					<div class="sheet-col-16-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="BALLISTIC-SKILL">BS</div>
+					<div class="sheet-col-3-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SB?">SB?</div>
+					<div class="sheet-col-1-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="+DMG">+Dmg</div>
+					<div class="sheet-col-1-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="DMG">Dmg</div>
+					<div class="sheet-col-1-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="RANGE">Range</div>
+					<div class="sheet-col-1-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="ABBREVIATE-AMMUNITION">Ammo</div>
+					<div class="sheet-col-2-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="TYPE">Ammo Type</div>
+					<div class="sheet-col-19-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="QUALITIES-AND-FLAWS">Qualities and Flaws</div>
+					<div class="sheet-col-1-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="MOD">Mod</div>
+					<div class="sheet-col-1-25 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="TARGET2">Target</div>
+					<div class="sheet-col-3-100 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="ABBREVIATE-RANGED">Rgd?</div>
+					<div class="sheet-col-4-100 sheet-center sheet-small-label sheet-vert-middle "></div>
+				</div>
+
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
+				<div class="sheet-row">
+					<fieldset class="repeating_ranged">
+						<div class="sheet-row sheet-center sheet-text-middle">
+							<div class="sheet-col-18-100 sheet-pad-r-sm" style="height: 20px">
+								<input type="text" name="attr_RangedWeaponName" />
+							</div>
+							<div class="sheet-col-1-25 sheet-pad-r-sm">
+								<input type="number" name="attr_RangedEnc" value="0" />
+							</div>
+							<!-- RANGED SKILL SELECTION -->
+							<div class="sheet-col-16-100 sheet-pad-r-sm" style="height: 20px; padding-top: 0px">
+								<select class="sheet-select-no-arrow-center sheet-select-sizing" style="height: 20px; padding-top: 0px" name="attr_RangedBalisticSkill">
+									<option value="(@{RangedBlackpowder})" data-i18n="RANGED-BLACKPOWDER" selected="selected">Ranged (BlackPowder)</option>
+									<option value="(@{RangedBow})" data-i18n="RANGED-BOW">Ranged (Bow)</option>
+									<option value="(@{RangedCrossbow})" data-i18n="RANGED-CROSSBOW">Ranged (Crossbow)</option>
+									<option value="(@{RangedEngineering})" data-i18n="RANGED-ENGINEERING">Ranged (Engineering)</option>
+									<option value="(@{RangedEntangling})" data-i18n="RANGED-ENTANGLING">Ranged (Entangling)</option>
+									<option value="(@{RangedExplosives})" data-i18n="RANGED-EXPLOSIVES">Ranged (Explosives)</option>
+									<option value="(@{RangedSling})" data-i18n="RANGED-SLING">Ranged (Sling)</option>
+									<option value="(@{RangedThrowing})" data-i18n="RANGED-THROWING">Ranged (Throwing)</option>
+								</select>
+							</div>
+							<!-- RANGED SKILL SELECTION END -->
+							<div class="sheet-col-3-100 sheet-pad-r-sm sheet-center">
+								<input type="checkbox" name="attr_RangedStrengthBonus" value="1" />
+							</div>
+							<div class="sheet-col-1-25 sheet-pad-r-sm sheet-center">
+								<input class="sheet-center" type="number" name="attr_RangedDamage" value="0" />
+							</div>
+							<div class="sheet-col-4-100 sheet-pad-r-sm sheet-center">
+								<input class="sheet-center" type="number" name="attr_DamageTotal" value="(@{StrengthBonus}*@{RangedStrengthBonus})+@{RangedDamage}+@{Talent_AccurateShotLvl}" disabled />
+							</div>
+							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm">
+								<input class="sheet-center" type="number" name="attr_WeaponRange" />
+							</div>
+							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm">
+								<input class="sheet-center" type="number" name="attr_RangedAmmo" />
+							</div>
+							<div class="sheet-col-2-25 sheet-center sheet-pad-r-sm" style="height: 21px; padding-top: 1px">
+								<input class="sheet-center" type="text" name="attr_RangedAmmoType" value="Ammo" />
+							</div>
+							<div class="sheet-col-19-100 sheet-pad-r-sm">
+								<textarea class="sheet-left sheet-xs-textarea" style="height: 20px" name="attr_RangedQualities"></textarea>
+							</div>
+							<div class="sheet-col-1-25 sheet-pad-r-sm">
+								<input type="number" name="attr_RangedBonus" value="0" />
+							</div>
+							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
+								<input type="value" class="sheet-center" name="attr_targetranged" value="(@{RangedBalisticSkill}+@{RangedBonus}+(10*@{RangedAccurate})+(@{Advantage}*10)+(@{condgen_see_move}*-1))" disabled />
+							</div>
+							<div class="sheet-col-3-100 sheet-center sheet-pad-r-sm">
+								<input type="checkbox" name="attr_UsedRanged" value="1" />
+							</div>
+							
+              <label class="sheet-col-4-100 sheet-center talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_RangedWeapon_settings_hide" value="0"/>			  
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_RangedWeapon_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow" style="padding-left: 10px">
+				<input type="checkbox" name="attr_RangedWeapon_settings_hide" class="sheet-hidden sheet-hider" value="1"/>
+				
+				
+			<div class="MeleeWeapon_settings">	
+				<div class="col-7-8 sheet-wrap-box">		
+					<div class="sheet-row sheet-left sheet-wrap-box">		
+						<div class="sheet-col-1-6 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="RELOAD">Reload</span>
+						</div>	
+						<div class="sheet-col-1-15 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_RangedReload" value="1" />
+						</div>	
+				<input type="checkbox" name="attr_RangedReload" class="sheet-hidden sheet-hider" value="1"/>		
+						<div class="sheet-col-1-18 sheet-left">	
+						<span style="padding-left: 0px; font-size: 11px" data-i18n="RATING">Rating</span>
+						</div>	
+				<input type="checkbox" name="attr_RangedReload" class="sheet-hidden sheet-hider" value="1"/>	
+						<div class="sheet-col-1-30 sheet-left sheet-pad-l-sm">
+							<input type="number" name="attr_RangedReloadRatingInput" value="0" min="0" max="9"  style="height: 14px;"/>
+							<input type="number" class="sheet-hidden" name="attr_RangedReloadRating" value="[[@{RangedReloadRatingInput}*@{RangedReload}]]" disabled />
+						</div>			
+						<div class="sheet-col-1-6 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="BLAST">Blast</span>
+						</div>	
+						<div class="sheet-col-1-15 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_RangedBlast" value="1" />
+						</div>	
+				<input type="checkbox" name="attr_RangedBlast" class="sheet-hidden sheet-hider" value="1"/>		
+						<div class="sheet-col-1-18 sheet-left">	
+						<span style="padding-left: 0px; font-size: 11px" data-i18n="RATING">Rating</span>
+						</div>	
+				<input type="checkbox" name="attr_RangedBlast" class="sheet-hidden sheet-hider" value="1"/>	
+						<div class="sheet-col-1-30 sheet-left sheet-pad-l-sm">
+							<input type="number" name="attr_RangedBlastRating" value="0" min="0" max="9"  style="height: 14px;"/>
+						</div>	
+					</div>
+						
+		<span class="sheet-spacer"></span>	
+								
+					<div class="sheet-row sheet-left">
+						
+						<div class="sheet-col-1-10 sheet-right">		
+						<span style="padding-left: 5px; font-size: 11px" data-i18n="ACCURATE">Accurate</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_RangedAccurate" value="1" />
+						</div>
+						<div class="sheet-col-1-9 sheet-right">		
+						<span style="padding-left: 5px; font-size: 11px" data-i18n="BLACKPOWDER">Blackpowder</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_UsedBlackpowder" value="1" />
+						</div>
+						<div class="sheet-col-1-10 sheet-right">		
+						<span style="padding-left: 12px; font-size: 11px" data-i18n="DAMAGING">Damaging</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_UsedDamaging" value="1" />
+						</div>	
+						<div class="sheet-col-1-13 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="IMPALE">Impale</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_RangedImpale"  value="3" />
+						</div>
+						<div class="sheet-col-1-10 sheet-right">
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="PRACTICAL">Practical</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_RangedPractical" value="1" />
+						</div>	
+						<div class="sheet-col-1-13 sheet-right">		
+						<span style="padding-left: 13px; font-size: 11px" data-i18n="PRECISE">Precise</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_RangedPrecise" value="1" />
+						</div>
+						<div class="sheet-col-1-10 sheet-right">		
+						<span style="padding-left: 5px; font-size: 11px" data-i18n="PENETRATING">Penetrating</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_RangedPenetrating" value="1" />
+						</div>
+					</div>	
+								
+		<span class="sheet-spacer"></span>	
+								
+					<div class="sheet-row sheet-left">
+						
+						<div class="sheet-col-1-9 sheet-right">		
+						<span style="padding-left: 5px; font-size: 11px" data-i18n="DANGEROUS">Dangerous</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_UsedDangerous" value="1" />
+						</div>
+						<div class="sheet-col-1-11 sheet-right">		
+						<span style="padding-left: 5px; font-size: 11px" data-i18n="IMPRECISE">Imprecise</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_UsedImprecise" value="1" />
+						</div>
+					</div>	
+								
+		<span class="sheet-spacer"></span>	
+					
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME-RGD">Ranged Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_RangedWeapon_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_RangedWeapon_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_RangedWeapon_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_RangedWeapon_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_RangedWeapon_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_RangedWeapon_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+							<span class="sheet-spacer"></span>		
+				</div>			
+           </div>			   
+		</div>	
+						</div>
+					</fieldset>
+				</div>
+				
+				
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 				<div class="sheet-row">
 					<fieldset class="repeating_ranged">
 						<div class="sheet-row sheet-center sheet-text-middle">
@@ -15123,7 +18172,8 @@
 				<input type="checkbox" name="attr_RangedWeapon_settings_hide" class="sheet-hidden sheet-hider" value="1"/>
 				
 				
-			<div class="MeleeWeapon_settings">				
+			<div class="MeleeWeapon_settings">	
+				<div class="col-7-8 sheet-wrap-box">				
 					<div class="sheet-row sheet-sub-header">
 						<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME-RGD">Ranged Roll Outcome</div>
 						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
@@ -15167,12 +18217,15 @@
 					<input class="wfrp-settings__checkbox" name="attr_RangedWeapon_mod3" type="text" value="" placeholder="text"/>
 				</div>
               </div>
-							<span class="sheet-spacer"></span>		
+							<span class="sheet-spacer"></span>	
+              </div>	
            </div>			   
 		</div>	
 						</div>
 					</fieldset>
 				</div>
+				
+				
 			</div>
 		</div>
 		<!-- ARMOR TAB -->
@@ -16133,7 +19186,7 @@
 					</div>
 					<div class="sheet-row sheet-spell-header">
 						<div class="sheet-col-1 sheet-vert-bottom sheet-center sheet-small-label sheet-mar-t-lg">
-							<span data-i18n="ARMOR-PENALTIES">Armor Penalties</span>
+							<span class="sheet-pictos-three"  style="margin-right: 4px; color: black; font-size: 8px;">b</span><span data-i18n="ARMOR-PENALTIES">Armor Penalties</span>
 						</div>
 					</div>
 					<div class="sheet-row">
@@ -16217,22 +19270,22 @@
 			<span class="sheet-spacer"></span>					
 			<div class="sheet-row">			
 				<div class="sheet-col-1-4 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:whfrp2e} {{title=^{MINOR-MISCAST}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:wfrp4e} {{title=^{MINOR-MISCAST}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
 						<span data-i18n="MINOR-MISCAST">Minor Miscast</span>
 					</button>
 				</div>		
 				<div class="sheet-col-1-4 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:whfrp2e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:wfrp4e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
 						<span data-i18n="MAJOR-MISCAST">Major Miscast</span>
 					</button>
 				</div>
 				<div class="sheet-col-1-4  sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:whfrp2e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll= [[[[1d100]] [ROLL] + (@{Sin}*10) [SIN] ]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:wfrp4e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll= [[[[1d100]] [ROLL] + (@{Sin}*10) [SIN] ]]}}">
 						<span data-i18n="WRATH-OF-THE-GODS">Wrath of the Gods</span>
 					</button>
 				</div>
 				<div class="sheet-col-1-4  sheet-center">
-								<button type="roll" class="sheet-combat-actions-np" name="roll_Dispel" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{title=Dispel}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}}{{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage_casting}*10*@{Advantage_casting}]] [ADV] ]]}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{rolltype=[[5]]}} {{arcanetest=true}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RT-reroll}Dispel)}}">
+								<button type="roll" class="sheet-combat-actions-np" name="roll_Dispel" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{title=Dispel}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}}{{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage_casting}*10*@{Advantage_casting}]] [ADV] ]]}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{rolltype=[[5]]}} {{arcanetest=true}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RT-reroll}Dispel)}}">
 						<span data-i18n="DISPEL">Dispel</span>
 					</button>					
 				</div>
@@ -16258,7 +19311,7 @@
 			</span>
 			<span style="padding-left: 14px; font-size: 11px" data-i18n="AETHYRIC-ATTUNEMENT">Aethyric Attunement</span>
 			<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
-				<select class="sheet-select-no-arrow-center sheet-select-sizing" name="attr_spelltalent1">
+				<select class="sheet-select-no-arrow-center sheet-select-sizing" name="attr_Talent_AethyricAttunementLvl">
 						<option value="0" selected="selected">0</option>
 						<option value="1">1</option>
 						<option value="2">2</option>
@@ -16273,7 +19326,7 @@
 			</div>
 			<span style="padding-left: 6px; font-size: 11px" data-i18n="INSTICTIVE-DICTION">Instinctive Diction:</span>
 			<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
-				<select class="sheet-select-no-arrow-center sheet-select-sizing" name="attr_spelltalent2">
+				<select class="sheet-select-no-arrow-center sheet-select-sizing" name="attr_Talent_InstinctiveDictionLvl">
 						<option value="0" selected="selected">0</option>
 						<option value="1">1</option>
 						<option value="2">2</option>
@@ -16288,7 +19341,7 @@
 			</div>
 			<span style="padding-left: 6px; font-size: 11px" data-i18n="PERFECT-PITCH">Perfect Pitch</span>
 			<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
-				<select class="sheet-select-no-arrow-center sheet-select-sizing" name="attr_spelltalent3">
+				<select class="sheet-select-no-arrow-center sheet-select-sizing" name="attr_Talent_PerfectPitchLvl">
 						<option value="0" selected="selected">0</option>
 						<option value="1">1</option>
 						<option value="2">2</option>
@@ -16303,7 +19356,7 @@
 			</div>
 			<span style="padding-left: 6px; font-size: 11px" data-i18n="HOLY-HATRED">Holy Hatred</span>
 			<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
-				<select class="sheet-select-no-arrow-center sheet-select-sizing" name="attr_spelltalent4">
+				<select class="sheet-select-no-arrow-center sheet-select-sizing" name="attr_Talent_HolyHatredLvl">
 						<option value="0" selected="selected">0</option>
 						<option value="1">1</option>
 						<option value="2">2</option>
@@ -16316,11 +19369,14 @@
 						<option value="9">9</option>
 				</select>
 			</div>	
-			<input type="hidden" class="sheet-center" name="attr_spelltalent23" value="@{spelltalent2}+@{spelltalent3}" disabled="disabled" />										
+			<input type="hidden" class="sheet-center" name="attr_Talent_InstinctiveandPitch" value="@{Talent_InstinctiveDictionLvl}+@{Talent_PerfectPitchLvl}" disabled="disabled" />										
 			
 			<span class="sheet-spacer"></span>
 			<!-- PETTY SPELLS -->
+			
 			<div class="sheet-spell-page0">
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
+			<div class="sheet-row">
 				<fieldset class="repeating_spellbookpetty">	
 				<input class="sheet-hidden" type="hidden" name="attr_RR-rep" value="[1](~@{character_name}|repeating_spellbookpetty_@{rep_ID}_" />
 					<div class="sheet-wrap-box sheet-mar-b-md">
@@ -16415,13 +19471,13 @@
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{mod1type=[[@{PettySpell_modtype1}]]}} {{mod1=@{PettySpell_mod1}}} {{mod2type=[[@{PettySpell_modtype2}]]}} {{mod2=@{PettySpell_mod2}}} {{mod3type=[[@{PettySpell_modtype3}]]}} {{mod3=@{PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCast)}} {{sptal2=[[@{spelltalent2}]]}} {{sptal3=[[@{spelltalent3}]]}} {{sptal23=[[@{spelltalent23}]]}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{mod1type=[[@{PettySpell_modtype1}]]}} {{mod1=@{PettySpell_mod1}}} {{mod2type=[[@{PettySpell_modtype2}]]}} {{mod2=@{PettySpell_mod2}}} {{mod3type=[[@{PettySpell_modtype3}]]}} {{mod3=@{PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{spelldamage}+@{spelldamagewb}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{PettySpell_modtype1}]]}} {{mod1=@{PettySpell_mod1}}} {{mod2type=[[@{PettySpell_modtype2}]]}} {{mod2=@{PettySpell_mod2}}} {{mod3type=[[@{PettySpell_modtype3}]]}} {{mod3=@{PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCastDmg)}} {{sptal2=[[@{spelltalent2}]]}} {{sptal3=[[@{spelltalent3}]]}} {{sptal23=[[@{spelltalent23}]]}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{spelldamage}+@{spelldamagewb}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{PettySpell_modtype1}]]}} {{mod1=@{PettySpell_mod1}}} {{mod2type=[[@{PettySpell_modtype2}]]}} {{mod2=@{PettySpell_mod2}}} {{mod3type=[[@{PettySpell_modtype3}]]}} {{mod3=@{PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCastDmg)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
@@ -16492,10 +19548,199 @@
 							</div>
 						</div>
 					</div>
+			</div>
 				</fieldset>
 			</div>
+			
+			
+			
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />
+			<div class="sheet-row">	
+				<fieldset class="repeating_spellbookpetty">	
+				<input class="sheet-hidden" type="hidden" name="attr_RR-rep" value="[1](~@{character_name}|repeating_spellbookpetty_@{rep_ID}_" />
+					<div class="sheet-wrap-box sheet-mar-b-md">
+						<div class="sheet-row sheet-pad-b-sm">
+							<div class="sheet-col-1-3 sheet-center sheet-vert-middle sheet-pad-l-sm sheet-pad-r-sm">
+								<select class="sheet-center sheet-spell-name" name="attr_spellname">
+								<option value="">Select Spell</option>
+									<option value="@{custompettyname}">Custom Spell Name -- Use field to the right ></option>
+									<option value="Animal Friend">Animal Friend</option>
+									<option value="Bearings">Bearings</option>
+									<option value="Dazzle">Dazzle</option>
+									<option value="Careful Step">Careful Step</option>
+									<option value="Conserve">Conserve</option>
+									<option value="Dart">Dart</option>
+									<option value="Drain">Drain</option>
+									<option value="Eavesdrop">Eavesdrop</option>
+									<option value="Gust">Gust</option>
+									<option value="Light">Light</option>
+									<option value="Magic Flame">Magic Flame</option>
+									<option value="Marsh Lights">Marsh Lights</option>
+									<option value="Murmured Whisper">Murmured Whisper</option>
+									<option value="Open Lock">Open Lock</option>
+									<option value="Produce Small Animal">Produce Small Animal</option>
+									<option value="Protection from Rain">Protection from Rain</option>
+									<option value="Purify Water">Purify Water</option>
+									<option value="Rot">Rot</option>
+									<option value="Sleep">Sleep</option>
+									<option value="Spring">Spring</option>
+									<option value="Shock">Shock</option>
+									<option value="Sly Hands">Sly Hands</option>
+									<option value="Sounds">Sounds</option>
+									<option value="Twitch">Twitch</option>
+									<option value="Warning">Warning</option>
+								</select>
+							</div>
+							<div class="sheet-col-1-4 sheet-pad-r-sm">
+								<input type="text" name="attr_custompettyname" />
+							</div>
+						</div>
+							<input type="hidden" class="sheet-center" name="attr_rep_ID" value="0" />
+						<div class="sheet-row sheet-pad-b-sm">
+							<input type="hidden" class="sheet-center" name="attr_spellpettynumber" value="0" disabled="disabled" />
+							<div class="sheet-col-1-5 sheet-center sheet-vert-middle sheet-pad-l-sm sheet-pad-r-sm">
+								<div class="sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="DURATION">Duration</span>
+								</div>
+								<input type="text" class="sheet-center" name="attr_spellduration" />
+							</div>
+							<div class="sheet-col-1-6 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="RANGE">Range</span>
+								</div>
+								<input type="text" class="sheet-center" name="attr_spellrange" />
+							</div>
+							<div class="sheet-col-1-5 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="TARGET">Target</span>
+								</div>
+								<input type="text" class="sheet-center" name="attr_spelltarget" />
+							</div>
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="DMG?">DMG?</span>
+								</div>
+								<input class="sheet-center" style="height:20px" type="checkbox" name="attr_SpellDmg" value="1" />
+							</div>
+							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="WPB?">WPB?</span>
+								</div>
+								<input class="sheet-center" style="height:20px" type="checkbox" name="attr_spelldamagewb" value="@{WillPowerBonus}" />
+							</div>
+							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="ABBREVIATE-DAMAGE">Dmg</span>
+								</div>
+								<input type="text" class="sheet-center" name="attr_spelldamage" value="0" />
+							</div>
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-s">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="MOD">Mod</span>
+								</div>
+								<input type="number" name="attr_SpellMod" value="0" />
+							</div>
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-s">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="TARGET2">Target</span>
+								</div>
+								<input type="value" class="sheet-center" name="attr_targetspell" value="(@{LangMagick}+@{SpellMod}+(@{Advantage}*10*@{Advantage_casting}))+(@{condgen_see}*-1)" disabled />
+							</div>
+							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />
+							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm">
+								<button type="action" class="sheet-roll-flex" name="act_spellcast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{mod1type=[[@{PettySpell_modtype1}]]}} {{mod1=@{PettySpell_mod1}}} {{mod2type=[[@{PettySpell_modtype2}]]}} {{mod2=@{PettySpell_mod2}}} {{mod3type=[[@{PettySpell_modtype3}]]}} {{mod3=@{PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}}">
+									<span data-i18n="CAST">Cast</span>
+								</button>
+							</div>
+							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
+							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm">
+								<button type="action" class="sheet-roll-flex" name="act_spellcastdmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{spelldamage}+@{spelldamagewb}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{PettySpell_modtype1}]]}} {{mod1=@{PettySpell_mod1}}} {{mod2type=[[@{PettySpell_modtype2}]]}} {{mod2=@{PettySpell_mod2}}} {{mod3type=[[@{PettySpell_modtype3}]]}} {{mod3=@{PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCastDmg)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}}">
+									<span data-i18n="CAST">Cast</span>
+								</button>
+							</div>
+
+              <label class="sheet-col-1-30 talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_PettySpell_settings_hide" value="0"/>			  
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_PettySpell_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_PettySpell_settings_hide" class="sheet-hidden sheet-hider" value="1"/>
+				
+				
+			<div class="MeleeWeapon_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_PettySpell_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_PettySpell_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_PettySpell_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_PettySpell_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_PettySpell_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_PettySpell_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			<span class="sheet-spacer"></span>	
+              </div>
+
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-col-1 sheet-center sheet-pad-l-sm sheet-pad-r-sm sheet-pad-b-sm">
+								<div class="sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="SPELL-DESCRIPTION">Spell Description</span>
+								</div>
+								<textarea type="text" class="sheet-small-textarea-resize" name="attr_spelldescription"></textarea>
+							</div>
+						</div>
+					</div>
+				</div>
+				</fieldset>
+			</div>			
+			</div>			
+			
+			
 			<!-- ARCANE SPELLS -->
+			
+
+				
 			<div class="sheet-spell-page1">
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />		
+			<div class="sheet-row">
+			
 				<fieldset class="repeating_spellbookarcane">
 				<input class="sheet-hidden" type="hidden" name="attr_RR-rep" value="[1](~@{character_name}|repeating_spellbookarcane_@{rep_ID}_" />
 					<div class="sheet-wrap-box sheet-mar-b-md">
@@ -16721,13 +19966,13 @@
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}}{{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{ARCANE-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{accuchanexlsl=[[@{spellchannelsl}]]}} {{spelldescription=@{spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{mod1type=[[@{ArcaneSpell_modtype1}]]}} {{mod1=@{ArcaneSpell_mod1}}} {{mod2type=[[@{ArcaneSpell_modtype2}]]}} {{mod2=@{ArcaneSpell_mod2}}} {{mod3type=[[@{ArcaneSpell_modtype3}]]}} {{mod3=@{ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCast)}} {{sptal2=[[@{spelltalent2}]]}} {{sptal3=[[@{spelltalent3}]]}} {{sptal23=[[@{spelltalent23}]]}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}}{{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{ARCANE-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{accuchanexlsl=[[@{spellchannelsl}]]}} {{spelldescription=@{spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{mod1type=[[@{ArcaneSpell_modtype1}]]}} {{mod1=@{ArcaneSpell_mod1}}} {{mod2type=[[@{ArcaneSpell_modtype2}]]}} {{mod2=@{ArcaneSpell_mod2}}} {{mod3type=[[@{ArcaneSpell_modtype3}]]}} {{mod3=@{ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveDictionLvl3}]]}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_SpellCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{ARCANE-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{accuchanexlsl=[[@{spellchannelsl}]]}} {{spelldescription=@{spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{spelldamage}+@{spelldamagewb}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{ArcaneSpell_modtype1}]]}} {{mod1=@{ArcaneSpell_mod1}}} {{mod2type=[[@{ArcaneSpell_modtype2}]]}} {{mod2=@{ArcaneSpell_mod2}}} {{mod3type=[[@{ArcaneSpell_modtype3}]]}} {{mod3=@{ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCastDmg)}} {{sptal2=[[@{spelltalent2}]]}} {{sptal3=[[@{spelltalent3}]]}} {{sptal23=[[@{spelltalent23}]]}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{ARCANE-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{accuchanexlsl=[[@{spellchannelsl}]]}} {{spelldescription=@{spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{spelldamage}+@{spelldamagewb}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{ArcaneSpell_modtype1}]]}} {{mod1=@{ArcaneSpell_mod1}}} {{mod2type=[[@{ArcaneSpell_modtype2}]]}} {{mod2=@{ArcaneSpell_mod2}}} {{mod3type=[[@{ArcaneSpell_modtype3}]]}} {{mod3=@{ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCastDmg)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveDictionLvl3}]]}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
@@ -16832,7 +20077,7 @@
 							</div>
 							
 							<div class="sheet-col-1-12 sheet-center sheet-pad-l-md sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Channeling Roll Modifier|@{ChanMod}}]]}} {{title=@{spellname}}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + @{ExtChannellingLore} [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{accuchanexlsl=[[?{Accumulated Extended Channelling SL (Start at 0)|@{spellchannelsl}}}} {{SLmod=[[?{SL Modifier|0}]]]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ExtChannellingLoreRoll_modtype1}]]}} {{mod1=@{ExtChannellingLoreRoll_mod1}}} {{mod2type=[[@{ExtChannellingLoreRoll_modtype2}]]}} {{mod2=@{ExtChannellingLoreRoll_mod2}}} {{mod3type=[[@{ExtChannellingLoreRoll_modtype3}]]}} {{mod3=@{ExtChannellingLoreRoll_mod3}}} {{NPC=[[0]]}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}ExtChannellingLoreRoll)}} {{sptal1=[[@{spelltalent1}]]}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Channeling Roll Modifier|@{ChanMod}}]]}} {{title=@{spellname}}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + @{ExtChannellingLore} [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{accuchanexlsl=[[?{Accumulated Extended Channelling SL (Start at 0)|@{spellchannelsl}}}} {{SLmod=[[?{SL Modifier|0}]]]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ExtChannellingLoreRoll_modtype1}]]}} {{mod1=@{ExtChannellingLoreRoll_mod1}}} {{mod2type=[[@{ExtChannellingLoreRoll_modtype2}]]}} {{mod2=@{ExtChannellingLoreRoll_mod2}}} {{mod3type=[[@{ExtChannellingLoreRoll_modtype3}]]}} {{mod3=@{ExtChannellingLoreRoll_mod3}}} {{NPC=[[0]]}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}ExtChannellingLoreRoll)}} {{sptal1=[[@{Talent_AethyricAttunementLvl}]]}}">
 									<span data-i18n="CHANNEL">Channel</span>
 								</button>
 							</div>
@@ -16907,8 +20152,437 @@
 					</div>
 				</fieldset>
 			</div>
+			
+			
+			
+			
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />		
+			<div class="sheet-row">
+			
+				<fieldset class="repeating_spellbookarcane">
+				<input class="sheet-hidden" type="hidden" name="attr_RR-rep" value="[1](~@{character_name}|repeating_spellbookarcane_@{rep_ID}_" />
+					<div class="sheet-wrap-box sheet-mar-b-md">
+						<div class="sheet-row sheet-pad-b-sm">
+							<div class="sheet-col-1-3 sheet-center sheet-vert-middle sheet-pad-l-sm sheet-pad-r-sm">
+								<select class="sheet-center sheet-spell-name" name="attr_spellname">
+									<option value="">Select Spell</option>
+									<option value="@{customarcaname}">Custom Spell Name -- Use field to the right ></option>
+									<optgroup label="Arcane">
+										<option value="Aethyric Armour">Aethyric Armour</option>
+										<option value="Aethyric Arms">Aethyric Arms</option>
+										<option value="Arrow Shield">Arrow Shield</option>
+										<option value="Blast">Blast</option>
+										<option value="Bolt">Bolt</option>
+										<option value="Breath">Breath</option>
+										<option value="Bridge">Bridge</option>
+										<option value="Chain Attack">Chain Attack</option>
+										<option value="Corrosive Blood">Corrosive Blood</option>
+										<option value="Dark Vision">Dark Vision</option>
+										<option value="Distracting">Distracting</option>
+										<option value="Dome">Dome</option>
+										<option value="Drop">Drop</option>
+										<option value="Entangle">Entangle</option>
+										<option value="Fearsome">Fearsome</option>
+										<option value="Flight">Flight</option>
+										<option value="Magic Shield">Magic Shield</option>
+										<option value="Move Object">Move Object</option>
+										<option value="Mundane Aura">Mundane Aura</option>
+										<option value="Push">Push</option>
+										<option value="Teleport">Teleport</option>
+										<option value="Terrifying">Terrifying</option>
+										<option value="Ward">Ward</option>
+									</optgroup>
+									<optgroup label="Lore of Beasts">
+										<option value="Amber Talons">Amber Talons</option>
+										<option value="Beast Form">Beast Form</option>
+										<option value="Beast Master">Beast Master</option>
+										<option value="Beast Tongue">Beast Tongue</option>
+										<option value="Flock Doom">Flock of Doom</option>
+										<option value="Hunter's Hide">Hunter&#39;s Hide</option>
+										<option value="Amber Spear">The Amber Spear</option>
+										<option value="Wyssan's Wildform">Wyssan&#39;s Wildform</option>
+									</optgroup>
+									<optgroup label="Lore of Death">
+										<option value="Caress of Laniph">Caress of Laniph</option>
+										<option value="Dying Words">Dying Words</option>
+										<option value="Purple Pall of Shyish">Purple Pall of Shyish</option>
+										<option value="Sanctify">Sanctify</option>
+										<option value="Scythe of Shyish">Scythe of Shyish</option>
+										<option value="Soul Vortex">Soul Vortex</option>
+										<option value="Steal Life">Steal Life</option>
+										<option value="Swift Passing">Swift Passing</option>
+									</optgroup>
+									<optgroup label="Lore of Fire">
+										<option value="Aqshy's Aegis">Aqshy&#39;s Aegis</option>
+										<option value="Cauterise">Cauterise</option>
+										<option value="Crown of Flame">Crown of Flame</option>
+										<option value="Flaming Hearts">Flaming Hearts</option>
+										<option value="Firewall">Firewall</option>
+										<option value="Great Fires of U'zhul">Great Fires of U&#39;Zhul</option>
+										<option value="Flaming Sword of Rhuin">Flaming Sword of Rhuin</option>
+										<option value="Purge">Purge</option>
+									</optgroup>
+									<optgroup label="Lore of Heavens">
+										<option value="Cerulean Shield">Cerulean Shield</option>
+										<option value="Comet of Casandora">Comet of Casandora</option>
+										<option value="Fate's Fickle Fingers">Fate&#39;s Fickle Fingers</option>
+										<option value="Starcrossed">Starcrossed</option>
+										<option value="T'essla's Arc">T&#39;Essla&#39;s Arc</option>
+										<option value="The First Portent of Amul">The First Portent of Amul</option>
+										<option value="The Second Portent of Amul">The Second Portent of Amul</option>
+										<option value="The Third Portent of Amul">The Third Portent of Amul</option>
+									</optgroup>
+									<optgroup label="Lore of Metal">
+										<option value="Crucible of Chamon">Crucible of Chamon</option>
+										<option value="Enchant Weapon">Enchant Weapon</option>
+										<option value="Feather of Lead">Feather of Lead</option>
+										<option value="Fool's Gold">Fool&#39;s Gold</option>
+										<option value="Forge of Chamon</">Forge of Chamon</option>
+										<option value="Glittering Robe">Glittering Robe</option>
+										<option value="Mutable Metal">Mutable Metal</option>
+										<option value="Transmutation of Chamon">Transmutation of Chamon</option>
+									</optgroup>
+									<optgroup label="Lore of Life">
+										<option value="Barkskin">Barkskin</option>
+										<option value="Earthblood">Earthblood</option>
+										<option value="Earthpool">Earthpool</option>
+										<option value="Fat of the Land">Fat of the Land</option>
+										<option value="Forest of Thorns">Forest of Thorns</option>
+										<option value="Lie of the Land">Lie of the Land</option>
+										<option value="Lifebloom">Lifebloom</option>
+										<option value="Regenerate">Regenerate</option>
+									</optgroup>
+									<optgroup label="Lore of Light">
+										<option value="Banishment">Banishment</option>
+										<option value="Blinding Light">Blinding Light</option>
+										<option value="Clarity of Thought">Clarity of Thought</option>
+										<option value="Daemonbane">Daemonbane</option>
+										<option value="Healing Light">Healing Light</option>
+										<option value="Net of Amyntok">Net of Amyntok</option>
+										<option value="Pha's Protection">Pha&#39;s Protection</option>
+										<option value="Speed of Thought">Speed of Thought</option>
+									</optgroup>
+									<optgroup label="Lore of Shadows">
+										<option value="Choking Shadows">Choking Shadows</option>
+										<option value="Doppelganger">Doppelganger</option>
+										<option value="Illusion">Illusion</option>
+										<option value="Mindslip">Mindslip</option>
+										<option value="Mystifying Miasma">Mystifying Miasma</option>
+										<option value="Shadowsteed">Shadowsteed</option>
+										<option value="Shadowstep">Shadowstep</option>
+										<option value="Shroud of Invisibility">Shroud of Invisibility</option>
+									</optgroup>
+									<optgroup label="Lore of Hedgecraft">
+										<option value="Goodwill">Goodwill</option>
+										<option value="Mirkride">Mirkride</option>
+										<option value="Nepenthe">Nepenthe</option>
+										<option value="Nostrum">Nostrum</option>
+										<option value="Part the Branches">Part the Branches</option>
+										<option value="Protective Charm">Protective Charm</option>
+									</optgroup>
+									<optgroup label="Lore of Witchcraft">
+										<option value="blight">Blight</option>
+										<option value="Creeping Menace">Creeping Menace</option>
+										<option value="Curse of Crippling Pain">Curse of Crippling Pain</option>
+										<option value="Curse of Ill-Fortune">Curse of Ill-Fortune</option>
+										<option value="Haunting Horror">Haunting Horror</option>
+										<option value="The Evil Eye">The Evil Eye</option>
+									</optgroup>
+									<optgroup label="Lore of Daemonology">
+										<option value="Destroy Lesser Daemon">Destroy Lesser Daemon</option>
+										<option value="Detect Daemon">Detect Daemon</option>
+										<option value="Manifest Lesser Daemon">Manifest Lesser Daemon</option>
+										<option value="Octagram">Octagram</option>
+									</optgroup>
+									<optgroup label="Lore of Necromancy">
+										<option value="Raise Dead">Raise Dead</option>
+										<option value="Reanimate">Reanimate</option>
+										<option value="Screaming Skull">Screaming Skull</option>
+										<option value="Vanhel's Call">Vanhel&#39;s Call</option>
+									</optgroup>
+									<optgroup label="Lore of Nurgle">
+										<option value="Stream of Corruption">Stream of Corruption</option>
+									</optgroup>
+									<optgroup label="Lore of Slaanesh">
+										<option value="Acquiescence">Acquiescence</option>
+									</optgroup>
+									<optgroup label="Lore of Tzeentch">
+										<option value="Treason of Tzeentch">Treason of Tzeentch</option>
+									</optgroup>
+								</select>
+
+							</div>
+							<div class="sheet-col-1-4 sheet-pad-r-sm" style="height:20px;">
+								<input type="text" style="height:20px;float:top;" name="attr_customarcaname" />
+							</div>
+						</div>
+							<input type="hidden" class="sheet-center" name="attr_rep_ID" value="0" />
+						<div class="sheet-row sheet-pad-b-sm">
+							<div class="sheet-col-1-14 sheet-center sheet-vert-middle sheet-pad-l-sm sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span>Lore</span>
+								</div>
+								<input type="text" class="sheet-center" name="attr_spelllore" value="" />
+							</div>
+							<div class="sheet-col-1-20 sheet-center sheet-vert-middle sheet-pad-l-sm sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="CASTING-NUMBER">CN</span>
+								</div>
+								<input type="number" class="sheet-center" name="attr_spellcastingnumber" value="0" />
+								<input type="hidden" class="sheet-center" name="attr_cn-sl-mod" value="@{spellcastingnumber}" />
+							</div>
+
+							<div class="sheet-col-1-6 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="DURATION">Duration</span>
+								</div>
+								<input type="text" class="sheet-center" name="attr_spellduration" />
+							</div>
+							<div class="sheet-col-1-6 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="RANGE">Range</span>
+								</div>
+								<input type="text" class="sheet-center" name="attr_spellrange" />
+							</div>
+							<div class="sheet-col-1-6 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="TARGET">Target</span>
+								</div>
+								<input type="text" class="sheet-center" name="attr_spelltarget" />
+							</div>
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="DMG?">DMG?</span>
+								</div>
+								<input class="sheet-center" style="height:20px" type="checkbox" name="attr_SpellDmg" value="1" />
+							</div>
+							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="WPB?">WPB?</span>
+								</div>
+								<input class="sheet-center" style="height:20px" type="checkbox" name="attr_spelldamagewb" value="@{WillPowerBonus}" />
+							</div>
+							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="ABBREVIATE-DAMAGE">Dmg</span>
+								</div>
+								<input type="text" class="sheet-center" name="attr_spelldamage" value="0" />
+							</div>
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-s">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="MOD">Mod</span>
+								</div>
+								<input type="number" name="attr_SpellMod" value="0" />
+							</div>
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-s">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="TARGET2">Target</span>
+								</div>
+								<input type="value" class="sheet-center" name="attr_targetspell" value="(@{LangMagick}+@{SpellMod}+(@{Advantage}*10*@{Advantage_casting}))+(@{condgen_see}*-1)" disabled />
+							</div>
+							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
+							<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
+								<button type="action" class="sheet-roll-flex" name="act_spellcast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}}{{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{ARCANE-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{accuchanexlsl=[[@{spellchannelsl}]]}} {{spelldescription=@{spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{mod1type=[[@{ArcaneSpell_modtype1}]]}} {{mod1=@{ArcaneSpell_mod1}}} {{mod2type=[[@{ArcaneSpell_modtype2}]]}} {{mod2=@{ArcaneSpell_mod2}}} {{mod3type=[[@{ArcaneSpell_modtype3}]]}} {{mod3=@{ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveDictionLvl3}]]}}">
+									<span data-i18n="CAST">Cast</span>
+								</button>
+							</div>
+							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
+							<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
+								<button type="action" class="sheet-roll-flex" name="act_spellcastdmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{ARCANE-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{accuchanexlsl=[[@{spellchannelsl}]]}} {{spelldescription=@{spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{spelldamage}+@{spelldamagewb}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{ArcaneSpell_modtype1}]]}} {{mod1=@{ArcaneSpell_mod1}}} {{mod2type=[[@{ArcaneSpell_modtype2}]]}} {{mod2=@{ArcaneSpell_mod2}}} {{mod3type=[[@{ArcaneSpell_modtype3}]]}} {{mod3=@{ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCastDmg)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveDictionLvl3}]]}}">
+									<span data-i18n="CAST">Cast</span>
+								</button>
+							</div>
+              <label class="sheet-col-1-30 talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_ArcaneSpell_settings_hide" value="0"/>			  
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_ArcaneSpell_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_ArcaneSpell_settings_hide" class="sheet-hidden sheet-hider" value="1"/>
+				
+				
+			<div class="MeleeWeapon_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_ArcaneSpell_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_ArcaneSpell_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_ArcaneSpell_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_ArcaneSpell_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_ArcaneSpell_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_ArcaneSpell_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			<span class="sheet-spacer"></span>	
+              </div>
+
+						</div>
+							<input type="hidden" class="sheet-center" name="attr_rep_ID" value="0" />
+							<span class="sheet-spacer"></span>
+						<div class="sheet-row sheet-pad-b-sm">
+
+							<div class="sheet-col-1-4 sheet-center sheet-vert-middle sheet-pad-l-sm sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+								<span data-i18n="CHANNELLING-TEST">Channelling Test Lore</span>
+														
+								</div>
+								<select class="sheet-select-no-arrow-center" name="attr_ExtChannellingLore">
+									<option value="(@{ChannellingFire})" data-i18n="CHANNELLING-FIRE" selected="selected">Channelling (Fire)</option>
+									<option value="(@{ChannellingHeavens})" data-i18n="CHANNELLING-HEAVENS">Channelling (Heavens)</option>
+									<option value="(@{ChannellingMetal})" data-i18n="CHANNELLING-METAL">Channelling (Metal)</option>
+									<option value="(@{ChannellingBeasts})" data-i18n="CHANNELLING-BEASTS">Channelling (Beasts)</option>
+									<option value="(@{ChannellingLife})" data-i18n="CHANNELLING-LIFE">Channelling (Life)</option>
+									<option value="(@{ChannellingLight})" data-i18n="CHANNELLING-LIGHT">Channelling (Light)</option>
+									<option value="(@{ChannellingDeath})" data-i18n="CHANNELLING-DEATH">Channelling (Death)</option>
+									<option value="(@{ChannellingShadows})" data-i18n="CHANNELLING-SHADOWS">Channelling (Shadows)</option>
+									<option value="(@{ChannellingWitch})" data-i18n="CHANNELLING-WITCH">Channelling (Witch)</option>
+									<option value="(@{ChannellingDark})" data-i18n="CHANNELLING-DARK">Channelling (Dark)</option>
+									<option value="(@{ChannellingChaos})" data-i18n="CHANNELLING-CHAOS">Channelling (Chaos)</option>
+									<option value="(@{ChannellingMisc})" data-i18n="CHANNELLING-MISC">Channelling (Misc)</option>
+								</select>
+							</div>							
+							<div class="sheet-col-1-10 sheet-center sheet-vert-middle sheet-pad-l-sm sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span>Accu Ext SL</span>
+								</div>
+								<input type="number" class="sheet-center" name="attr_spellchannelsl" value="0" />
+							</div>
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-s">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="MOD">Mod</span>
+								</div>
+								<input type="number" name="attr_ChanMod" value="0" />
+							</div>
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-s">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="TARGET2">Target</span>
+								</div>
+								<input type="value" class="sheet-center" name="attr_targetchan" value="(@{ExtChannellingLore}+@{ChanMod})+(@{condgen_see}*-1)" disabled />
+							</div>
+							
+							<div class="sheet-col-1-12 sheet-center sheet-pad-l-md sheet-vert-middle">
+								<button type="action" class="sheet-roll-flex" name="act_extchannellingloreroll" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Channeling Roll Modifier|@{ChanMod}}]]}} {{title=@{spellname}}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + @{ExtChannellingLore} [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{accuchanexlsl=[[?{Accumulated Extended Channelling SL (Start at 0)|@{spellchannelsl}}}} {{SLmod=[[?{SL Modifier|0}]]]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ExtChannellingLoreRoll_modtype1}]]}} {{mod1=@{ExtChannellingLoreRoll_mod1}}} {{mod2type=[[@{ExtChannellingLoreRoll_modtype2}]]}} {{mod2=@{ExtChannellingLoreRoll_mod2}}} {{mod3type=[[@{ExtChannellingLoreRoll_modtype3}]]}} {{mod3=@{ExtChannellingLoreRoll_mod3}}} {{NPC=[[0]]}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}ExtChannellingLoreRoll)}} {{sptal1=[[@{Talent_AethyricAttunementLvl}]]}}">
+									<span data-i18n="CHANNEL">Channel</span>
+								</button>
+							</div>
+
+              <label class="sheet-col-1-30 sheet-center talsetshow-check sheet-pad-l-lg">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_ExtChannellingLoreRoll_settings_hide" value="0"/>			  
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_ExtChannellingLoreRoll_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_ExtChannellingLoreRoll_settings_hide" class="sheet-hidden sheet-hider" value="1"/>
+				
+			<div class="MeleeWeapon_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_ExtChannellingLoreRoll_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_ExtChannellingLoreRoll_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_ExtChannellingLoreRoll_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_ExtChannellingLoreRoll_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_ExtChannellingLoreRoll_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_ExtChannellingLoreRoll_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			<span class="sheet-spacer"></span>	
+              </div>
+
+						</div>
+
+						</div>
+						<div class="sheet-row">
+							<div class="sheet-col-1 sheet-center sheet-pad-l-sm sheet-pad-r-sm sheet-pad-b-sm">
+								<div class="sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="SPELL-DESCRIPTION">Spell Description</span>
+								</div>
+								<textarea type="text" class="sheet-small-textarea-resize" name="attr_spelldesc"></textarea>
+							</div>
+						</div>
+					</div>
+					</div>
+				</fieldset>
+			</div>			
+			
+			
+			</div>
+			
+			
+			
 			<!-- DIVINE BLESSINGS -->
+			
+			
 			<div class="sheet-spell-page2">
+			
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
+				<div class="sheet-row">
 				<fieldset class="repeating_divineblessings">
 				<input class="sheet-hidden" type="textarea" name="attr_RR-rep" value="[1](~@{character_name}|repeating_divineblessings_@{rep_ID}_" />
 					<div class="sheet-wrap-box sheet-mar-b-md">
@@ -16975,7 +20649,7 @@
 								<input type="value" class="sheet-center" name="attr_targetbless" value="(@{Pray}+@{BlessMod})" disabled />
 							</div>
 							<div class="sheet-col-1-12 sheet-spell-button-group sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_Bless" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{BlessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{blessingrange}}} {{spelltarget=Targets: @{blessingtarget}}} {{spellduration=Duration: @{blessingduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[{@{PrayChar}+@{PrayAdv}+@{PrayMisc}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{blessingdesc}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[7]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{mod1type=[[@{BlessingSpell_modtype1}]]}} {{mod1=@{BlessingSpell_mod1}}} {{mod2type=[[@{BlessingSpell_modtype2}]]}} {{mod2=@{BlessingSpell_mod2}}} {{mod3type=[[@{BlessingSpell_modtype3}]]}} {{mod3=@{BlessingSpell_mod3}}} {{NPC=[[0]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RR-rep}Bless)}}"><span data-i18n="PRAY">Pray</span>
+								<button type="roll" class="sheet-roll-flex" name="roll_Bless" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{BlessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{blessingrange}}} {{spelltarget=Targets: @{blessingtarget}}} {{spellduration=Duration: @{blessingduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[{@{PrayChar}+@{PrayAdv}+@{PrayMisc}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{blessingdesc}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[7]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{mod1type=[[@{BlessingSpell_modtype1}]]}} {{mod1=@{BlessingSpell_mod1}}} {{mod2type=[[@{BlessingSpell_modtype2}]]}} {{mod2=@{BlessingSpell_mod2}}} {{mod3type=[[@{BlessingSpell_modtype3}]]}} {{mod3=@{BlessingSpell_mod3}}} {{NPC=[[0]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RR-rep}Bless)}}"><span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 
@@ -17047,8 +20721,161 @@
 			</div>
 				</fieldset>
 			</div>
+				
+				
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />
+				<div class="sheet-row">
+				<fieldset class="repeating_divineblessings">
+				<input class="sheet-hidden" type="textarea" name="attr_RR-rep" value="[1](~@{character_name}|repeating_divineblessings_@{rep_ID}_" />
+					<div class="sheet-wrap-box sheet-mar-b-md">
+						<div class="sheet-row sheet-pad-b-sm">
+							<div class="sheet-col-1-3 sheet-center sheet-vert-middle sheet-pad-l-sm sheet-pad-r-sm">
+								<select class="sheet-center sheet-spell-name" name="attr_spellname" >
+									<option value="">Select Blessing</option>
+									<option value="@{customblessname}">Custom Spell Name -- Use field to the right ></option>
+									<option value="Blessing of Battle">Blessing of Battle</option>
+									<option value="Blessing of Breath">Blessing of Breath</option>
+									<option value="Blessing of Charisma">Blessing of Charisma</option>
+									<option value="Blessing of Conscience">Blessing of Conscience</option>
+									<option value="Blessing of Courage">Blessing of Courage</option>
+									<option value="Blessing of Finesse">Blessing of Finesse</option>
+									<option value="Blessing of Fortune">Blessing of Fortune</option>
+									<option value="Blessing of Grace">Blessing of Grace</option>
+									<option value="Blessing of Hardiness">Blessing of Hardiness</option>
+									<option value="Blessing of Healing">Blessing of Healing</option>
+									<option value="Blessing of The Hunt">Blessing of The Hunt</option>
+									<option value="Blessing of Might">Blessing of Might</option>
+									<option value="Blessing of Protection">Blessing of Protection</option>
+									<option value="Blessing of Recuperation">Blessing of Recuperation</option>
+									<option value="Blessing of Righteousness">Blessing of Righteousness</option>
+									<option value="Blessing of Savagery">Blessing of Savagery</option>
+									<option value="Blessing of Tenacity">Blessing of Tenacity</option>
+									<option value="Blessing of Wisdom">Blessing of Wisdom</option>
+									<option value="Blessing of Wit">Blessing of Wit</option>
+								</select>
+							</div>
+							<div class="sheet-col-1-4 sheet-pad-r-sm">
+								<input type="text" style="height:20px;float:top;" name="attr_customblessname" />
+							</div>
+						</div>
+						<input type="hidden" class="sheet-center" name="attr_rep_ID" value="0" />
+						<div class="sheet-row sheet-pad-b-sm">
+							<div class="sheet-col-1-5 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="DURATION">Duration</span>
+								</div>
+								<input type="text" class="sheet-center" name="attr_blessingduration" />
+							</div>
+							<div class="sheet-col-1-5 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="RANGE">Range</span>
+								</div>
+								<input type="text" class="sheet-center" name="attr_blessingrange" />
+							</div>
+							<div class="sheet-col-1-5 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="TARGET">Target</span>
+								</div>
+								<input type="text" class="sheet-center" name="attr_blessingtarget" />
+							</div>
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="MOD">Mod</span>
+								</div>
+								<input type="number" name="attr_BlessMod" value="0" />
+							</div>
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="TARGET2">Target</span>
+								</div>
+								<input type="value" class="sheet-center" name="attr_targetbless" value="(@{Pray}+@{BlessMod})" disabled />
+							</div>
+							<div class="sheet-col-1-12 sheet-spell-button-group sheet-center sheet-pad-r-sm">
+								<button type="action" class="sheet-roll-flex" name="act_bless" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{BlessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{blessingrange}}} {{spelltarget=Targets: @{blessingtarget}}} {{spellduration=Duration: @{blessingduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[{@{PrayChar}+@{PrayAdv}+@{PrayMisc}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{blessingdesc}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[7]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{mod1type=[[@{BlessingSpell_modtype1}]]}} {{mod1=@{BlessingSpell_mod1}}} {{mod2type=[[@{BlessingSpell_modtype2}]]}} {{mod2=@{BlessingSpell_mod2}}} {{mod3type=[[@{BlessingSpell_modtype3}]]}} {{mod3=@{BlessingSpell_mod3}}} {{NPC=[[0]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RR-rep}Bless)}}"><span data-i18n="PRAY">Pray</span>
+								</button>
+							</div>
+
+              <label class="sheet-col-1-30 talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_BlessingSpell_settings_hide" value="0"/>			  
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_BlessingSpell_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_BlessingSpell_settings_hide" class="sheet-hidden sheet-hider" value="1"/>
+				
+				
+			<div class="BlessingSpell_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_BlessingSpell_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_BlessingSpell_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_BlessingSpell_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_BlessingSpell_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_BlessingSpell_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_BlessingSpell_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              </div>
+              </div>
+						<div class="sheet-row">
+							<div class="sheet-col-1 sheet-center sheet-pad-l-sm sheet-pad-r-sm sheet-pad-b-sm">
+								<div class="sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="BLESSING-DESCRIPTION">Blessing Description</span>
+								</div>
+								<input type="hidden" name="attr_spellcastingnumber" value="0" />
+								<textarea class="sheet-small-textarea-resize" name="attr_blessingdesc" ></textarea>
+							</div>
+						</div>
+					</div>
+			</div>
+				</fieldset>
+			</div>				
+				
+				
+			</div>
+			
+			
+			
+			
 			<!-- DIVINE MIRACLES -->
 			<div class="sheet-spell-page3">
+			
+
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
+			<div class="sheet-row">
 				<fieldset class="repeating_divinemiracles">
 				<input class="sheet-hidden" type="hidden" name="attr_RR-rep" value="[1](~@{character_name}|repeating_divinemiracles_@{rep_ID}_" />
 					<div class="sheet-wrap-box sheet-mar-b-md">
@@ -17191,13 +21018,13 @@
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_Miracle" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{MiracleMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{miraclerange}}} {{spelltarget=Targets: @{miracletarget}}} {{spellduration=Duration: @{miracleduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{miracledesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{rolltype=[[7]]}} {{mod1type=[[@{MiracleSpell_modtype1}]]}} {{mod1=@{MiracleSpell_mod1}}} {{mod2type=[[@{MiracleSpell_modtype2}]]}} {{mod2=@{MiracleSpell_mod2}}} {{mod3type=[[@{MiracleSpell_modtype3}]]}} {{mod3=@{MiracleSpell_mod3}}} {{NPC=[[3]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}Miracle)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_Miracle" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{MiracleMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{miraclerange}}} {{spelltarget=Targets: @{miracletarget}}} {{spellduration=Duration: @{miracleduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{miracledesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{rolltype=[[7]]}} {{mod1type=[[@{MiracleSpell_modtype1}]]}} {{mod1=@{MiracleSpell_mod1}}} {{mod2type=[[@{MiracleSpell_modtype2}]]}} {{mod2=@{MiracleSpell_mod2}}} {{mod3type=[[@{MiracleSpell_modtype3}]]}} {{mod3=@{MiracleSpell_mod3}}} {{NPC=[[3]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}Miracle)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll" name="roll_MiracleDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{MiracleMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{miraclerange}}} {{spelltarget=Targets: @{miracletarget}}} {{spellduration=Duration: @{miracleduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{miracledesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{miracledamage}+@{spelltalent4}]]}} {{praytest=true}} {{rolltype=[[8]]}} {{mod1type=[[@{MiracleSpell_modtype1}]]}} {{mod1=@{MiracleSpell_mod1}}} {{mod2type=[[@{MiracleSpell_modtype2}]]}} {{mod2=@{MiracleSpell_mod2}}} {{mod3type=[[@{MiracleSpell_modtype3}]]}} {{mod3=@{MiracleSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}MiracleDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_MiracleDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{MiracleMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{miraclerange}}} {{spelltarget=Targets: @{miracletarget}}} {{spellduration=Duration: @{miracleduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{miracledesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{miracledamage}+@{Talent_HolyHatredLvl}]]}} {{praytest=true}} {{rolltype=[[8]]}} {{mod1type=[[@{MiracleSpell_modtype1}]]}} {{mod1=@{MiracleSpell_mod1}}} {{mod2type=[[@{MiracleSpell_modtype2}]]}} {{mod2=@{MiracleSpell_mod2}}} {{mod3type=[[@{MiracleSpell_modtype3}]]}} {{mod3=@{MiracleSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}MiracleDmg)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -17268,8 +21095,239 @@
 					</div>
 				</fieldset>
 			</div>
+
+			
+			
+		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />
+			<div class="sheet-row">
+				<fieldset class="repeating_divinemiracles">
+				<input class="sheet-hidden" type="hidden" name="attr_RR-rep" value="[1](~@{character_name}|repeating_divinemiracles_@{rep_ID}_" />
+					<div class="sheet-wrap-box sheet-mar-b-md">
+						<div class="sheet-row sheet-pad-b-sm">
+							<div class="sheet-col-1-3 sheet-center sheet-vert-middle sheet-pad-l-sm sheet-pad-r-sm">
+								<select class="sheet-center sheet-spell-name" name="attr_spellname">
+									<option value="">Select Miracle</option>
+									<option value="@{custommiraname}">Custom Spell Name -- Use field to the right ></option>
+									<optgroup label="Miracles of Manaan">
+										<option value="Becalm">Becalm</option>
+										<option value="Drowned Man’s Face">Drowned Man’s Face</option>
+										<option value="Fair Winds">Fair Winds</option>
+										<option value="Manann’s Bounty">Manann’s Bounty</option>
+										<option value="Sea Legs">Sea Legs</option>
+										<option value="Death Mask">Death Mask</option>
+									</optgroup>
+									<optgroup label="Miracles of Morr">
+										<option value="Death Mask">Death Mask</option>
+										<option value="Destroy Undead">Destroy Undead</option>
+										<option value="Dooming">Dooming</option>
+										<option value="Last Rites">Last Rites</option>
+										<option value="Portal’s Threshold">Portal’s Threshold</option>
+										<option value="Stay Morr’s Hand">Stay Morr’s Hand</option>
+									</optgroup>
+									<optgroup label="Miracles of Myrmidia">
+										<option value="Blazing Sun">Blazing Sun</option>
+										<option value="Eagle’s Eye">Eagle’s Eye</option>
+										<option value="Fury’s Call">Fury’s Call</option>
+										<option value="Inspiring">Inspiring</option>
+										<option value="Shield of Myrmidia">Shield of Myrmidia</option>
+										<option value="Spear of Myrmidia">Spear of Myrmidia</option>
+									</optgroup>
+									<optgroup label="Miracles of Ranald">
+										<option value="An Invitation">An Invitation</option>
+										<option value="Cat’s Eyes">Cat’s Eyes</option>
+										<option value="Ranald’s Grace">Ranald’s Grace</option>
+										<option value="Rich Man, Poor Man, Beggar Man, Thief">Rich Man, Poor Man, Beggar Man, Thief</option>
+										<option value="Stay Lucky">Stay Lucky</option>
+										<option value="You Ain’t Seen Me, Right?">You Ain’t Seen Me, Right?</option>
+									</optgroup>
+									<optgroup label="Miracles of Rhya">
+										<option value="Rhya’s Children">Rhya’s Children</option>
+										<option value="Rhya’s Harvest">Rhya’s Harvest</option>
+										<option value="Rhya’s Shelter">Rhya’s Shelter</option>
+										<option value="Rhya’s Succour">Rhya’s Succour</option>
+										<option value="Rhya’s Touch">Rhya’s Touch</option>
+										<option value="Rhya’s Union">Rhya’s Union</option>
+									</optgroup>
+									<optgroup label="Miracles of Shallya">
+										<option value="Anchorite’s Endurance">Anchorite’s Endurance</option>
+										<option value="Balm to a Wounded Mind">Balm to a Wounded Mind</option>
+										<option value="Bitter Catharsis">Bitter Catharsis</option>
+										<option value="Martyr">Martyr</option>
+										<option value="Shallya’s Tears">Shallya’s Tears</option>
+										<option value="Unblemished Innocence">Unblemished Innocence</option>
+									</optgroup>
+									<optgroup label="Miracles of Sigmar">
+										<option value="Beacon of Righteous Virtue">Beacon of Righteous Virtue</option>
+										<option value="Heed Not the Witch">Heed Not the Witch</option>
+										<option value="Sigmar’s Fiery Hammer">Sigmar’s Fiery Hammer</option>
+										<option value="Soulfire">Soulfire</option>
+										<option value="Twin-tailed Comet">Twin-tailed Comet</option>
+										<option value="Vanquish the Unrighteous">Vanquish the Unrighteous</option>
+									</optgroup>
+									<optgroup label="Miracles of Taal">
+										<option value="Animal Instincts">Animal Instincts</option>
+										<option value="King of the Wild">King of the Wild</option>
+										<option value="Leaping Stag">Leaping Stag</option>
+										<option value="Lord of the Hunt">Lord of the Hunt</option>
+										<option value="Tooth and Claw">Tooth and Claw</option>
+										<option value="Tanglefoot">Tanglefoot</option>
+									</optgroup>
+									<optgroup label="Miracles of Ulric">
+										<option value="Hoarfrost’s Chill">Hoarfrost’s Chill</option>
+										<option value="Howl of the Wolf<">Howl of the Wolf</option>
+										<option value="Ulric’s Fury">Ulric’s Fury</option>
+										<option value="Pelt of the Winter Wolf">Pelt of the Winter Wolf</option>
+										<option value="The Snow King’s Judgement">The Snow King’s Judgement</option>
+										<option value="Winter’s Bite">Winter’s Bite</option>
+									</optgroup>
+									<optgroup label="Miracles of Verena">
+										<option value="As Verena Is My Witness">As Verena Is My Witness</option>
+										<option value="Blind Justice">Blind Justice</option>
+										<option value="Shackles of Truth">Shackles of Truth</option>
+										<option value="Sword of Justice">Sword of Justice</option>
+										<option value="Truth Will Out">Truth Will Out</option>
+										<option value="Wisdom of the Owl">Wisdom of the Owl</option>
+									</optgroup>
+								</select>
+
+							</div>
+							<div class="sheet-col-1-4 sheet-pad-r-lg">
+								<input type="text" style="height:20px;float:top;" name="attr_custommiraname" />
+							</div>
+						</div>
+						<input type="hidden" class="sheet-center" name="attr_rep_ID" value="0" />
+						<div class="sheet-row sheet-pad-b-sm">
+							<div class="sheet-col-1-6 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="DURATION">Duration</span>
+								</div>
+								<input type="text" class="sheet-center" name="attr_miracleduration" value="" />
+							</div>
+							<div class="sheet-col-1-6 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="RANGE">Range</span>
+								</div>
+								<input type="text" class="sheet-center" name="attr_miraclerange" value="" />
+							</div>
+							<div class="sheet-col-1-6 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="TARGET">Target</span>
+								</div>
+								<input type="text" class="sheet-center" name="attr_miracletarget" />
+							</div>
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="DMG?">DMG?</span>
+								</div>
+								<input class="sheet-center" style="height:20px" type="checkbox" name="attr_SpellDmg" value="1" />
+							</div>
+							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
+							<div class="sheet-col-1-20 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="ABBREVIATE-DAMAGE">Dmg</span>
+								</div>
+								<input type="text" class="sheet-center" name="attr_miracledamage" value="0" />
+							</div>
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="MOD">Mod</span>
+								</div>
+								<input type="number" name="attr_MiracleMod" value="0" />
+							</div>
+							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-sm">
+								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="TARGET2">Target</span>
+								</div>
+								<input type="value" class="sheet-center" name="attr_targetbless" value="(@{Pray}+@{MiracleMod})" disabled />
+							</div>
+							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
+							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm">
+								<button type="action" class="sheet-roll-flex" name="act_miracle" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{MiracleMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{miraclerange}}} {{spelltarget=Targets: @{miracletarget}}} {{spellduration=Duration: @{miracleduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{miracledesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{rolltype=[[7]]}} {{mod1type=[[@{MiracleSpell_modtype1}]]}} {{mod1=@{MiracleSpell_mod1}}} {{mod2type=[[@{MiracleSpell_modtype2}]]}} {{mod2=@{MiracleSpell_mod2}}} {{mod3type=[[@{MiracleSpell_modtype3}]]}} {{mod3=@{MiracleSpell_mod3}}} {{NPC=[[3]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}Miracle)}}">
+									<span data-i18n="PRAY">Pray</span>
+								</button>
+							</div>
+							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
+							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm">
+								<button type="action" class="sheet-roll-flex" name="act_miracledmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{MiracleMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{miraclerange}}} {{spelltarget=Targets: @{miracletarget}}} {{spellduration=Duration: @{miracleduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{miracledesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{miracledamage}+@{Talent_HolyHatredLvl}]]}} {{praytest=true}} {{rolltype=[[8]]}} {{mod1type=[[@{MiracleSpell_modtype1}]]}} {{mod1=@{MiracleSpell_mod1}}} {{mod2type=[[@{MiracleSpell_modtype2}]]}} {{mod2=@{MiracleSpell_mod2}}} {{mod3type=[[@{MiracleSpell_modtype3}]]}} {{mod3=@{MiracleSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}MiracleDmg)}}">
+									<span data-i18n="PRAY">Pray</span>
+								</button>
+							</div>
+					
+              <label class="sheet-col-1-30 talsetshow-check">
+		<input class="talsetshow-check__hide" type="hidden" name="attr_MiracleSpell_settings_hide" value="0"/>			  
+		<input class="talsetshow-check__hide" type="checkbox" name="attr_MiracleSpell_settings_hide" value="1"/><span class="talsetshow-check__span" checked="unchecked">y</span>
+              </label>
+			
+		<div class="talsetshow">
+				<input type="checkbox" name="attr_MiracleSpell_settings_hide" class="sheet-hidden sheet-hider" value="1"/>
+				
+			<div class="Miracle_settings">				
+					<div class="sheet-row sheet-sub-header">
+						<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME">Roll Outcome</div>
+						<div class="sheet-col-3-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
+					</div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_MiracleSpell_modtype1">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_MiracleSpell_mod1" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_MiracleSpell_modtype2">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_MiracleSpell_mod2" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+			  <div class="sheet-row">
+				<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm sheet-vert-middle">
+					<select class="sheet-select-no-arrow-center" name="attr_MiracleSpell_modtype3">
+						<option value="0" data-i18n="SETTINGS-ROLL-TYPE-UNUSED">Unused</option>
+						<option value="1" data-i18n="SETTINGS-ROLL-TYPE-ALWAYS">Always</option>
+						<option value="2" data-i18n="SETTINGS-ROLL-TYPE-SUCCESS">Success</option>
+						<option value="3" data-i18n="SETTINGS-ROLL-TYPE-FAIL">Fail</option>
+					</select>
+				</div>
+                <div class="sheet-col-3-4">
+					<input class="wfrp-settings__checkbox" name="attr_MiracleSpell_mod3" type="text" value="" placeholder="text"/>
+				</div>
+              </div>
+              </div>
+              </div>
+						<div class="sheet-row">
+							<div class="sheet-col-1 sheet-center sheet-pad-l-sm sheet-pad-r-sm sheet-pad-b-sm">
+								<div class="sheet-small-label sheet-pad-b-sm">
+									<span data-i18n="MIRACLE-DESCRIPTION">Miracle Description</span>
+								</div>
+								<input type="hidden" name="attr_spellcastingnumber" value="0" />
+								<textarea class="sheet-small-textarea-resize" name="attr_miracledesc"></textarea>
+							</div>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+				
+				
+				
+			</div>
 		</div>
 		
+		
+		
+		
 		<!-- INVENTORY TAB -->
 		<div class="sheet-section-inventory">
 			<div class="sheet-row">
@@ -18695,12 +22753,13 @@
 		<div class="sheet-spacer-xl"></div>		
 		<div class="sheet-row sheet-center">
 		<button type="roll" name="roll_url_notes" class="sheet-center" value="https://github.com/Roll20/roll20-character-sheets/blob/master/Warhammer%204e%20Character%20Sheet/README.md"> Release Notes </button>
-		</div>
+		</div>	
+		<input type="checkbox" class="sheet-devmode sheet-hidden">		
 		</div>
 		<div class="sheet-spacer-xl"></div>
 		<!-- FOOTER -->
 		<div class="sheet-row sheet-footer">
-			<div class="sheet-col-1 sheet-small-label sheet-center">Sheet version 1.52 : August 25th 2021 | by Djjus & Pote</div>
+			<div class="sheet-col-1 sheet-small-label sheet-center">Sheet version 1.53 : September 12th 2021 | by Djjus & Pote</div>
 		</div>
 		</div>
 	</div>		
@@ -18713,11 +22772,11 @@
 						</div>	
 </div>
 
-	<rolltemplate class="sheet-rolltemplate-whfrp2e">
+	<rolltemplate class="sheet-rolltemplate-wfrp4e">
 		<div class="sheet-rt-card">
 			<div class="sheet-rt-header sheet-relative {{#chartest}} sheet-ability{{/chartest}}{{#skilltest}} sheet-action{{/skilltest}}{{#skilltest}} sheet-combat-actions{{/skilltest}}{{#healtest}} sheet-heal{{/healtest}}{{#attacktest}} sheet-attack{{/attacktest}}{{#fumbleroll}} sheet-weapon{{/fumbleroll}}{{#amputationroll}} sheet-weapon{{/amputationroll}}{{#critroll}} sheet-weapon{{/critroll}}{{#spelltest}} sheet-spell{{/spelltest}}{{#arcanemark}} sheet-spell{{/arcanemark}}{{#godmark}} sheet-spell{{/godmark}}{{#bloodloss}} sheet-action{{/bloodloss}}">
 				{{#character_name}}
-				<div class="sheet-rt-subheader">{{character_name}}</div>
+				<div class="sheet-rt-subheader" style="font-weight: bold">{{character_name}}</div>
 				{{/character_name}}
 				<div class="sheet-rt-title sheet-pad-l-xl sheet-pad-r-xl">{{title}}</div>			
 				{{#rollTotal() mutation 0}}				
@@ -18733,14 +22792,17 @@
 				<div class="sheet-rt-subheader"><span data-i18n="CHARACTERISTIC">Characteristic</span></div>
 				{{/chartest}}
 				{{#skilltest}}
-				<div class="sheet-rt-subheader">{{skill}}{{#charstatus}} &bullet; <span data-i18n="STATUS">Status</span>: {{charstatus}}{{/charstatus}}</div>
+				<div class="sheet-rt-subheader"><span style="font-weight: bold">{{skill}}</span> {{#charstatus}} &bullet; <span data-i18n="STATUS">Status</span>: {{charstatus}}{{/charstatus}}</div>
 				{{/skilltest}}
 				{{#talent}}
-				<div class="sheet-rt-subheader">{{skill}}</div>
+				<div class="sheet-rt-subheader" style="font-weight: bold">{{skill}}</div>
 				{{/talent}}
 				{{#attacktest}}
-				<div class="sheet-rt-subheader">{{attacktype}} {{#reach}} &bullet; <span data-i18n="REACH">Reach</span> {{reach}}{{/reach}}{{#range}} &bullet; <span data-i18n="RANGE">Range</span> {{range}} yds {{/range}} {{#ammo}} &bullet; {{ammo}} {{ammotype}}{{/ammo}}</div>
+				<div class="sheet-rt-subheader"><span style="font-weight: bold">{{attacktype}}</span> {{#reach}} &bullet; <span data-i18n="REACH">Reach</span> {{reach}}{{/reach}}{{#range}} &bullet; <span data-i18n="RANGE">Range</span> {{range}} yds {{/range}} {{#ammo}} &bullet; {{ammo}} {{ammotype}}{{/ammo}}</div>
 				{{/attacktest}}
+				{{#reload}}
+				<div class="sheet-rt-subheader"><span style="font-weight: bold">{{attacktype}}</span> {{#ammo}} &bullet; {{ammo}} {{ammotype}}{{/ammo}}</div>
+				{{/reload}}
 				{{#critroll}}
 				<div class="sheet-rt-subheader">{{attacktype}}</div>
 				{{/critroll}}
@@ -18791,6 +22853,11 @@
 				</div>	
 		{{/pursuit}}	
 
+				{{#charge}}
+				<div class="sheet-row sheet-center">
+					<div class="sheet-col-1-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span  data-i18n="CHARGE-NOTE">Charge Attack</span> <span style="background-color:  yellow">+1 Adv</span></div>
+				</div>	
+				{{/charge}}	
 				{{#qualities}}
 				<div class="sheet-row">
 					<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" style="vertical-align:top" data-i18n="QUALITIES">Qualities</div>
@@ -18818,91 +22885,94 @@
 				</div>				
 				{{#rollGreater() spellcastingnumber accuchanexlsl}}
 				<div class="sheet-row">
-					<div class="sheet-col-1-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble">Note: Insufficient Accu Ext SL</div>
+					<div class="sheet-col-1-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble" data-i18n="INSUFFICIENT-SL">Note: Insufficient Accu Ext SL</div>
 				</div>	
 				{{/rollGreater() spellcastingnumber accuchanexlsl}}								
 				{{/accuchanexlsl}}	
 				
+				
+						
+				{{#rollGreater() reloadrating 0}}	
+				<div class="sheet-row">
+					<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="RELOAD-RATING">Reload Rating</div>
+					<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">{{reloadrating}}</div>
+				</div>					
+				{{/rollGreater() reloadrating 0}}	
+				{{#^rollGreater() reloadrating 0}}	
+				<div class="sheet-row">
+					<div class="sheet-col-1-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble" data-i18n="NO-RELOAD">No need to reload this weapon!</div>
+				</div>					
+				{{/^rollGreater() reloadrating 0}}	
+				
+				<div class="sheet-row">
+					<div class="sheet-no-yellow-bg">	
+
+				{{#sl}}				
+				{{#rollGreater() advantage 0}}	
+				<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="TARGET-MODIFIERS">Target Modifiers</div>	
+				{{/rollGreater() advantage 0}}	
+				{{#^rollGreater() advantage 0}} {{#^rollTotal() modvalue 0}} 
+				<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="TARGET-MODIFIERS">Target Modifiers</div>	
+				{{/^rollTotal() modvalue 0}}{{/^rollGreater() advantage 0}}	
+				{{#^rollGreater() advantage 0}} {{#^rollTotal() modvalue 0}} {{#^rollTotal() cond 0}}
+				<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="TARGET-MODIFIERS">Target Modifiers</div>	
+				{{/^rollTotal() cond 0}}{{/^rollTotal() modvalue 0}}{{/^rollGreater() advantage 0}}
+				{{#^rollGreater() advantage 0}} {{#^rollTotal() modvalue 0}} {{#rollTotal() cond 0}} {{#offpen}}
+				<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="TARGET-MODIFIERS">Target Modifiers</div>	
+				{{/offpen}} {{/rollTotal() cond 0}}{{/^rollTotal() modvalue 0}}{{/^rollGreater() advantage 0}}	
+				{{/sl}}		
+				<!-- OFFHAND PENALTY -->				
+				{{#offpen}}			
+						<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-fatigued"><span data-i18n="OFFHAND-PENALTY">Modifier</span> {{offpen}}</div>
+				{{/offpen}}					
 				<!-- ADVANTAGE MODIFIER -->
 				{{#rollGreater() advantage 0}}
-				<div class="sheet-row">
-					<div class="sheet-no-yellow-bg">
 						<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-adv"><span data-i18n="ADVANTAGE">Advantage</span> +{{advantage}}</div>
-					</div>
-				</div>
 				{{/rollGreater() advantage 0}}
 				
+				{{#rollGreater() accurate 0}}
+						<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-fatigued"><span data-i18n="ACCURATE">Accurate</span> +{{accurate}}</div>
+				{{/rollGreater() accurate 0}}
+				
+				
 				<!-- ROLL MODIFIER -->
 				{{#modvalue}}				
-				{{#^rollTotal() modvalue 0}}				
-				<div class="sheet-row">
-					<div class="sheet-no-yellow-bg">
+				{{#^rollTotal() modvalue 0}}			
 						<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-fatigued"><span data-i18n="MODIFIER">Modifier</span> <td class="sheet-no-yellow-bg" style="display: inline">{{#rollGreater() modvalue 0}} +{{modvalue}} {{/rollGreater() modvalue 0}} {{#rollLess() modvalue 0}} {{modvalue}} {{/rollLess() modvalue 0}}</td></div>
-					</div>	
-				</div>				
 				{{/^rollTotal() modvalue 0}}
 				{{/modvalue}}	
 
 
-			<!-- CONDITIONS MODIFIER -->
+									<!-- CONDITIONS MODIFIER -->
 			{{#^rollTotal() cond 0}}
 			{{#rollTotal() blinded cond}}				
-				<div class="sheet-row">
-					<div class="sheet-no-yellow-bg">
 						<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-blinded"><span data-i18n="BLINDED">Blinded</span> -{{cond}}</div>
-					</div>
-				</div>
 			{{/rollTotal() blinded cond}}
 			{{#rollTotal() broken cond}}{{#^rollTotal() blinded cond}}
-				<div class="sheet-row">
-					<div class="sheet-no-yellow-bg">
 						<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-broken"><span data-i18n="BROKEN">Broken</span> -{{cond}}</div>
-					</div>
-				</div>
 			{{/^rollTotal() blinded cond}}{{/rollTotal() broken cond}}
 			{{#rollTotal() entangled cond}}{{#^rollTotal() broken cond}}{{#^rollTotal() blinded cond}}
-				<div class="sheet-row">
-					<div class="sheet-no-yellow-bg">
 						<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-entangled"><span data-i18n="ENTANGLED">Entangled</span> -{{cond}}</div>
-					</div>
-				</div>
 			{{/^rollTotal() blinded cond}}{{/^rollTotal() broken cond}}{{/rollTotal() entangled cond}}
 			{{#rollTotal() fatigued cond}}{{#^rollTotal() entangled cond}}{{#^rollTotal() broken cond}}{{#^rollTotal() blinded cond}}	
-				<div class="sheet-row">
-					<div class="sheet-no-yellow-bg">
 						<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-fatigued"><span data-i18n="FATIGUED">Fatigued</span> -{{cond}}</div>
-					</div>
-				</div>						
 			{{/^rollTotal() blinded cond}}{{/^rollTotal() broken cond}}{{/^rollTotal() entangled cond}}{{/rollTotal() fatigued cond}}
 			{{#rollTotal() poisoned cond}}{{#^rollTotal() fatigued cond}}{{#^rollTotal() entangled cond}}{{#^rollTotal() broken cond}}{{#^rollTotal() blinded cond}}
-				<div class="sheet-row">
-					<div class="sheet-no-yellow-bg">
 						<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-poisoned"><span data-i18n="POISONED">Poisoned</span> -{{cond}}</div>
-					</div>
-				</div>
 			{{/^rollTotal() blinded cond}}{{/^rollTotal() broken cond}}{{/^rollTotal() entangled cond}}{{/^rollTotal() fatigued cond}}{{/rollTotal() poisoned cond}}
 			{{#rollTotal() deafened cond}}{{#^rollTotal() poisoned cond}}{{#^rollTotal() fatigued cond}}{{#^rollTotal() entangled cond}}{{#^rollTotal() broken cond}}{{#^rollTotal() blinded cond}}
-				<div class="sheet-row">
-					<div class="sheet-no-yellow-bg">
 						<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-deafened"><span data-i18n="DEAFENED">Deafened</span> -{{cond}}</div>
-					</div>
-				</div>
 			{{/^rollTotal() blinded cond}}{{/^rollTotal() broken cond}}{{/^rollTotal() entangled cond}}{{/^rollTotal() fatigued cond}}{{/^rollTotal() poisoned cond}}{{/rollTotal() deafened cond}}
 			{{#rollTotal() stuned cond}}{{#^rollTotal() deafened cond}}{{#^rollTotal() poisoned cond}}{{#^rollTotal() fatigued cond}}{{#^rollTotal() entangled cond}}{{#^rollTotal() broken cond}}{{#^rollTotal() blinded cond}}
-				<div class="sheet-row">
-					<div class="sheet-no-yellow-bg">
 						<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-fatigued"><span data-i18n="STUNNED">Stunned</span> -{{cond}}</div>
-					</div>
-				</div>
 			{{/^rollTotal() blinded cond}}{{/^rollTotal() broken cond}}{{/^rollTotal() entangled cond}}{{/^rollTotal() fatigued cond}}{{/^rollTotal() poisoned cond}}{{/^rollTotal() deafened cond}}{{/rollTotal() stuned cond}}
 			{{#rollTotal() prone 1}}{{#^rollTotal() stuned cond}}{{#^rollTotal() deafened cond}}{{#^rollTotal() poisoned cond}}{{#^rollTotal() fatigued cond}}{{#^rollTotal() entangled cond}}{{#^rollTotal() broken cond}}{{#^rollTotal() blinded cond}}
-				<div class="sheet-row">
-					<div class="sheet-no-yellow-bg">
 						<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-prone"><span data-i18n="PRONE">Prone</span> -{{cond}}</div>
-					</div>
-				</div>
 			{{/^rollTotal() blinded cond}}{{/^rollTotal() broken cond}}{{/^rollTotal() entangled cond}}{{/^rollTotal() fatigued cond}}{{/^rollTotal() poisoned cond}}{{/^rollTotal() deafened cond}}{{/^rollTotal() stuned cond}}{{/rollTotal() prone 1}}
 			{{/^rollTotal() cond 0}}
+					
+					</div>
+				</div>
 
 
 				<!-- ARMOR PENALTIES -->
@@ -18919,37 +22989,31 @@
 
 
 				<!-- ROLL TARGET & TEST -->
-				{{#target}}
-				<div class="sheet-row">
-					<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="TARGET-NUMBER">Target Number</div>
-					<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">{{target}}</div>
-				</div>
-				{{/target}}
 				
-				{{#test}}
+				{{#test}}{{^lastunitdie}}
 				<div class="sheet-row">
-					<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="TEST-RESULT">Test Result</div>
-					<div class="sheet-col-3-20 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">{{test}}</div>				
-					<div class="sheet-col-35-100 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value"><span class="sheet-chat-button-white sheet-right" style="padding-left: 68px;font-size: 15px" data-i18n-title="REROLL" title="Reroll">{{reroll}}</span></div>
+					<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="TARGET-V-TEST">Target v Test</div>
+					<div class="sheet-col-35-100 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value  sheet-no-yellow-bg2 sheet-rt-test"> <span style="border: 1px solid black; background-color: yellow; padding-top: 2px; padding-left: 1px;">{{target}}</span> v {{#rollWasCrit() test}} {{#rollGreater() test target}} {{#rollBetween() test 1 5}}<span style="border: 3px solid #55B800; background-color: yellow; padding-top: 2px; padding-left: 1px;">{{test}}</span> {{/rollBetween() test 1 5}} {{/rollGreater() test target}} {{/rollWasCrit() test}}  {{#rollWasCrit() test}} {{#^rollWasFumble() test}} {{#rollGreater() test target}} {{#rollBetween() test 6 99}}<span style="border: 3px solid red; background-color: yellow; padding-top: 2px; padding-left: 1px;">{{test}}</span> {{/rollBetween() test 6 99}} {{/rollGreater() test target}} {{/^rollWasFumble() test}} {{/rollWasCrit() test}}  {{#rollWasCrit() test}} {{#rollGreater() target test}} <span style="border: 3px solid #55B800; background-color: yellow; padding-top: 2px; padding-left: 1px;">{{test}}</span> {{/rollGreater() target test}} {{/rollWasCrit() test}} {{#rollWasFumble() test}} {{#rollGreater() test target}} <span style="border: 3px solid red; background-color: yellow; padding-top: 2px; padding-left: 1px;">{{test}}</span> {{/rollGreater() test target}} {{/rollWasFumble() test}} {{#rollWasFumble() test}} {{#^rollGreater() test target}} <span style="border: 3px solid red; background-color: yellow; padding-top: 2px; padding-left: 1px;">{{test}}</span> {{/^rollGreater() test target}} {{/rollWasFumble() test}} {{#^rollWasFumble() test}} {{#^rollWasCrit() test}} <span style="border: 1px solid black; background-color: yellow; padding-top: 2px; padding-left: 1px;">{{test}}</span> {{/^rollWasCrit() test}} {{/^rollWasFumble() test}} </div>
+					<div class="sheet-col-3-20 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value"><span class="sheet-chat-button-white sheet-right" style="padding-left: 25px;font-size: 15px" data-i18n-title="REROLL" title="Reroll">{{reroll}}</span></div>
 				</div>
-				{{/test}}
+				{{/lastunitdie}}{{/test}}		
 
-				
 
 				<!-- CRITICAL / AUTO SUCCESS -->	
 				{{#rollWasCrit() test}}
-				{{#rollBetween() test 01 05}}
+				{{#rollBetween() test 01 05}} {{#rollGreater() test target}}
+				<div class="sheet-row">
 				<div class="sheet-row">
 					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key sheet-rt-critical" data-i18n="CRITICAL-SUCCESS">Auto Success</div>
 				</div>
-				{{/rollBetween() test 01 05}}										
+				{{/rollGreater() test target}} {{/rollBetween() test 01 05}}										
 				{{/rollWasCrit() test}}										
 
-				{{#rollWasFumble() test}}
+				{{#rollWasFumble() test}} {{#^rollGreater() test target}}
 				<div class="sheet-row">
 					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key sheet-rt-fumble" data-i18n="CRITICAL-FAILURE">Auto Failure</div>
 				</div>	
-				{{/rollWasFumble() test}}								
+				{{/^rollGreater() test target}} {{/rollWasFumble() test}}								
 
 
 				<!-- CRTICAL / FUMBLE / MISCAST / WRATH -->
@@ -19642,8 +23706,8 @@
 					{{/rollTotal() rolltype 4}}
 				{{/^rollWasCrit() test}}
 
-
 				<!-- SUCCESS LEVELS -->
+				{{^sl}}	
 				{{#rollBetween() target 250 259}}
 				{{#rollBetween() test 01 09}}
 				<div class="sheet-row">
@@ -21718,103 +25782,405 @@
 										</div>
 										{{/rollTotal() test 100}}
 										{{/rollBetween() target -49 -40}}
+						{{/sl}}		
 
 
+
+
+				<!-- SUCCESS LEVELS V2 -->			
+				{{#rollGreater() computed::sl 0}}				
+				<div class="sheet-row">
+					<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="SUCCESS-LEVEL">Success Level</div>
+					<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-no-yellow-bg2" style="font-weight: bold; padding-left: 4px;">					
+					{{#rollWasFumble() test}} {{#rollGreater() computed::sl -1}} <span style="color: red; margin-left: 4px">-1</span>					
+					
+					{{#rollGreater() computed::slbonusatk 0}} <span style="color: #55B800; margin-left: 4px">+{{computed::slbonusatk}}</span>{{/rollGreater() computed::slbonusatk 0}}
+					{{#rollLess() computed::slbonusatk 0}} <span style="color: red">{{computed::slbonusatk}}</span> {{/rollLess() computed::slbonusatk 0}}
+					
+					{{#rollGreater() computed::slbonusdef 0}} <span style="color: #55B800">+{{computed::slbonusdef}}</span>{{/rollGreater() computed::slbonusdef 0}}
+					{{#rollLess() computed::slbonusdef 0}} <span style="color: red">{{computed::slbonusdef}}</span> {{/rollLess() computed::slbonusdef 0}}
+					
+					{{#rollGreater() SLmod 0}} <span style="color: #55B800">+{{SLmod}}{{/rollGreater() SLmod 0}}
+					{{#rollLess() SLmod 0}} <span style="color: red">{{SLmod}}</span>{{/rollLess() SLmod 0}} 
+					
+					{{/rollGreater() computed::sl -1}} {{/rollWasFumble() test}}
+
+					{{#^rollWasFumble() test}} 
+					
+					{{^computed::slbonusatk}}{{^computed::slbonusdef}}{{#^rollTotal() computed::SLmod 0}}
+					<span style="color: #55B800">+{{computed::sl}}</span>
+					{{/^rollTotal() computed::SLmod 0}}{{/computed::slbonusdef}}{{/computed::slbonusatk}}
+					{{^computed::slbonusatk}}{{^computed::slbonusdef}}{{#rollTotal() computed::SLmod 0}}
+					<span style="background-color: yellow">+{{computed::sl}}</span>
+					{{/rollTotal() computed::SLmod 0}}{{/computed::slbonusdef}}{{/computed::slbonusatk}}
+										
+					{{#rollGreater() computed::slbonusatk 0}}	
+					<span style="color: #55B800">+{{computed::sl}}</span>
+					{{/rollGreater() computed::slbonusatk 0}}
+					{{#^rollGreater() computed::slbonusatk 0}}	
+					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">+{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
+					{{#^rollTotal() computed::SLmod 0}}<span style="color: #55B800">+{{computed::sl}}</span>{{/^rollTotal() computed::SLmod 0}}
+					{{/^rollGreater() computed::slbonusatk 0}}					
+					{{#rollGreater() computed::slbonusdef 0}}	
+					<span style="color: #55B800">+{{computed::sl}}</span>
+					{{/rollGreater() computed::slbonusdef 0}}					
+					{{#^rollGreater() computed::slbonusdef 0}}	
+					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">+{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
+					{{#^rollTotal() computed::SLmod 0}}<span style="color: #55B800">+{{computed::sl}}</span>{{/^rollTotal() computed::SLmod 0}}
+					{{/^rollGreater() computed::slbonusdef 0}}
+					
+					{{#rollGreater() computed::slbonusatk 0}} <span style="color: #55B800">+{{computed::slbonusatk}}</span>{{/rollGreater() computed::slbonusatk 0}}
+					{{#rollLess() computed::slbonusatk 0}} <span style="color: red">{{computed::slbonusatk}}</span> {{/rollLess() computed::slbonusatk 0}}
+					
+					{{#rollGreater() computed::slbonusdef 0}} <span style="color: #55B800">+{{computed::slbonusdef}}</span>{{/rollGreater() computed::slbonusdef 0}}
+					{{#rollLess() computed::slbonusdef 0}} <span style="color: red">{{computed::slbonusdef}}</span> {{/rollLess() computed::slbonusdef 0}}
+
+					{{#rollGreater() SLmod 0}} <span style="color: #55B800">+{{SLmod}}</span>{{/rollGreater() SLmod 0}}
+					{{#rollLess() SLmod 0}} <span style="color: red">{{SLmod}}</span>{{/rollLess() SLmod 0}}
+					
+					{{#rollGreater() computed::sladd 0}}= <span style="background-color: yellow">{{#rollGreater() computed::slbonus -1}}+{{/rollGreater() computed::slbonus -1}}{{computed::slbonus}}</span>{{/rollGreater() computed::sladd 0}}	
+					{{#rollLess() computed::sladd 0}}= <span style="background-color: yellow">{{#rollGreater() computed::slbonus -1}}+{{/rollGreater() computed::slbonus -1}}{{computed::slbonus}}</span>{{/rollLess() computed::sladd 0}} 
+					
+					{{/^rollWasFumble() test}} 
+					
+					</div>	
+				</div>	
+				{{/rollGreater() computed::sl 0}}	
+				{{#^rollGreater() computed::sl 0}}	
+					{{#^rollGreater() test target}}					
+						<div class="sheet-row">
+							<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="SUCCESS-LEVEL">Success Level</div>
+							<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-no-yellow-bg2" style="font-weight: bold; padding-left: 4px;">
+					{{#rollWasFumble() test}} {{#rollGreater() computed::sl -1}} <span style="color: red">-1</span>					
+					
+					{{#rollGreater() computed::slbonusatk 0}} <span style="color: #55B800">+{{computed::slbonusatk}}</span>{{/rollGreater() computed::slbonusatk 0}}
+					{{#rollLess() computed::slbonusatk 0}} <span style="color: red">{{computed::slbonusatk}}</span>	 {{/rollLess() computed::slbonusatk 0}}
+					
+					{{#rollGreater() computed::slbonusdef 0}} <span style="color: #55B800">+ {{computed::slbonusdef}}</span>{{/rollGreater() computed::slbonusdef 0}}
+					{{#rollLess() computed::slbonusdef 0}} <span style="color: red">{{computed::slbonusdef}}</span>	 {{/rollLess() computed::slbonusdef 0}}
+					
+					{{#rollGreater() SLmod 0}} <span style="color: #55B800">+{{SLmod}}</span>	{{/rollGreater() SLmod 0}}
+					{{#rollLess() SLmod 0}} <span style="color: red">{{SLmod}}</span>	{{/rollLess() SLmod 0}} 
+					
+					{{/rollGreater() computed::sl -1}} {{/rollWasFumble() test}}
+
+					{{#^rollWasFumble() test}} 
+					
+					{{^computed::slbonusatk}}{{^computed::slbonusdef}}{{#^rollTotal() computed::SLmod 0}}
+					<span style="color: #55B800">+{{computed::sl}}</span>
+					{{/^rollTotal() computed::SLmod 0}}{{/computed::slbonusdef}}{{/computed::slbonusatk}}
+					{{^computed::slbonusatk}}{{^computed::slbonusdef}}{{#rollTotal() computed::SLmod 0}}
+					<span style="background-color: yellow">+{{computed::sl}}</span>
+					{{/rollTotal() computed::SLmod 0}}{{/computed::slbonusdef}}{{/computed::slbonusatk}}
+												
+					{{#rollGreater() computed::slbonusatk 0}}	
+					<span style="color: #55B800">+{{computed::sl}}</span>
+					{{/rollGreater() computed::slbonusatk 0}}
+					{{#^rollGreater() computed::slbonusatk 0}}	
+					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">+{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
+					{{#^rollTotal() computed::SLmod 0}}<span style="color: #55B800">+{{computed::sl}}</span>{{/^rollTotal() computed::SLmod 0}}
+					{{/^rollGreater() computed::slbonusatk 0}}					
+					{{#rollGreater() computed::slbonusdef 0}}	
+					<span style="color: #55B800">+{{computed::sl}}</span>
+					{{/rollGreater() computed::slbonusdef 0}}					
+					{{#^rollGreater() computed::slbonusdef 0}}	
+					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">+{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
+					{{#^rollTotal() computed::SLmod 0}}<span style="color: #55B800">+{{computed::sl}}</span>{{/^rollTotal() computed::SLmod 0}}
+					{{/^rollGreater() computed::slbonusdef 0}}
+					
+					{{#rollGreater() computed::slbonusatk 0}} <span style="color: #55B800">+ {{computed::slbonusatk}}</span>{{/rollGreater() computed::slbonusatk 0}}
+					{{#rollLess() computed::slbonusatk 0}} <span style="color: red">{{computed::slbonusatk}}</span>{{/rollLess() computed::slbonusatk 0}}
+					
+					{{#rollGreater() computed::slbonusdef 0}} <span style="color: #55B800">+ {{computed::slbonusdef}}</span>{{/rollGreater() computed::slbonusdef 0}}
+					{{#rollLess() computed::slbonusdef 0}} <span style="color: red">{{computed::slbonusdef}}</span>{{/rollLess() computed::slbonusdef 0}}
+
+					{{#rollGreater() SLmod 0}} <span style="color: #55B800">+ {{SLmod}}</span>{{/rollGreater() SLmod 0}}
+					{{#rollLess() SLmod 0}} <span style="color: red">{{SLmod}}</span>{{/rollLess() SLmod 0}}
+					
+					{{#rollGreater() computed::sladd 0}}= <span style="background-color: yellow">{{#rollGreater() computed::slbonus -1}}+{{/rollGreater() computed::slbonus -1}}{{computed::slbonus}}</span>{{/rollGreater() computed::sladd 0}}	
+					{{#rollLess() computed::sladd 0}}= <span style="background-color: yellow">{{#rollGreater() computed::slbonus -1}}+{{/rollGreater() computed::slbonus -1}}{{computed::slbonus}}</span>{{/rollLess() computed::sladd 0}} 
+					
+					{{/^rollWasFumble() test}} 
+							
+							</div>
+						</div>	
+					{{/^rollGreater() test target}}	
+				{{/^rollGreater() computed::sl 0}}
+				{{#^rollLess() computed::sl 0}}		
+					{{#rollGreater() test target}}		
+						<div class="sheet-row">
+							<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="SUCCESS-LEVEL">Success Level</div>
+							<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-no-yellow-bg2" style="font-weight: bold; padding-left: 4px;">
+					{{#rollWasCrit() test}} {{#rollBetween() test 1 5}} <span style="color: #55B800">+1</span>
+					
+					{{#rollGreater() computed::slbonusatk 0}} <span style="color: #55B800">+{{computed::slbonusatk}}</span>{{/rollGreater() computed::slbonusatk 0}}
+					{{#rollLess() computed::slbonusatk 0}} <span style="color: red">{{computed::slbonusatk}}</span>{{/rollLess() computed::slbonusatk 0}}
+							
+					{{#rollGreater() computed::slbonusdef 0}} <span style="color: #55B800">+{{computed::slbonusdef}}</span>{{/rollGreater() computed::slbonusdef 0}}
+					{{#rollLess() computed::slbonusdef 0}} <span style="color: red">{{computed::slbonusdef}}</span>{{/rollLess() computed::slbonusdef 0}}
+					
+					{{#rollGreater() SLmod 0}} <span style="color: #55B800">+{{SLmod}}</span>{{/rollGreater() SLmod 0}}
+					{{#rollLess() SLmod 0}} <span style="color: red">{{SLmod}}{{/rollLess() SLmod 0}} 
+					
+					{{/rollBetween() test 1 5}} {{/rollWasCrit() test}} 
+							
+							
+					{{#rollWasCrit() test}} {{#rollBetween() test 6 99}} 
+					
+					{{^computed::slbonusatk}}{{^computed::slbonusdef}}{{#^rollTotal() computed::SLmod 0}}
+					<span style="color: red">-{{computed::sl}}</span>
+					{{/^rollTotal() computed::SLmod 0}}{{/computed::slbonusdef}}{{/computed::slbonusatk}}
+					{{^computed::slbonusatk}}{{^computed::slbonusdef}}{{#rollTotal() computed::SLmod 0}}
+					<span style="background-color: yellow">-{{computed::sl}}</span>
+					{{/rollTotal() computed::SLmod 0}}{{/computed::slbonusdef}}{{/computed::slbonusatk}}
+					
+					{{#rollGreater() computed::slbonusatk 0}}	
+					<span style="color: red">{{computed::sl}}</span>
+					{{/rollGreater() computed::slbonusatk 0}}
+					{{#^rollGreater() computed::slbonusatk 0}}	
+					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">-{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
+					{{#^rollTotal() computed::SLmod 0}}<span style="color: red">-{{computed::sl}}</span>{{/^rollTotal() computed::SLmod 0}}
+					{{/^rollGreater() computed::slbonusatk 0}}					
+					{{#rollGreater() computed::slbonusdef 0}}	
+					<span style="color: red">{{computed::sl}}</span>
+					{{/rollGreater() computed::slbonusdef 0}}				
+					{{#^rollGreater() computed::slbonusdef 0}}	
+					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">-{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
+					{{#^rollTotal() computed::SLmod 0}}<span style="color: red">-{{computed::sl}}</span>{{/^rollTotal() computed::SLmod 0}}
+					{{/^rollGreater() computed::slbonusdef 0}}
+					
+					{{#rollGreater() computed::slbonusatk 0}} <span style="color: #55B800">+{{computed::slbonusatk}}</span>{{/rollGreater() computed::slbonusatk 0}}
+					{{#rollLess() computed::slbonusatk 0}} <span style="color: red">{{computed::slbonusatk}}</span>{{/rollLess() computed::slbonusatk 0}}
+							
+					{{#rollGreater() computed::slbonusdef 0}} <span style="color: #55B800">+{{computed::slbonusdef}}</span>{{/rollGreater() computed::slbonusdef 0}}
+					{{#rollLess() computed::slbonusdef 0}} <span style="color: red">{{computed::slbonusdef}}</span>{{/rollLess() computed::slbonusdef 0}}
+					
+					{{#rollGreater() SLmod 0}} <span style="color: #55B800">+{{SLmod}}</span>{{/rollGreater() SLmod 0}}
+					{{#rollLess() SLmod 0}} <span style="color: red">{{SLmod}}</span>{{/rollLess() SLmod 0}} 							
+							
+					{{#rollGreater() computed::sladd 0}}= <span style="background-color: yellow">{{#rollGreater() computed::slbonus -1}}+{{/rollGreater() computed::slbonus -1}}{{computed::slbonus}}</span>{{/rollGreater() computed::sladd 0}}	
+					{{#rollLess() computed::sladd 0}}= <span style="background-color: yellow">{{#rollGreater() computed::slbonus -1}}+{{/rollGreater() computed::slbonus -1}}{{computed::slbonus}}</span>{{/rollLess() computed::sladd 0}} 
+							
+					{{/rollBetween() test 6 99}} {{/rollWasCrit() test}} 
+							
+							
+					{{#^rollWasCrit() test}}
+					
+					{{^computed::slbonusatk}}{{^computed::slbonusdef}}{{#^rollTotal() computed::SLmod 0}}
+					<span style="color: red">-{{computed::sl}}</span>
+					{{/^rollTotal() computed::SLmod 0}}{{/computed::slbonusdef}}{{/computed::slbonusatk}}
+					{{^computed::slbonusatk}}{{^computed::slbonusdef}}{{#rollTotal() computed::SLmod 0}}
+					<span style="background-color: yellow">-{{computed::sl}}</span>
+					{{/rollTotal() computed::SLmod 0}}{{/computed::slbonusdef}}{{/computed::slbonusatk}}
+					
+					{{#rollGreater() computed::slbonusatk 0}}	
+					<span style="color: red">{{computed::sl}}</span>
+					{{/rollGreater() computed::slbonusatk 0}}
+					{{#^rollGreater() computed::slbonusatk 0}}	
+					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">-{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
+					{{#^rollTotal() computed::SLmod 0}}<span style="color: red">-{{computed::sl}}</span>{{/^rollTotal() computed::SLmod 0}}
+					{{/^rollGreater() computed::slbonusatk 0}}					
+					{{#rollGreater() computed::slbonusdef 0}}	
+					<span style="color: red">{{computed::sl}}</span>
+					{{/rollGreater() computed::slbonusdef 0}}				
+					{{#^rollGreater() computed::slbonusdef 0}}	
+					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
+					{{#^rollTotal() computed::SLmod 0}}<span style="color: red">-{{computed::sl}}</span>{{/^rollTotal() computed::SLmod 0}}
+					{{/^rollGreater() computed::slbonusdef 0}}
+					
+					{{#rollGreater() computed::slbonusatk 0}} <span style="color: #55B800">+{{computed::slbonusatk}}</span>{{/rollGreater() computed::slbonusatk 0}} 
+					{{#rollLess() computed::slbonusatk 0}} <span style="color: red">{{computed::slbonusatk}}</span>{{/rollLess() computed::slbonusatk 0}} 
+
+					{{#rollGreater() computed::slbonusdef 0}} <span style="color: #55B800">+{{computed::slbonusdef}}</span>{{/rollGreater() computed::slbonusdef 0}}
+					{{#rollLess() computed::slbonusdef 0}} <span style="color: red">{{computed::slbonusdef}}</span>{{/rollLess() computed::slbonusdef 0}}
+					
+					{{#rollGreater() SLmod 0}} <span style="color: #55B800">+{{SLmod}}</span>{{/rollGreater() SLmod 0}}
+					{{#rollLess() SLmod 0}} <span style="color: red">{{SLmod}}</span>{{/rollLess() SLmod 0}} 
+					
+					{{#rollGreater() computed::sladd 0}}= <span style="background-color: yellow">{{#rollGreater() computed::slbonus -1}}+{{/rollGreater() computed::slbonus -1}}{{computed::slbonus}}</span>{{/rollGreater() computed::sladd 0}}	
+					{{#rollLess() computed::sladd 0}}= <span style="background-color: yellow">{{#rollGreater() computed::slbonus -1}}+{{/rollGreater() computed::slbonus -1}}{{computed::slbonus}}</span>{{/rollLess() computed::sladd 0}} 
+						
+					{{/^rollWasCrit() test}}
+							
+							
+							</div>
+						</div>				
+					{{/rollGreater() test target}}	
+				{{/^rollLess() computed::sl 0}}			
+					
+				{{#rollLess() computed::sl 0}}				
+				<div class="sheet-row">
+					<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="SUCCESS-LEVEL">Success Level</div>
+					<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-no-yellow-bg2" style="font-weight: bold; padding-left: 4px;">
+					{{#rollWasCrit() test}} {{#rollBetween() test 1 5}} <span style="color: #55B800">+1</span>
+					
+					{{#rollGreater() computed::slbonusatk 0}} <span style="color: #55B800">+{{computed::slbonusatk}}</span>{{/rollGreater() computed::slbonusatk 0}}
+					{{#rollLess() computed::slbonusatk 0}} <span style="color: red">{{computed::slbonusatk}}</span>{{/rollLess() computed::slbonusatk 0}}
+							
+					{{#rollGreater() computed::slbonusdef 0}} <span style="color: #55B800">+{{computed::slbonusdef}}</span>{{/rollGreater() computed::slbonusdef 0}}
+					{{#rollLess() computed::slbonusdef 0}} <span style="color: red">{{computed::slbonusdef}}</span>{{/rollLess() computed::slbonusdef 0}}
+					
+					{{#rollGreater() SLmod 0}} <span style="color: #55B800">+{{SLmod}}</span>{{/rollGreater() SLmod 0}}
+					{{#rollLess() SLmod 0}} <span style="color: red">{{SLmod}}{{/rollLess() SLmod 0}} 
+					
+					{{/rollBetween() test 1 5}} {{/rollWasCrit() test}}
+					
+					
+					{{#rollWasCrit() test}} {{#rollBetween() test 6 99}} 
+					
+					{{^computed::slbonusatk}}{{^computed::slbonusdef}}{{#^rollTotal() computed::SLmod 0}}
+					<span style="color: red">{{computed::sl}}</span>
+					{{/^rollTotal() computed::SLmod 0}}{{/computed::slbonusdef}}{{/computed::slbonusatk}}
+					{{^computed::slbonusatk}}{{^computed::slbonusdef}}{{#rollTotal() computed::SLmod 0}}
+					<span style="background-color: yellow">{{computed::sl}}</span>
+					{{/rollTotal() computed::SLmod 0}}{{/computed::slbonusdef}}{{/computed::slbonusatk}}
+					
+					{{#rollGreater() computed::slbonusatk 0}}	
+					<span style="color: red">{{computed::sl}}</span>
+					{{/rollGreater() computed::slbonusatk 0}}
+					{{#^rollGreater() computed::slbonusatk 0}}	
+					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
+					{{#^rollTotal() computed::SLmod 0}}<span style="color: red">{{computed::sl}}</span>{{/^rollTotal() computed::SLmod 0}}
+					{{/^rollGreater() computed::slbonusatk 0}}					
+					{{#rollGreater() computed::slbonusdef 0}}	
+					<span style="color: red">{{computed::sl}}</span>
+					{{/rollGreater() computed::slbonusdef 0}}				
+					{{#^rollGreater() computed::slbonusdef 0}}	
+					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
+					{{#^rollTotal() computed::SLmod 0}}<span style="color: red">{{computed::sl}}</span>{{/^rollTotal() computed::SLmod 0}}
+					{{/^rollGreater() computed::slbonusdef 0}}
+					
+					{{#rollGreater() computed::slbonusatk 0}} <span style="color: #55B800">+{{computed::slbonusatk}}</span>{{/rollGreater() computed::slbonusatk 0}}
+					{{#rollLess() computed::slbonusatk 0}} <span style="color: red">{{computed::slbonusatk}}</span>{{/rollLess() computed::slbonusatk 0}}
+							
+					{{#rollGreater() computed::slbonusdef 0}} <span style="color: #55B800">+{{computed::slbonusdef}}</span>{{/rollGreater() computed::slbonusdef 0}}
+					{{#rollLess() computed::slbonusdef 0}} <span style="color: red">{{computed::slbonusdef}}</span>{{/rollLess() computed::slbonusdef 0}}
+					
+					{{#rollGreater() SLmod 0}} <span style="color: #55B800">+{{SLmod}}</span>{{/rollGreater() SLmod 0}}
+					{{#rollLess() SLmod 0}} <span style="color: red">{{SLmod}}</span>{{/rollLess() SLmod 0}} 							
+							
+					{{#rollGreater() computed::sladd 0}}= <span style="background-color: yellow">{{#rollGreater() computed::slbonus -1}}+{{/rollGreater() computed::slbonus -1}}{{computed::slbonus}}</span>{{/rollGreater() computed::sladd 0}}	
+					{{#rollLess() computed::sladd 0}}= <span style="background-color: yellow">{{#rollGreater() computed::slbonus -1}}+{{/rollGreater() computed::slbonus -1}}{{computed::slbonus}}</span>{{/rollLess() computed::sladd 0}} 
+							
+					{{/rollBetween() test 6 99}} {{/rollWasCrit() test}} 
+					
+					
+					{{#^rollWasCrit() test}} 
+					
+					{{^computed::slbonusatk}}{{^computed::slbonusdef}}{{#^rollTotal() computed::SLmod 0}}
+					<span style="color: red">{{computed::sl}}</span>
+					{{/^rollTotal() computed::SLmod 0}}{{/computed::slbonusdef}}{{/computed::slbonusatk}}
+					{{^computed::slbonusatk}}{{^computed::slbonusdef}}{{#rollTotal() computed::SLmod 0}}
+					<span style="background-color: yellow">{{computed::sl}}</span>
+					{{/rollTotal() computed::SLmod 0}}{{/computed::slbonusdef}}{{/computed::slbonusatk}}
+					
+					{{#rollGreater() computed::slbonusatk 0}}	
+					<span style="color: red">{{computed::sl}}</span>
+					{{/rollGreater() computed::slbonusatk 0}}
+					{{#^rollGreater() computed::slbonusatk 0}}	
+					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
+					{{#^rollTotal() computed::SLmod 0}}<span style="color: red">{{computed::sl}}</span>{{/^rollTotal() computed::SLmod 0}}
+					{{/^rollGreater() computed::slbonusatk 0}}					
+					{{#rollGreater() computed::slbonusdef 0}}	
+					<span style="color: red">{{computed::sl}}</span>
+					{{/rollGreater() computed::slbonusdef 0}}				
+					{{#^rollGreater() computed::slbonusdef 0}}	
+					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
+					{{#^rollTotal() computed::SLmod 0}}<span style="color: red">{{computed::sl}}</span>{{/^rollTotal() computed::SLmod 0}}
+					{{/^rollGreater() computed::slbonusdef 0}}
+					
+					{{#rollGreater() computed::slbonusatk 0}} <span style="color: #55B800">+{{computed::slbonusatk}}</span>{{/rollGreater() computed::slbonusatk 0}} 
+					{{#rollLess() computed::slbonusatk 0}} <span style="color: red">{{computed::slbonusatk}} {{/rollLess() computed::slbonusatk 0}} 
+
+					{{#rollGreater() computed::slbonusdef 0}} <span style="color: #55B800">+{{computed::slbonusdef}}</span>{{/rollGreater() computed::slbonusdef 0}}
+					{{#rollLess() computed::slbonusdef 0}} <span style="color: red">{{computed::slbonusdef}}</span>{{/rollLess() computed::slbonusdef 0}}
+					
+					{{#rollGreater() SLmod 0}} <span style="color: #55B800">+{{SLmod}}</span>{{/rollGreater() SLmod 0}}
+					{{#rollLess() SLmod 0}} <span style="color: red">{{SLmod}}</span>{{/rollLess() SLmod 0}} 
+					
+					{{#rollGreater() computed::sladd 0}}= <span style="background-color: yellow">{{#rollGreater() computed::slbonus -1}}+{{/rollGreater() computed::slbonus -1}}{{computed::slbonus}}</span>{{/rollGreater() computed::sladd 0}}	
+					{{#rollLess() computed::sladd 0}}= <span style="background-color: yellow">{{#rollGreater() computed::slbonus -1}}+{{/rollGreater() computed::slbonus -1}}{{computed::slbonus}}</span>{{/rollLess() computed::sladd 0}} 
+						
+					{{/^rollWasCrit() test}}
+					
+					</div>
+				</div>	
+				{{/rollLess() computed::sl 0}}	
+				
+				
+				
+
+				<!---SL MODIFIERS--->
+
+				{{#computed::slbonus}}
+				{{#^rollBetween() computed::sladd 0 0}}
+				<div class="sheet-row">
+					<div class="sheet-no-yellow-bg">
+				<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="SL-MODIFIERS">SL Modifiers</div>	
+				{{/^rollBetween() computed::sladd 0 0}}
+
+
+				{{#rollGreater() SLmod 0}}
+					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod" style="color: #55B800">+{{SLmod}}SL <span data-i18n="MODIFIER"></span></div>
+				{{/rollGreater() SLmod 0}}
+				{{#rollLess() SLmod 0}}
+					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod" style="color: red">{{SLmod}}SL <span data-i18n="MODIFIER"></span></div>
+				{{/rollLess() SLmod 0}}
+
+				<!-- SL SUCCESSFUL TEST MOD -->	
+				
+				{{#rollGreater() defensive 0}}
+					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod" style="color: #55B800">+{{defensive}}SL <span data-i18n="DEFENSIVE"></span></div>
+				{{/rollGreater() defensive 0}}
+				
+
 				{{#^rollGreater() test target}}
+				{{#rollGreater() precise 0}}
+					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod" style="color: #55B800">+{{precise}}SL <span data-i18n="PRECISE"></span></div>
+				{{/rollGreater() precise 0}}
+				{{#rollGreater() shieldsman 0}}		
+					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod" style="color: #55B800">+{{shieldsman}}SL <span data-i18n="SHIELDSMAN"></span></div>
+				{{/rollGreater() shieldsman 0}}
+				{{#rollGreater() reversal 0}}
+					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod" style="color: #55B800">+{{reversal}}SL <span data-i18n="REVERSAL"></span></div>
+				{{/rollGreater() reversal 0}}
+				{{#rollGreater() riposte 0}}
+					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod" style="color: #55B800">+{{riposte}}SL <span data-i18n="RIPOSTE"></span></div>
+				{{/rollGreater() riposte 0}}
+				
 				{{#rollGreater() sptal1 0}}
-				<div class="sheet-row">
-					<div class="sheet-no-yellow-bg">
-					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod">+{{sptal1}}SL <span data-i18n="AETHYRIC-ATTUNEMENT"></span></div>
-					</div>
-				</div>
+					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod" style="color: #55B800">+{{sptal1}}SL <span data-i18n="AETHYRIC-ATTUNEMENT"></span></div>
 				{{/rollGreater() sptal1 0}}
 				{{#rollGreater() sptal2 0}}{{#rollGreater() sptal3 0}}
-				<div class="sheet-row">
-					<div class="sheet-no-yellow-bg">
-					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod">+{{sptal23}}SL <span data-i18n="INSTICTIVE-PITCH"></span></div>
-					</div>
-				</div>					
+					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod" style="color: #55B800">+{{sptal23}}SL <span data-i18n="INSTICTIVE-PITCH"></span></div>
 				{{/rollGreater() sptal3 0}}{{/rollGreater() sptal2 0}}
 				{{#rollGreater() sptal2 0}}{{#rollTotal() sptal3 0}}
-				<div class="sheet-row">
-					<div class="sheet-no-yellow-bg">
-					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod">+{{sptal2}}SL <span data-i18n="INSTICTIVE-DICTION"></span></div>
-					</div>
-				</div>					
+					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod" style="color: #55B800">+{{sptal2}}SL <span data-i18n="INSTICTIVE-DICTION"></span></div>
 				{{/rollTotal() sptal3 0}}{{/rollGreater() sptal2 0}}
 				{{#rollGreater() sptal3 0}}{{#rollTotal() sptal2 0}}
-				<div class="sheet-row">
-					<div class="sheet-no-yellow-bg">
-					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod">+{{sptal3}}SL <span data-i18n="PERFECT-PITCH"></span></div>
-					</div>
-				</div>					
+					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod" style="color: #55B800">+{{sptal3}}SL <span data-i18n="PERFECT-PITCH"></span></div>
 				{{/rollTotal() sptal2 0}}{{/rollGreater() sptal3 0}}
 				{{/^rollGreater() test target}}
-
-
-				{{#rollTotal() mod1type 1}}
-				<div class="sheet-row">
-					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod">{{mod1}}</div>
-				</div>						
-				{{/rollTotal() mod1type 1}}
 				
-				{{#rollTotal() mod1type 2}}{{#^rollGreater() test target}}
-				<div class="sheet-row">
-					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod">{{mod1}}</div>
-				</div>						
-				{{/^rollGreater() test target}}{{/rollTotal() mod1type 2}}				
-
-				{{#rollTotal() mod1type 3}}{{#rollGreater() test target}}
-				<div class="sheet-row">
-					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod">{{mod1}}</div>
-				</div>						
-				{{/rollGreater() test target}}{{/rollTotal() mod1type 3}}									
-
-
-				{{#rollTotal() mod2type 1}}
-				<div class="sheet-row">
-					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod">{{mod2}}</div>
-				</div>						
-				{{/rollTotal() mod2type 1}}
+				{{#rollGreater() test target}}				
+				{{#rollGreater() practical 0}}
+					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod" style="color: #55B800">+{{practical}}SL <span data-i18n="PRACTICAL"></span></div>
+				{{/rollGreater() practical 0}}
+				{{/rollGreater() test target}}
 				
-				{{#rollTotal() mod2type 2}}{{#^rollGreater() test target}}
-				<div class="sheet-row">
-					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod">{{mod2}}</div>
-				</div>						
-				{{/^rollGreater() test target}}{{/rollTotal() mod2type 2}}				
+				{{#rollGreater() gunner 0}}
+					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod" style="color: #55B800">+{{gunner}}SL <span data-i18n="GUNNER"></span></div>
+				{{/rollGreater() gunner 0}}
 
-				{{#rollTotal() mod2type 3}}{{#rollGreater() test target}}
-				<div class="sheet-row">
-					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod">{{mod2}}</div>
-				</div>						
-				{{/rollGreater() test target}}{{/rollTotal() mod2type 3}}									
+				{{#^rollBetween() computed::sladd 0 0}}
+					</div>
+				</div>	
+				{{/^rollBetween() computed::sladd 0 0}}
+				{{/computed::slbonus}}	
 
 
-				{{#rollTotal() mod3type 1}}
-				<div class="sheet-row">
-					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod">{{mod3}}</div>
-				</div>						
-				{{/rollTotal() mod3type 1}}
 				
-				{{#rollTotal() mod3type 2}}{{#^rollGreater() test target}}
-				<div class="sheet-row">
-					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod">{{mod3}}</div>
-				</div>						
-				{{/^rollGreater() test target}}{{/rollTotal() mod3type 2}}				
-
-				{{#rollTotal() mod3type 3}}{{#rollGreater() test target}}
-				<div class="sheet-row">
-					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod">{{mod3}}</div>
-				</div>						
-				{{/rollGreater() test target}}{{/rollTotal() mod3type 3}}	
-				
-				{{#result}}
-				<div class="sheet-row">
-						<div class="sheet-col-1 sheet-center sheet-pad-l-lg sheet-pad-r-md sheet-rt-key-wide"><span>Damaging: Unit Die</span> {{test}}</div>
-				</div>
-				{{/result}}		
-
-
+	
 										<!-- HEAL TEST SUCCESS/FAIL-->
 
 										{{#healtest}}
@@ -21831,7 +26197,320 @@
 										{{/healtest}}
 
 
-										<!-- HEAL TEST -->
+										<!-- SKILL TEST RESULT V2 -->
+										{{#skilltest}}
+										{{^healtest}}
+
+										{{#^rollGreater() test target}} {{#^rollWasFumble() test}}
+										{{#rollBetween() computed::sl 0 1}}
+										<div class="sheet-row">
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-critical" data-i18n="SKILL-TEST-MARGINAL-SUCCESS">Skill Test - Marginal Success</div>
+										</div>	
+										{{/rollBetween() computed::sl 0 1}}
+										{{#rollBetween() computed::sl 2 3}}	
+										<div class="sheet-row">
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-critical" data-i18n="SKILL-TEST-SUCCESS">Skill Test - Success</div>
+										</div>	
+										{{/rollBetween() computed::sl 2 3}}	
+										{{#rollBetween() computed::sl 4 5}}	
+										<div class="sheet-row">
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-critical" data-i18n="SKILL-TEST-IMPRESSIVE-SUCCESS">Skill Test - Impressive Succes</div>
+										</div>	
+										{{/rollBetween() computed::sl 4 5}}		
+										{{#rollGreater() computed::sl 5}}
+										<div class="sheet-row">
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-critical" data-i18n="SKILL-TEST-ASTOUNDING-SUCCESS">Skill Test - Astounding Success</div>
+										</div>		
+										{{/rollGreater() computed::sl 5}}
+										{{/^rollWasFumble() test}} {{/^rollGreater() test target}}	
+
+										{{#^rollGreater() test target}} {{#rollWasFumble() test}}
+										<div class="sheet-row">
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble" data-i18n="SKILL-TEST-MARGINAL-FAILURE">Skill Test - Marginal Failure</div>
+										</div>	
+										{{/rollWasFumble() test}} {{/^rollGreater() test target}}	
+						
+										{{#rollGreater() test target}} {{#rollWasCrit() test}} {{#rollBetween() test 1 5}}
+										<div class="sheet-row">
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-critical" data-i18n="SKILL-TEST-MARGINAL-SUCCESS">Skill Test - Marginal Success</div>
+										</div>	
+										{{/rollBetween() test 1 5}} {{/rollWasCrit() test}} {{/rollGreater() test target}}	
+										
+										{{#rollGreater() test target}} {{#rollWasCrit() test}} {{#rollBetween() test 6 100}}
+										{{#rollBetween() computed::sl -1 0}}
+										<div class="sheet-row">
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble" data-i18n="SKILL-TEST-MARGINAL-FAILURE">Skill Test - Marginal Failure</div>
+										</div>	
+										{{/rollBetween() computed::sl -1 0}}
+										{{#rollBetween() computed::sl -3 -2}}	
+										<div class="sheet-row">
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble" data-i18n="SKILL-TEST-FAILURE">Skill Test - Failure</div>
+										</div>	
+										{{/rollBetween() computed::sl -3 -2}}	
+										{{#rollBetween() computed::sl -5 -4}}	
+										<div class="sheet-row">
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble" data-i18n="SKILL-TEST-IMPRESSIVE-FAILURE">Skill Test - Impressive Failure</div>
+										</div>	
+										{{/rollBetween() computed::sl -5 -4}}		
+										{{#rollLess() computed::sl -5}}
+										<div class="sheet-row">
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble" data-i18n="SKILL-TEST-ASTOUNDING-FAILURE">Skill Test - Astounding Failure</div>
+										</div>		
+										{{/rollLess() computed::sl -5}}
+										{{/rollBetween() test 6 100}} {{/rollWasCrit() test}} {{/rollGreater() test target}}		
+										
+										{{#rollGreater() test target}} {{#^rollWasCrit() test}}
+										{{#rollBetween() computed::sl -1 0}}
+										<div class="sheet-row">
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble" data-i18n="SKILL-TEST-MARGINAL-FAILURE">Skill Test - Marginal Failure</div>
+										</div>	
+										{{/rollBetween() computed::sl -1 0}}
+										{{#rollBetween() computed::sl -3 -2}}	
+										<div class="sheet-row">
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble" data-i18n="SKILL-TEST-FAILURE">Skill Test - Failure</div>
+										</div>	
+										{{/rollBetween() computed::sl -3 -2}}	
+										{{#rollBetween() computed::sl -5 -4}}	
+										<div class="sheet-row">
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble" data-i18n="SKILL-TEST-IMPRESSIVE-FAILURE">Skill Test - Impressive Failure</div>
+										</div>	
+										{{/rollBetween() computed::sl -5 -4}}		
+										{{#rollLess() computed::sl -5}}
+										<div class="sheet-row">
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble" data-i18n="SKILL-TEST-ASTOUNDING-FAILURE">Skill Test - Astounding Failure</div>
+										</div>		
+										{{/rollLess() computed::sl -5}}
+										{{/^rollWasCrit() test}} {{/rollGreater() test target}}	
+										
+										{{/healtest}}	
+										{{/skilltest}}
+
+
+				
+						{{#sl}}					
+						{{#rollTotal() mod1type 1}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+						<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="CUSTOM-MODIFIERS">Custom & Situational Bonus:</div>	
+						{{/rollTotal() mod1type 1}}
+						
+						{{#rollTotal() mod1type 2}}{{#^rollGreater() test target}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+						<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="CUSTOM-MODIFIERS">Custom & Situational Bonus:</div>	
+						{{/^rollGreater() test target}}{{/rollTotal() mod1type 2}}				
+
+						{{#rollTotal() mod1type 3}}{{#rollGreater() test target}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+						<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="CUSTOM-MODIFIERS">Custom & Situational Bonus:</div>	
+						{{/rollGreater() test target}}{{/rollTotal() mod1type 3}}	
+						
+						{{#rollTotal() mod2type 1}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+						<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="CUSTOM-MODIFIERS">Custom & Situational Bonus:</div>	
+						{{/rollTotal() mod2type 1}}
+						
+						{{#rollTotal() mod2type 2}}{{#^rollGreater() test target}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+						<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="CUSTOM-MODIFIERS">Custom & Situational Bonus:</div>	
+						{{/^rollGreater() test target}}{{/rollTotal() mod2type 2}}				
+
+						{{#rollTotal() mod2type 3}}{{#rollGreater() test target}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+						<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="CUSTOM-MODIFIERS">Custom & Situational Bonus:</div>	
+						{{/rollGreater() test target}}{{/rollTotal() mod2type 3}}									
+
+						{{#rollTotal() mod3type 1}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+						<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="CUSTOM-MODIFIERS">Custom & Situational Bonus:</div>	
+						{{/rollTotal() mod3type 1}}
+						
+						{{#rollTotal() mod3type 2}}{{#^rollGreater() test target}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+						<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="CUSTOM-MODIFIERS">Custom & Situational Bonus:</div>	
+						{{/^rollGreater() test target}}{{/rollTotal() mod3type 2}}				
+
+						{{#rollTotal() mod3type 3}}{{#rollGreater() test target}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+						<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="CUSTOM-MODIFIERS">Custom & Situational Bonus:</div>	
+						{{/rollGreater() test target}}{{/rollTotal() mod3type 3}}
+
+									
+						{{#rollTotal() mod1type 1}}
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod1}}</div>
+						{{/rollTotal() mod1type 1}}
+						
+						{{#rollTotal() mod1type 2}}{{#^rollGreater() test target}}
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod1}}</div>
+						{{/^rollGreater() test target}}{{/rollTotal() mod1type 2}}				
+
+						{{#rollTotal() mod1type 3}}{{#rollGreater() test target}}
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod1}}</div>
+						{{/rollGreater() test target}}{{/rollTotal() mod1type 3}}									
+
+
+						{{#rollTotal() mod2type 1}}
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod2}}</div>
+						{{/rollTotal() mod2type 1}}
+						
+						{{#rollTotal() mod2type 2}}{{#^rollGreater() test target}}
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-keffects sheet-center" style="margin-right: 3px; color: #858585">{{mod2}}</div>
+						{{/^rollGreater() test target}}{{/rollTotal() mod2type 2}}				
+
+						{{#rollTotal() mod2type 3}}{{#rollGreater() test target}}
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod2}}</div>
+						{{/rollGreater() test target}}{{/rollTotal() mod2type 3}}									
+
+
+						{{#rollTotal() mod3type 1}}
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod3}}</div>
+						{{/rollTotal() mod3type 1}}
+						
+						{{#rollTotal() mod3type 2}}{{#^rollGreater() test target}}
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod3}}</div>
+						{{/^rollGreater() test target}}{{/rollTotal() mod3type 2}}				
+
+						{{#rollTotal() mod3type 3}}{{#rollGreater() test target}}
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod3}}</div>
+						{{/rollGreater() test target}}{{/rollTotal() mod3type 3}}										
+
+												
+										{{#rollTotal() mod3type 3}}{{#rollGreater() test target}}
+										</div>
+										</div>
+										{{/rollGreater() test target}}{{/rollTotal() mod3type 3}}																
+										
+										{{#rollTotal() mod3type 2}}{{#^rollGreater() test target}}
+										</div>
+										</div>
+										{{/^rollGreater() test target}}{{/rollTotal() mod3type 2}}	
+
+										{{#rollTotal() mod3type 1}}
+										</div>
+										</div>
+										{{/rollTotal() mod3type 1}}
+										
+										{{#rollTotal() mod2type 3}}{{#rollGreater() test target}}
+										</div>
+										</div>
+										{{/rollGreater() test target}}{{/rollTotal() mod2type 3}}	
+										
+										{{#rollTotal() mod2type 2}}{{#^rollGreater() test target}}
+										</div>
+										</div>
+										{{/^rollGreater() test target}}{{/rollTotal() mod2type 2}}	
+										
+										{{#rollTotal() mod2type 1}}
+										</div>
+										</div>
+										{{/rollTotal() mod2type 1}}
+										
+										{{#rollTotal() mod1type 3}}{{#rollGreater() test target}}
+										</div>
+										</div>
+										{{/rollGreater() test target}}{{/rollTotal() mod1type 3}}	
+										
+										{{#rollTotal() mod1type 2}}{{#^rollGreater() test target}}
+										</div>
+										</div>
+										{{/^rollGreater() test target}}{{/rollTotal() mod1type 2}}
+										
+										{{#rollTotal() mod1type 1}}
+										</div>
+										</div>
+										{{/rollTotal() mod1type 1}}		
+										{{/sl}}			
+
+
+
+	
+						{{^sl}}								
+						{{#rollTotal() mod1type 1}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod1}}</div>
+							</div>
+						</div>
+						{{/rollTotal() mod1type 1}}
+						
+						{{#rollTotal() mod1type 2}}{{#^rollGreater() test target}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod1}}</div>
+							</div>
+						</div>
+						{{/^rollGreater() test target}}{{/rollTotal() mod1type 2}}				
+
+						{{#rollTotal() mod1type 3}}{{#rollGreater() test target}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod1}}</div>
+							</div>
+						</div>
+						{{/rollGreater() test target}}{{/rollTotal() mod1type 3}}									
+
+
+						{{#rollTotal() mod2type 1}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod2}}</div>
+							</div>
+						</div>
+						{{/rollTotal() mod2type 1}}
+						
+						{{#rollTotal() mod2type 2}}{{#^rollGreater() test target}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod2}}</div>
+							</div>
+						</div>
+						{{/^rollGreater() test target}}{{/rollTotal() mod2type 2}}				
+
+						{{#rollTotal() mod2type 3}}{{#rollGreater() test target}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod2}}</div>
+							</div>
+						</div>
+						{{/rollGreater() test target}}{{/rollTotal() mod2type 3}}									
+
+
+						{{#rollTotal() mod3type 1}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod3}}</div>
+							</div>
+						</div>
+						{{/rollTotal() mod3type 1}}
+						
+						{{#rollTotal() mod3type 2}}{{#^rollGreater() test target}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod3}}</div>
+							</div>
+						</div>
+						{{/^rollGreater() test target}}{{/rollTotal() mod3type 2}}				
+
+						{{#rollTotal() mod3type 3}}{{#rollGreater() test target}}
+						<div class="sheet-row">
+							<div class="sheet-no-yellow-bg">
+							<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-center" style="margin-right: 3px; color: #858585">{{mod3}}</div>
+							</div>
+						</div>
+						{{/rollGreater() test target}}{{/rollTotal() mod3type 3}}		
+						{{/sl}}							
+								
+
+
+										<!-- SKILL TEST RESULT -->
+										{{^sl}}
 										{{#skilltest}}
 										{{^healtest}}
 										{{#^rollGreater() test target}}
@@ -21846,7 +26525,7 @@
 										{{/rollGreater() test target}}
 										{{/healtest}}	
 										{{/skilltest}}
-
+										{{/sl}}
 									
 										<!-- BATTLE INIT TEST -->
 										{{#inittest}}
@@ -21875,21 +26554,18 @@
 										{{#arcanetest}}										
 										{{#rollGreater() test target}}	
 										<div class="sheet-row">
-											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble">Casting Test Failed</div>
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble" data-i18n="CASTING-FAILURE">Casting Test Failure</div>
 										</div>										
 										{{/rollGreater() test target}}
 										{{/arcanetest}}
 										{{#praytest}}										
 										{{#rollGreater() test target}}	
 										<div class="sheet-row">
-											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble">Pray Test Failed</div>
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble" data-i18n="PRAY-FAILURE">Pray Test Failure</div>
 										</div>										
 										{{/rollGreater() test target}}
 										{{/praytest}}
 
-										<!-- TALENT EFFECTS SUCCESS/FAIL-->
-
-
 
 
 										<!-- HEAL RESULT -->
@@ -21900,6 +26576,24 @@
 										</div>
 										{{/^rollGreater() test target}}
 										{{/healtest}}
+										
+										
+										<!-- RELOAD RESULT -->
+										{{#reload}}
+										{{#^rollLess() computed::slbonus reloadrating}}
+										<div class="sheet-row">
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-critical">Reload Test Successful</span></div>
+										</div>
+										{{/^rollLess() computed::slbonus reloadrating}}
+										{{#rollLess() computed::slbonus reloadrating}}
+										<div class="sheet-row">
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble">Reload Test Failure</span></div>
+											<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide">Add any +SL to next Reload Roll</span></div>
+										</div>
+										{{/rollLess() computed::slbonus reloadrating}}
+										{{/reload}}										
+										
+										
 
 								
 										<!-- SPELL DISCRIPTION -->									
@@ -21907,11 +26601,10 @@
 										{{#spelldescription}}
 										<div class="sheet-row">
 											<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide" data-i18n="SPELL-DESCRIPTION">Spell Description</div>
-											<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-value">{{spelldescription}}</div>
+											<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-value">{{spelldescription}}abc</div>
 										</div>
 										{{/spelldescription}}
 										
-										
 										<!-- HIT LOCATION -->									
 										{{#spelldamage}}
 										{{#hitlocation}}
@@ -22557,54 +27250,81 @@
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
 										</div>
+										{{#rollGreater() pummel 0}}	
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
+										{{/rollGreater() pummel 0}}
 										{{/rollTotal() test 10}}
 										{{#rollTotal() test 20}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
 										</div>
+										{{#rollGreater() pummel 0}}
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
+										{{/rollGreater() pummel 0}}
 										{{/rollTotal() test 20}}
 										{{#rollTotal() test 30}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
 										</div>
+										{{#rollGreater() pummel 0}}
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
+										{{/rollGreater() pummel 0}}
 										{{/rollTotal() test 30}}
 										{{#rollTotal() test 40}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
 										</div>
+										{{#rollGreater() pummel 0}}
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
+										{{/rollGreater() pummel 0}}
 										{{/rollTotal() test 40}}
 										{{#rollTotal() test 50}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
 										</div>
+										{{#rollGreater() pummel 0}}
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
+										{{/rollGreater() pummel 0}}
 										{{/rollTotal() test 50}}
 										{{#rollTotal() test 60}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
 										</div>
+										{{#rollGreater() pummel 0}}
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
+										{{/rollGreater() pummel 0}}
 										{{/rollTotal() test 60}}
 										{{#rollTotal() test 70}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
 										</div>
+										{{#rollGreater() pummel 0}}
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
+										{{/rollGreater() pummel 0}}
 										{{/rollTotal() test 70}}
 										{{#rollTotal() test 80}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
 										</div>
+										{{#rollGreater() pummel 0}}
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
+										{{/rollGreater() pummel 0}}
 										{{/rollTotal() test 80}}
 										{{#rollTotal() test 90}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
 										</div>
+										{{#rollGreater() pummel 0}}
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
+										{{/rollGreater() pummel 0}}
 										{{/rollTotal() test 90}}
 										
 										
@@ -23171,16 +27891,80 @@
 										{{#damage}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="DAMAGE">Damage</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-rt-value">{{damage}} + <span data-i18n="OPPOSED-SL">Opposed SL</span> </div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-rt-key">{{damage}} <span style="color: #858585; font-size: 11px;">+ </span><span data-i18n="OPPOSED-SL" style="color: #858585; font-size: 11px;">Opposed SL</span> </div>
 										</div>
 										{{/damage}}
 										{{/rollGreater() showdmg 0}}
 										{{/attacktest}}
+										
+										
+										<!-- WEAPON EFFECTS -->	
+										{{#attacktest}}
+										<div class="sheet-row">
+										{{#rollGreater() showdmg 0}}
+										{{#rollGreater() damaging 0}}
+											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>		
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-rt-no-border" style="color: #858585; border: 0xp"><span data-i18n="DAMAGING">Damaging</span><span style="margin-right: 3px" data-i18n="UNIT-DIE">Unit Die</span>({{computed::test}})</div>							
+										{{/rollGreater() damaging 0}}
+										{{#rollTotal() damaging 0}}{{#rollGreater() fast 0}}
+											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>
+										{{/rollGreater() fast 0}}{{/rollTotal() damaging 0}}
+										{{#rollTotal() damaging 0}}{{#rollTotal() fast 0}}{{#rollGreater() slow 0}}
+											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>
+										{{/rollGreater() slow 0}}{{/rollTotal() fast 0}}{{/rollTotal() damaging 0}}
+										{{#rollTotal() damaging 0}}{{#rollTotal() fast 0}}{{#rollTotal() slow 0}}{{#rollGreater() hack 0}}
+											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>
+										{{/rollGreater() hack 0}}{{/rollTotal() slow 0}}{{/rollTotal() fast 0}}{{/rollTotal() damaging 0}}
+										{{#rollTotal() damaging 0}}{{#rollTotal() fast 0}}{{#rollTotal() slow 0}}{{#rollTotal() hack 0}} {{#rollGreater() penetrating 0}}
+											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>
+										{{/rollGreater() penetrating 0}} {{/rollTotal() hack 0}}{{/rollTotal() slow 0}}{{/rollTotal() fast 0}}{{/rollTotal() damaging 0}}
+										
+										{{#rollGreater() impact 0}}	{{#rollTotal() tiring 0}}	
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects" style="color: #858585"><span style="margin-right: 3px;" data-i18n="IMPACT-EFFECT">Impact: Add</span>+{{computed::test}}<span data-i18n="DMG"></span></div>
+										{{/rollTotal() tiring 0}} {{/rollGreater() impact 0}}	
+										{{#rollGreater() fast 0}}
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="FAST-EFFECT">Fast: Opposed -10 Roll if not Fast</span></div>
+										{{/rollGreater() fast 0}}
+																		
+										{{#rollGreater() slow 0}}
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="SLOW-EFFECT">Slow: Opposed gains +1 SL</span></div>
+										{{/rollGreater() slow 0}}
+																		
+										{{#rollGreater() hack 0}}
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="HACK-EFFECT">Hack: HitLoc Armor Dmg +1</span></div>
+										{{/rollGreater() hack 0}}
+										{{#rollGreater() penetrating 0}}		
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="PENETRATING">Penetrating</span>:</div>		
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="PENETRATING-EFFECT">Ignore Metal-AP & -1 remaining AP</span></div>
+										{{/rollGreater() penetrating 0}}
+										{{#rollGreater() blackpowder 0}}
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="BLACKPOWDER">Blackpowder</span>:</div>		
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="BLACKPOWDER-EFFECT">Target +20 Cool test or +1 Broken</span></div>
+										{{/rollGreater() blackpowder 0}}
+										{{/rollGreater() showdmg 0}}
+										
+										
+										{{#^rollGreater() showdmg 0}} {{#rollGreater() riposte 0}}
+											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>
+										{{/rollGreater() riposte 0}} {{/^rollGreater() showdmg 0}}
+										
+										{{#rollGreater() riposte 0}} 
+											<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects" style="color: #858585"><span data-i18n="RIPOSTE"></span>{{riposte}}: <span class="sheet-chat-button-ripostedmg" style="height: 10px">{{RTriposte}}</span></div>
+										{{/rollGreater() riposte 0}}
+										
+										{{#rollTotal() damaging 0}}{{#rollTotal() fast 0}}{{#rollTotal() slow 0}}{{#rollTotal() hack 0}} {{#rollTotal() penetrating 0}} {{#rollTotal() riposte 0}} {{#rollGreater() shieldsman 0}}
+											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>
+										{{/rollGreater() shieldsman 0}} {{/rollTotal() riposte 0}} {{/rollTotal() penetrating 0}} {{/rollTotal() hack 0}}{{/rollTotal() slow 0}}{{/rollTotal() fast 0}}{{/rollTotal() damaging 0}}
+										
+										{{#rollGreater() shieldsman 0}}		
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects" style="color: #858585"><span style="margin-right: 3px" data-i18n="SHIELDSMAN-EFFECT">Shieldsman: If you lose Roll</span> +{{shieldsman}} SL</div>
+										{{/rollGreater() shieldsman 0}}	
+										</div>					
+									
+										{{/attacktest}}
+																		
 
-
-
-
-
+										
 
 
 										<!-- SPECIAL TEMPLATE -->
@@ -23233,7 +28017,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 01 10}}
 										{{#rollBetween() critroll 11 20}}
@@ -23243,7 +28027,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 11 20}}
 										{{#rollBetween() critroll 21 25}}
@@ -23253,7 +28037,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 21 25}}
 										{{#rollBetween() critroll 26 30}}
@@ -23263,7 +28047,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 26 30}}
 										{{#rollBetween() critroll 31 35}}
@@ -23273,18 +28057,18 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 31 35}}
 										{{#rollBetween() critroll 36 40}}
 										<div class="sheet-row">
 											<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide" data-i18n="BLACK-EYE">Black Eye</div>
-										</div>/div>
+										</div>
 										<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="BLACK-EYE-DESC">A solid blow hits your eye, leaving tears and much pain. Gain 2 Blinded Conditions.</div>
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 36 40}}
 									{{#rollBetween() critroll 41 45}}
@@ -23294,7 +28078,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 41 45}}
 									{{#rollBetween() critroll 46 50}}
@@ -23304,7 +28088,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 46 50}}
 									{{#rollBetween() critroll 51 55}}
@@ -23314,7 +28098,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 51 55}}
 									{{#rollBetween() critroll 56 60}}
@@ -23324,7 +28108,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 56 60}}
 									{{#rollBetween() critroll 61 65}}
@@ -23334,7 +28118,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 61 65}}
 									{{#rollBetween() critroll 66 70}}
@@ -23344,7 +28128,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 66 70}}
 									{{#rollBetween() critroll 71 75}}
@@ -23354,7 +28138,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 71 75}}
 									{{#rollBetween() critroll 76 80}}
@@ -23364,7 +28148,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 76 80}}
 									{{#rollBetween() critroll 81 85}}
@@ -23374,7 +28158,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 81 85}}
 									{{#rollBetween() critroll 86 90}}
@@ -23384,7 +28168,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 86 90}}
 									{{#rollBetween() critroll 91 93}}
@@ -23394,7 +28178,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 91 93}}
 									{{#rollBetween() critroll 94 96}}
@@ -23404,7 +28188,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 94 96}}
 									{{#rollBetween() critroll 97 99}}
@@ -23414,7 +28198,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 97 99}}
 									{{#rollGreater() critroll 99}}
@@ -23436,7 +28220,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 01 10}}
 									{{#rollBetween() critroll 11 20}}
@@ -23446,7 +28230,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 11 20}}
 									{{#rollBetween() critroll 21 25}}
@@ -23456,7 +28240,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 21 25}}
 									{{#rollBetween() critroll 26 30}}
@@ -23466,7 +28250,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 26 30}}
 									{{#rollBetween() critroll 31 35}}
@@ -23476,7 +28260,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 31 35}}
 									{{#rollBetween() critroll 36 40}}
@@ -23486,7 +28270,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 36 40}}
 									{{#rollBetween() critroll 41 45}}
@@ -23496,7 +28280,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 41 45}}
 									{{#rollBetween() critroll 46 50}}
@@ -23506,7 +28290,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 46 50}}
 									{{#rollBetween() critroll 51 55}}
@@ -23516,7 +28300,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 51 55}}
 									{{#rollBetween() critroll 56 60}}
@@ -23526,7 +28310,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 56 60}}
 									{{#rollBetween() critroll 61 65}}
@@ -23536,7 +28320,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 61 65}}
 									{{#rollBetween() critroll 66 70}}
@@ -23546,7 +28330,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 66 70}}
 									{{#rollBetween() critroll 71 75}}
@@ -23556,7 +28340,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 71 75}}
 									{{#rollBetween() critroll 76 80}}
@@ -23566,7 +28350,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 76 80}}
 									{{#rollBetween() critroll 81 85}}
@@ -23576,7 +28360,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 81 85}}
 									{{#rollBetween() critroll 86 90}}
@@ -23586,7 +28370,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 86 90}}
 									{{#rollBetween() critroll 91 93}}
@@ -23596,7 +28380,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 91 93}}
 									{{#rollBetween() critroll 94 96}}
@@ -23606,7 +28390,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 94 96}}
 									{{#rollBetween() critroll 97 99}}
@@ -23616,7 +28400,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 97 99}}
 									{{#rollGreater() critroll 99}}
@@ -23639,7 +28423,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 01 10}}
 									{{#rollBetween() critroll 11 20}}
@@ -23649,7 +28433,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 11 20}}
 									{{#rollBetween() critroll 21 25}}
@@ -23659,7 +28443,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 21 25}}
 									{{#rollBetween() critroll 26 30}}
@@ -23669,7 +28453,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 26 30}}
 									{{#rollBetween() critroll 31 35}}
@@ -23679,7 +28463,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 31 35}}
 									{{#rollBetween() critroll 36 40}}
@@ -23689,7 +28473,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 36 40}}
 									{{#rollBetween() critroll 41 45}}
@@ -23699,7 +28483,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 41 45}}
 									{{#rollBetween() critroll 46 50}}
@@ -23709,7 +28493,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 46 50}}
 									{{#rollBetween() critroll 51 55}}
@@ -23719,7 +28503,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 51 55}}
 									{{#rollBetween() critroll 56 60}}
@@ -23729,7 +28513,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 56 60}}
 									{{#rollBetween() critroll 61 65}}
@@ -23739,7 +28523,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 61 65}}
 									{{#rollBetween() critroll 66 70}}
@@ -23749,7 +28533,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 66 70}}
 									{{#rollBetween() critroll 71 75}}
@@ -23759,7 +28543,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 71 75}}
 									{{#rollBetween() critroll 76 80}}
@@ -23769,7 +28553,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 76 80}}
 									{{#rollBetween() critroll 81 85}}
@@ -23779,7 +28563,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 81 85}}
 									{{#rollBetween() critroll 86 90}}
@@ -23789,7 +28573,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 86 90}}
 									{{#rollBetween() critroll 91 93}}
@@ -23799,7 +28583,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 91 93}}
 									{{#rollBetween() critroll 94 96}}
@@ -23809,7 +28593,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 94 96}}
 									{{#rollBetween() critroll 97 99}}
@@ -23819,7 +28603,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 97 99}}
 									{{#rollGreater() critroll 99}}
@@ -23842,7 +28626,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 01 10}}
 									{{#rollBetween() critroll 11 20}}
@@ -23852,7 +28636,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 11 20}}
 									{{#rollBetween() critroll 21 25}}
@@ -23862,7 +28646,7 @@
 									</div>
 									<div class="sheet-row">
 										<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1</div>
+										<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 									</div>
 									{{/rollBetween() critroll 21 25}}
 									{{#rollBetween() critroll 26 30}}
@@ -23872,7 +28656,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">1 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 26 30}}
 										{{#rollBetween() critroll 31 35}}
@@ -23882,7 +28666,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 31 35}}
 										{{#rollBetween() critroll 36 40}}
@@ -23892,7 +28676,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 36 40}}
 										{{#rollBetween() critroll 41 45}}
@@ -23902,7 +28686,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 41 45}}
 										{{#rollBetween() critroll 46 50}}
@@ -23912,7 +28696,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">2 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 46 50}}
 										{{#rollBetween() critroll 51 55}}
@@ -23922,7 +28706,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 51 55}}
 										{{#rollBetween() critroll 56 60}}
@@ -23932,7 +28716,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 56 60}}
 										{{#rollBetween() critroll 61 65}}
@@ -23942,7 +28726,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 61 65}}
 										{{#rollBetween() critroll 66 70}}
@@ -23952,7 +28736,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">3 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 66 70}}
 										{{#rollBetween() critroll 71 75}}
@@ -23962,7 +28746,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 71 75}}
 										{{#rollBetween() critroll 76 80}}
@@ -23972,7 +28756,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 76 80}}
 										{{#rollBetween() critroll 81 85}}
@@ -23982,7 +28766,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 81 85}}
 										{{#rollBetween() critroll 86 90}}
@@ -23992,7 +28776,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">4 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 86 90}}
 										{{#rollBetween() critroll 91 93}}
@@ -24002,7 +28786,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 91 93}}
 										{{#rollBetween() critroll 94 96}}
@@ -24012,7 +28796,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 94 96}}
 										{{#rollBetween() critroll 97 99}}
@@ -24022,7 +28806,7 @@
 										</div>
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="WOUNDS">Wounds</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value">5 {{#rollGreater() critdmgbonus 0}}+ {{critdmgbonus}}{{/rollGreater() critdmgbonus 0}}</div>
 										</div>
 										{{/rollBetween() critroll 97 99}}
 										{{#rollGreater() critroll 99}}
@@ -26551,137 +31335,724 @@ on("clicked:activate", function(event) {
 
 on("change:repeating_melee:UsedWeapon", function (event) {
                 // makes sure the sheet worker doesnt trigger itself
-                if (event.sourceType === 'sheetworker') return;
+        if (event.sourceType === 'sheetworker') return;
                 // get the row id that the player clicked. the id is always between the second and third '_'
-                const playerclickedid = event.sourceAttribute.split('_')[2] || '';
-                
+        const playerclickedid = event.sourceAttribute.split('_')[2] || '';
+  
+		getAttrs(["repeating_melee_UsedWeapon","repeating_melee_UsedDefense","repeating_melee_UsedTwoHanded","Used_MeleeTwoHanded","Devmode"],function(t) {              
                 getSectionIDs("repeating_melee", function (ids) {
                     // create an object to hold all the attributes we are bout to change
                     const output = {};
+                    const output2 = {};
+                    const output3 = {};
+                    const output4 = {};
+                    const output5 = {};
+                    const output6 = {};
+                    const output7 = {};
                     // loop through the row ids
                     ids.forEach(id => {
-                        // check if the id is the one the player clicked; if not, set to 0, if it is, set to 1.
-                        output[`repeating_melee_${id}_UsedWeapon`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 1 : 0;
-                    });
-
+		console.log(t.Devmode);
 					
-                    // now all attributes have been updated, save them
+					if (t.Devmode == 1) {
+					if (t.repeating_melee_UsedDefense == 1) {output3[`repeating_melee_${id}_UsedDefense`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 0 : 0;
+					setAttrs({
+						"Used_DefenseWeapon": '',
+						"Used_DefenseWeaponSkill": '',
+						"Used_DefenseBonus": '',
+						"Used_DefenseStrengthBonus": '',
+						"Used_DefenseDamageBonus": '',
+						"Used_DefenseReach": '',
+						"Used_DefenseQualities": '',
+						"Used_DefenseOpposedDmg": '0',
+						"Used_DefenseDefensive": '0',
+						"Used_DefenseImpale": '0',
+						"Used_DefenseOpposedDmg": '0',
+						"Used_DefenseDamaging": '0',
+						"Used_DefenseFast": '0',
+						"Used_DefenseSlow": '0',
+						"Used_DefenseHack": '0',
+						"Used_DefensePrecise": '0',
+						"Used_DefensePractical": '0',
+						"Used_DefenseImpact": '0',
+						"Used_DefensePenetrating": '0',
+						"Used_DefensePummel": '0',
+						"Used_DefenseTiring": '0',
+						"Used_DefenseShield": '0',
+						"Used_Defense_att_modtype1": '',
+						"Used_Defense_att_mod1": '',
+						"Used_Defense_att_modtype2": '',
+						"Used_Defense_att_mod2": '',
+						"Used_Defense_att_modtype3": '',
+						"Used_Defense_att_mod3": '',
+						"Used_Defense_modtype1": '',
+						"Used_Defense_mod1": '',
+						"Used_Defense_modtype2": '',
+						"Used_Defense_mod2": '',
+						"Used_Defense_modtype3": '',
+						"Used_Defense_mod3": ''
+					}, {silent: true});}					
+					}
+					
+					
+					if (t.repeating_melee_UsedWeapon == 0) {					
+					if (t.repeating_melee_UsedWeapon == 0) {					
+					if (t.Used_MeleeTwoHanded == 0) {output[`repeating_melee_${id}_UsedWeapon`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 0 : 0;
+					setAttrs({
+						"Used_MeleeWeapon": '',
+						"Used_MeleeWeaponSkill": '',
+						"Used_MeleeBonus": '',
+						"Used_MeleeStrengthBonus": '',
+						"Used_MeleeDamageBonus": '',
+						"Used_MeleeReach": '',
+						"Used_MeleeQualities": '',
+						"Used_MeleeOpposedDmg": '0',
+						"Used_MeleeDamaging": '0',
+						"Used_MeleeDefensive": '0',
+						"Used_MeleeImpale": '0',
+						"Used_MeleeFast": '0',
+						"Used_MeleeSlow": '0',
+						"Used_MeleeHack": '0',
+						"Used_MeleePrecise": '0',
+						"Used_MeleePractical": '0',
+						"Used_MeleeImpact": '0',
+						"Used_MeleePenetrating": '0',
+						"Used_MeleeTiring": '0',
+						"Used_MeleePummel": '0',
+						"Used_MeleeShield": '0',
+						"Used_Melee_modtype1": '',
+						"Used_Melee_mod1": '',
+						"Used_Melee_modtype2": '',
+						"Used_Melee_mod2": '',
+						"Used_Melee_modtype3": '',
+						"Used_Melee_mod3": '',
+						"Used_Melee_def_modtype1": '',
+						"Used_Melee_def_mod1": '',
+						"Used_Melee_def_modtype2": '',
+						"Used_Melee_def_mod2": '',
+						"Used_Melee_def_modtype3": '',
+						"Used_Melee_def_mod3": ''
+					}, {silent: true});}
+					if (t.Used_MeleeTwoHanded == 1) {output[`repeating_melee_${id}_UsedWeapon`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 0 : 0;
+					output2[`repeating_melee_${id}_UsedDefense`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 0 : 0;
+					setAttrs({
+						"Used_MeleeWeapon": '',
+						"Used_MeleeWeaponSkill": '',
+						"Used_MeleeBonus": '',
+						"Used_MeleeStrengthBonus": '',
+						"Used_MeleeDamageBonus": '',
+						"Used_MeleeReach": '',
+						"Used_MeleeQualities": '',
+						"Used_MeleeOpposedDmg": '0',
+						"Used_MeleeDamaging": '0',
+						"Used_MeleeDefensive": '0',
+						"Used_MeleeImpale": '0',
+						"Used_MeleeFast": '0',
+						"Used_MeleeSlow": '0',
+						"Used_MeleeHack": '0',
+						"Used_MeleePrecise": '0',
+						"Used_MeleePractical": '0',
+						"Used_MeleeImpact": '0',
+						"Used_MeleePenetrating": '0',
+						"Used_MeleeTiring": '0',
+						"Used_MeleePummel": '0',
+						"Used_MeleeShield": '0',
+						"Used_MeleeTwoHanded": '0',
+						"Used_Melee_modtype1": '',
+						"Used_Melee_mod1": '',
+						"Used_Melee_modtype2": '',
+						"Used_Melee_mod2": '',
+						"Used_Melee_modtype3": '',
+						"Used_Melee_mod3": '',
+						"Used_Melee_def_modtype1": '',
+						"Used_Melee_def_mod1": '',
+						"Used_Melee_def_modtype2": '',
+						"Used_Melee_def_mod2": '',
+						"Used_Melee_def_modtype3": '',
+						"Used_Melee_def_mod3": '',
+						"Used_DefenseWeapon": '',
+						"Used_DefenseWeaponSkill": '',
+						"Used_DefenseBonus": '',
+						"Used_DefenseStrengthBonus": '',
+						"Used_DefenseDamageBonus": '',
+						"Used_DefenseReach": '',
+						"Used_DefenseQualities": '',
+						"Used_DefenseOpposedDmg": '0',
+						"Used_DefenseDefensive": '0',
+						"Used_DefenseImpale": '0',
+						"Used_DefenseOpposedDmg": '0',
+						"Used_DefenseDamaging": '0',
+						"Used_DefenseFast": '0',
+						"Used_DefenseSlow": '0',
+						"Used_DefenseHack": '0',
+						"Used_DefensePrecise": '0',
+						"Used_DefensePractical": '0',
+						"Used_DefenseImpact": '0',
+						"Used_DefensePenetrating": '0',
+						"Used_DefensePummel": '0',
+						"Used_DefenseTiring": '0',
+						"Used_DefenseShield": '0',
+						"Used_Defense_att_modtype1": '',
+						"Used_Defense_att_mod1": '',
+						"Used_Defense_att_modtype2": '',
+						"Used_Defense_att_mod2": '',
+						"Used_Defense_att_modtype3": '',
+						"Used_Defense_att_mod3": '',
+						"Used_Defense_modtype1": '',
+						"Used_Defense_mod1": '',
+						"Used_Defense_modtype2": '',
+						"Used_Defense_mod2": '',
+						"Used_Defense_modtype3": '',
+						"Used_Defense_mod3": ''
+					}, {silent: true});}		
+						
+						if (t.repeating_melee_UsedWeapon == 0) {
                     setAttrs(output, {silent: true});
-                    // we use silent:true, so this change doesnt trigger the sheet worker again.
-                });      
+                    setAttrs(output2, {silent: true});
+						}
 
+					}
 
-   getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3"],function(v) {
-            let weapon = v.repeating_melee_MeleeWeapon;
-            let wskill = v.repeating_melee_MeleeWeaponSkill;
-            let bonus = v.repeating_melee_MeleeBonus;
-            let sbonus = v.repeating_melee_MeleeStrengthBonus;
-            let dbonus = v.repeating_melee_MeleeDamageBonus;
-            let reach = v.repeating_melee_MeleeReach;
-            let qual = v.repeating_melee_MeleeQualities;
-            let def = v.repeating_melee_MeleeDefensive;
-            let imp = v.repeating_melee_MeleeImpale;				
-            let modt1 = v.repeating_melee_MeleeWeapon_modtype1;			
-            let mod1 = v.repeating_melee_MeleeWeapon_mod1;
-            let modt2 = v.repeating_melee_MeleeWeapon_modtype2;			
-            let mod2 = v.repeating_melee_MeleeWeapon_mod2;	
-            let modt3 = v.repeating_melee_MeleeWeapon_modtype3;			
-            let mod3 = v.repeating_melee_MeleeWeapon_mod3;							
+           } else {
+			if (t.repeating_melee_UsedTwoHanded == 0) {
+			
+output5[`repeating_melee_${id}_UsedWeapon`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 1 : 0;
+setAttrs(output5, {silent: true});		
+						if (t.repeating_melee_UsedDefense == 1) {
+                    setAttrs(output3, {silent: true});	
+						}			
+   getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_MeleeImpact","repeating_melee_MeleePenetrating","repeating_melee_MeleePummel","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"],function(v) {
+            let weapon = v.repeating_melee_MeleeWeapon;					
             setAttrs({
                 "Used_MeleeWeapon": weapon,
-                "Used_MeleeWeaponSkill": wskill,
-                "Used_MeleeBonus": bonus,
-                "Used_MeleeStrengthBonus": sbonus,
-                "Used_MeleeDamageBonus": dbonus,
-                "Used_MeleeReach": reach,
-                "Used_MeleeQualities": qual,
-                "Used_MeleeDefensive": def,
-                "Used_MeleeImpale": imp,
-				"Used_Melee_modtype1": modt1,
-				"Used_Melee_mod1": mod1,
-				"Used_Melee_modtype2": modt2,
-				"Used_Melee_mod2": mod2,
-				"Used_Melee_modtype3": modt3,
-				"Used_Melee_mod3": mod3,
-				"CurrAtk": weapon
+                "Used_MeleeWeaponSkill": v.repeating_melee_MeleeWeaponSkill,
+                "Used_MeleeBonus": v.repeating_melee_MeleeBonus,
+                "Used_MeleeStrengthBonus": v.repeating_melee_MeleeStrengthBonus,
+                "Used_MeleeDamageBonus": v.repeating_melee_MeleeDamageBonus,
+                "Used_MeleeReach": v.repeating_melee_MeleeReach,
+                "Used_MeleeQualities": v.repeating_melee_MeleeQualities,
+				"Used_MeleeOpposedDmg": v.repeating_melee_OpposedDmg,
+				"Used_MeleeDamaging": v.repeating_melee_UsedDamaging,
+                "Used_MeleeDefensive": v.repeating_melee_MeleeDefensive,
+                "Used_MeleeImpale": v.repeating_melee_MeleeImpale,
+                "Used_MeleeFast": v.repeating_melee_MeleeFast,
+                "Used_MeleeSlow": v.repeating_melee_MeleeSlow,
+                "Used_MeleeHack": v.repeating_melee_MeleeHack,
+				"Used_MeleePrecise": v.repeating_melee_MeleePrecise,
+				"Used_MeleePractical": v.repeating_melee_MeleePractical,
+				"Used_MeleeImpact": v.repeating_melee_MeleeImpact,
+				"Used_MeleePenetrating": v.repeating_melee_MeleePenetrating,
+				"Used_MeleePummel": v.repeating_melee_MeleePummel,
+				"Used_MeleeTiring": v.repeating_melee_MeleeTiring,
+				"Used_MeleeTwoHanded": v.repeating_melee_UsedTwoHanded,
+				"Used_MeleeShield": v.repeating_melee_UsedShield,
+				"Used_Melee_modtype1": v.repeating_melee_MeleeWeapon_modtype1,
+				"Used_Melee_mod1": v.repeating_melee_MeleeWeapon_mod1,
+				"Used_Melee_modtype2": v.repeating_melee_MeleeWeapon_modtype2,
+				"Used_Melee_mod2": v.repeating_melee_MeleeWeapon_mod2,
+				"Used_Melee_modtype3": v.repeating_melee_MeleeWeapon_modtype3,
+				"Used_Melee_mod3": v.repeating_melee_MeleeWeapon_mod3,
+				"Used_Melee_def_modtype1": v.repeating_melee_DefenseWeapon_modtype1,
+				"Used_Melee_def_mod1": v.repeating_melee_DefenseWeapon_mod1,
+				"Used_Melee_def_modtype2": v.repeating_melee_DefenseWeapon_modtype2,
+				"Used_Melee_def_mod2": v.repeating_melee_DefenseWeapon_mod2,
+				"Used_Melee_def_modtype3": v.repeating_melee_DefenseWeapon_modtype3,
+				"Used_Melee_def_mod3": v.repeating_melee_DefenseWeapon_mod3,
 	        }, {silent: true});
+					
+			if (t.Used_MeleeTwoHanded == 1) {			
+			output4[`repeating_melee_${id}_UsedDefense`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 0 : 0;
+			setAttrs(output4, {silent: true});
+            setAttrs({
+						"Used_DefenseWeapon": '',
+						"Used_DefenseWeaponSkill": '',
+						"Used_DefenseBonus": '',
+						"Used_DefenseStrengthBonus": '',
+						"Used_DefenseDamageBonus": '',
+						"Used_DefenseReach": '',
+						"Used_DefenseQualities": '',
+						"Used_DefenseDefensive": '',
+						"Used_DefenseImpale": '',
+						"Used_DefenseOpposedDmg": '',
+						"Used_DefenseDamaging": '',
+						"Used_DefenseFast": '',
+						"Used_DefenseSlow": '',
+						"Used_DefenseHack": '',
+						"Used_DefensePrecise": '',
+						"Used_DefensePractical": '',
+						"Used_DefenseImpact": '',
+						"Used_DefensePenetrating": '',
+						"Used_DefensePummel": '',
+						"Used_DefenseTiring": '0',
+						"Used_DefenseShield": '',
+						"Used_Defense_att_modtype1": '',
+						"Used_Defense_att_mod1": '',
+						"Used_Defense_att_modtype2": '',
+						"Used_Defense_att_mod2": '',
+						"Used_Defense_att_modtype3": '',
+						"Used_Defense_att_mod3": '',
+						"Used_Defense_modtype1": '',
+						"Used_Defense_mod1": '',
+						"Used_Defense_modtype2": '',
+						"Used_Defense_mod2": '',
+						"Used_Defense_modtype3": '',
+						"Used_Defense_mod3": ''
+	        }, {silent: true});
+			}	
 		});
+			} else {
+			
+output6[`repeating_melee_${id}_UsedWeapon`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 1 : 0;
+output7[`repeating_melee_${id}_UsedDefense`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 1 : 0;
+setAttrs(output6, {silent: true});	
+setAttrs(output7, {silent: true});	
+	
+   getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_MeleeImpact","repeating_melee_MeleePenetrating","repeating_melee_MeleePummel","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"],function(v) {
+            let weapon = v.repeating_melee_MeleeWeapon;					
+            setAttrs({
+                "Used_MeleeWeapon": weapon,
+                "Used_MeleeWeaponSkill": v.repeating_melee_MeleeWeaponSkill,
+                "Used_MeleeBonus": v.repeating_melee_MeleeBonus,
+                "Used_MeleeStrengthBonus": v.repeating_melee_MeleeStrengthBonus,
+                "Used_MeleeDamageBonus": v.repeating_melee_MeleeDamageBonus,
+                "Used_MeleeReach": v.repeating_melee_MeleeReach,
+                "Used_MeleeQualities": v.repeating_melee_MeleeQualities,
+                "Used_MeleeDefensive": v.repeating_melee_MeleeDefensive,
+                "Used_MeleeImpale": v.repeating_melee_MeleeImpale,
+				"Used_MeleeOpposedDmg": v.repeating_melee_OpposedDmg,
+				"Used_MeleeDamaging": v.repeating_melee_UsedDamaging,
+                "Used_MeleeFast": v.repeating_melee_MeleeFast,
+                "Used_MeleeSlow": v.repeating_melee_MeleeSlow,
+                "Used_MeleeHack": v.repeating_melee_MeleeHack,
+				"Used_MeleePrecise": v.repeating_melee_MeleePrecise,
+				"Used_MeleePractical": v.repeating_melee_MeleePractical,
+				"Used_MeleeImpact": v.repeating_melee_MeleeImpact,
+				"Used_MeleePenetrating": v.repeating_melee_MeleePenetrating,
+				"Used_MeleePummel": v.repeating_melee_MeleePummel,
+				"Used_MeleeTiring": v.repeating_melee_MeleeTiring,
+				"Used_MeleeShield": v.repeating_melee_UsedShield,
+				"Used_MeleeTwoHanded": v.repeating_melee_UsedTwoHanded,
+				"Used_Melee_modtype1": v.repeating_melee_MeleeWeapon_modtype1,
+				"Used_Melee_mod1": v.repeating_melee_MeleeWeapon_mod1,
+				"Used_Melee_modtype2": v.repeating_melee_MeleeWeapon_modtype2,
+				"Used_Melee_mod2": v.repeating_melee_MeleeWeapon_mod2,
+				"Used_Melee_modtype3": v.repeating_melee_MeleeWeapon_modtype3,
+				"Used_Melee_mod3": v.repeating_melee_MeleeWeapon_mod3,
+				"Used_Melee_def_modtype1": v.repeating_melee_DefenseWeapon_modtype1,
+				"Used_Melee_def_mod1": v.repeating_melee_DefenseWeapon_mod1,
+				"Used_Melee_def_modtype2": v.repeating_melee_DefenseWeapon_modtype2,
+				"Used_Melee_def_mod2": v.repeating_melee_DefenseWeapon_mod2,
+				"Used_Melee_def_modtype3": v.repeating_melee_DefenseWeapon_modtype3,
+				"Used_Melee_def_mod3": v.repeating_melee_DefenseWeapon_mod3,
+                "Used_DefenseWeapon": weapon,
+                "Used_DefenseWeaponSkill": v.repeating_melee_MeleeWeaponSkill,
+                "Used_DefenseBonus": v.repeating_melee_MeleeBonus,
+                "Used_DefenseStrengthBonus": v.repeating_melee_MeleeStrengthBonus,
+                "Used_DefenseDamageBonus": v.repeating_melee_MeleeDamageBonus,
+                "Used_DefenseReach": v.repeating_melee_MeleeReach,
+                "Used_DefenseQualities": v.repeating_melee_MeleeQualities,
+                "Used_DefenseDefensive": v.repeating_melee_MeleeDefensive,
+                "Used_DefenseImpale": v.repeating_melee_MeleeImpale,
+				"Used_DefenseOpposedDmg": v.repeating_melee_OpposedDmg,
+				"Used_DefenseDamaging": v.repeating_melee_UsedDamaging,
+                "Used_DefenseFast": v.repeating_melee_MeleeFast,
+                "Used_DefenseSlow": v.repeating_melee_MeleeSlow,
+                "Used_DefenseHack": v.repeating_melee_MeleeHack,
+				"Used_DefensePrecise": v.repeating_melee_MeleePrecise,
+				"Used_DefensePractical": v.repeating_melee_MeleePractical,
+				"Used_DefenseImpact": v.repeating_melee_MeleeImpact,
+				"Used_DefensePenetrating": v.repeating_melee_MeleePenetrating,
+				"Used_DefensePummel": v.repeating_melee_MeleePummel,
+				"Used_DefenseTiring": v.repeating_melee_MeleeTiring,
+				"Used_DefenseShield": v.repeating_melee_UsedShield,
+				"Used_Defense_att_modtype1": v.repeating_melee_MeleeWeapon_modtype1,
+				"Used_Defense_att_mod1": v.repeating_melee_MeleeWeapon_mod1,
+				"Used_Defense_att_modtype2": v.repeating_melee_MeleeWeapon_modtype2,
+				"Used_Defense_att_mod2": v.repeating_melee_MeleeWeapon_mod2,
+				"Used_Defense_att_modtype3": v.repeating_melee_MeleeWeapon_modtype3,
+				"Used_Defense_att_mod3": v.repeating_melee_MeleeWeapon_mod3,
+				"Used_Defense_modtype1": v.repeating_melee_DefenseWeapon_modtype1,
+				"Used_Defense_mod1": v.repeating_melee_DefenseWeapon_mod1,
+				"Used_Defense_modtype2": v.repeating_melee_DefenseWeapon_modtype2,
+				"Used_Defense_mod2": v.repeating_melee_DefenseWeapon_mod2,
+				"Used_Defense_modtype3": v.repeating_melee_DefenseWeapon_modtype3,
+				"Used_Defense_mod3": v.repeating_melee_DefenseWeapon_mod3,
+	        }, {silent: true});
+				});
+				}
+				}
+		
+			});		
+		});  
+	});    
+			
+});
+			
+			
 			
-	});
 			
 			
 on("change:repeating_melee:UsedDefense", function (event) {
                 // makes sure the sheet worker doesnt trigger itself
-                if (event.sourceType === 'sheetworker') return;
+        if (event.sourceType === 'sheetworker') return;
                 // get the row id that the player clicked. the id is always between the second and third '_'
-                const playerclickedid = event.sourceAttribute.split('_')[2] || '';
-                
+        const playerclickedid = event.sourceAttribute.split('_')[2] || '';
+  
+		getAttrs(["repeating_melee_UsedWeapon","repeating_melee_UsedDefense","repeating_melee_UsedTwoHanded","Used_MeleeTwoHanded","Devmode"],function(t) {              
                 getSectionIDs("repeating_melee", function (ids) {
                     // create an object to hold all the attributes we are bout to change
                     const output = {};
+                    const output2 = {};
+                    const output3 = {};
+                    const output4 = {};
+                    const output5 = {};
+                    const output6 = {};
+                    const output7 = {};
                     // loop through the row ids
                     ids.forEach(id => {
-                        // check if the id is the one the player clicked; if not, set to 0, if it is, set to 1.
-                        output[`repeating_melee_${id}_UsedDefense`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 1 : 0;
-                    });
-
 					
-                    // now all attributes have been updated, save them
+					if (t.Devmode == 1) {
+					if (t.repeating_melee_UsedWeapon == 1) {output3[`repeating_melee_${id}_UsedWeapon`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 0 : 0;
+					setAttrs({
+						"Used_MeleeWeapon": '',
+						"Used_MeleeWeaponSkill": '',
+						"Used_MeleeBonus": '',
+						"Used_MeleeStrengthBonus": '',
+						"Used_MeleeDamageBonus": '',
+						"Used_MeleeReach": '',
+						"Used_MeleeQualities": '',
+						"Used_MeleeOpposedDmg": '0',
+						"Used_MeleeDamaging": '0',
+						"Used_MeleeDefensive": '0',
+						"Used_MeleeImpale": '0',
+						"Used_MeleeFast": '0',
+						"Used_MeleeSlow": '0',
+						"Used_MeleeHack": '0',
+						"Used_MeleePrecise": '0',
+						"Used_MeleePractical": '0',
+						"Used_MeleeImpact": '0',
+						"Used_MeleePenetrating": '0',
+						"Used_MeleePummel": '0',
+						"Used_MeleeTiring": '0',
+						"Used_MeleeShield": '0',
+						"Used_Melee_modtype1": '',
+						"Used_Melee_mod1": '',
+						"Used_Melee_modtype2": '',
+						"Used_Melee_mod2": '',
+						"Used_Melee_modtype3": '',
+						"Used_Melee_mod3": '',
+						"Used_Melee_def_modtype1": '',
+						"Used_Melee_def_mod1": '',
+						"Used_Melee_def_modtype2": '',
+						"Used_Melee_def_mod2": '',
+						"Used_Melee_def_modtype3": '',
+						"Used_Melee_def_mod3": ''
+					}, {silent: true});}					
+					}
+					
+					
+					if (t.repeating_melee_UsedDefense == 0) {					
+					if (t.repeating_melee_UsedDefense == 0) {					
+					if (t.Used_MeleeTwoHanded == 0) {output[`repeating_melee_${id}_UsedDefense`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 0 : 0;
+					setAttrs({
+						"Used_DefenseWeapon": '',
+						"Used_DefenseWeaponSkill": '',
+						"Used_DefenseBonus": '',
+						"Used_DefenseStrengthBonus": '',
+						"Used_DefenseDamageBonus": '',
+						"Used_DefenseReach": '',
+						"Used_DefenseQualities": '',
+						"Used_DefenseDefensive": '0',
+						"Used_DefenseImpale": '0',
+						"Used_DefenseOpposedDmg": '0',
+						"Used_DefenseDamaging": '0',
+						"Used_DefenseFast": '0',
+						"Used_DefenseSlow": '0',
+						"Used_DefenseHack": '0',
+						"Used_DefensePrecise": '0',
+						"Used_DefensePractical": '0',
+						"Used_DefenseImpact": '0',
+						"Used_DefensePenetrating": '0',
+						"Used_DefensePummel": '0',
+						"Used_DefenseTiring": '0',
+						"Used_DefenseShield": '0',
+						"Used_Defense_att_modtype1": '',
+						"Used_Defense_att_mod1": '',
+						"Used_Defense_att_modtype2": '',
+						"Used_Defense_att_mod2": '',
+						"Used_Defense_att_modtype3": '',
+						"Used_Defense_att_mod3": '',
+						"Used_Defense_modtype1": '',
+						"Used_Defense_mod1": '',
+						"Used_Defense_modtype2": '',
+						"Used_Defense_mod2": '',
+						"Used_Defense_modtype3": '',
+						"Used_Defense_mod3": ''
+					}, {silent: true});}
+					if (t.Used_MeleeTwoHanded == 1) {output[`repeating_melee_${id}_UsedWeapon`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 0 : 0;
+					output2[`repeating_melee_${id}_UsedDefense`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 0 : 0;
+					setAttrs({
+						"Used_MeleeWeapon": '',
+						"Used_MeleeWeaponSkill": '',
+						"Used_MeleeBonus": '',
+						"Used_MeleeStrengthBonus": '',
+						"Used_MeleeDamageBonus": '',
+						"Used_MeleeReach": '',
+						"Used_MeleeQualities": '',
+						"Used_MeleeOpposedDmg": '0',
+						"Used_MeleeDamaging": '0',
+						"Used_MeleeDefensive": '0',
+						"Used_MeleeImpale": '0',
+						"Used_MeleeFast": '0',
+						"Used_MeleeSlow": '0',
+						"Used_MeleeHack": '0',
+						"Used_MeleePrecise": '0',
+						"Used_MeleePractical": '0',
+						"Used_MeleeImpact": '0',
+						"Used_MeleePenetrating": '0',
+						"Used_MeleePummel": '0',
+						"Used_MeleeTiring": '0',
+						"Used_MeleeTwoHanded": '0',
+						"Used_MeleeShield": '0',
+						"Used_Melee_modtype1": '',
+						"Used_Melee_mod1": '',
+						"Used_Melee_modtype2": '',
+						"Used_Melee_mod2": '',
+						"Used_Melee_modtype3": '',
+						"Used_Melee_mod3": '',
+						"Used_Melee_def_modtype1": '',
+						"Used_Melee_def_mod1": '',
+						"Used_Melee_def_modtype2": '',
+						"Used_Melee_def_mod2": '',
+						"Used_Melee_def_modtype3": '',
+						"Used_Melee_def_mod3": '',
+						"Used_DefenseWeapon": '',
+						"Used_DefenseWeaponSkill": '',
+						"Used_DefenseBonus": '',
+						"Used_DefenseStrengthBonus": '',
+						"Used_DefenseDamageBonus": '',
+						"Used_DefenseReach": '',
+						"Used_DefenseQualities": '',
+						"Used_DefenseDefensive": '',
+						"Used_DefenseImpale": '',
+						"Used_DefenseOpposedDmg": '',
+						"Used_DefenseDamaging": '',
+						"Used_DefenseFast": '',
+						"Used_DefenseSlow": '',
+						"Used_DefenseHack": '',
+						"Used_DefensePrecise": '',
+						"Used_DefensePractical": '',
+						"Used_DefenseImpact": '',
+						"Used_DefensePenetrating": '',
+						"Used_DefensePummel": '',
+						"Used_DefenseTiring": '',
+						"Used_DefenseShield": '',
+						"Used_Defense_att_modtype1": '',
+						"Used_Defense_att_mod1": '',
+						"Used_Defense_att_modtype2": '',
+						"Used_Defense_att_mod2": '',
+						"Used_Defense_att_modtype3": '',
+						"Used_Defense_att_mod3": '',
+						"Used_Defense_modtype1": '',
+						"Used_Defense_mod1": '',
+						"Used_Defense_modtype2": '',
+						"Used_Defense_mod2": '',
+						"Used_Defense_modtype3": '',
+						"Used_Defense_mod3": ''
+					}, {silent: true});}		
+						
+						if (t.repeating_melee_UsedWeapon == 0) {
                     setAttrs(output, {silent: true});
-                    // we use silent:true, so this change doesnt trigger the sheet worker again.
-                });       
+                    setAttrs(output2, {silent: true});
+						}
 
+					}
 
-   getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_OpposedDmg","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"], function(v) {
-            let weapon = v.repeating_melee_MeleeWeapon;
-            let wskill = v.repeating_melee_MeleeWeaponSkill;
-            let bonus = v.repeating_melee_MeleeBonus;
-            let sbonus = v.repeating_melee_MeleeStrengthBonus;
-            let dbonus = v.repeating_melee_MeleeDamageBonus;
-            let reach = v.repeating_melee_MeleeReach;
-            let qual = v.repeating_melee_MeleeQualities;
-            let def = v.repeating_melee_MeleeDefensive;
-            let imp = v.repeating_melee_MeleeImpale;
-            let oppd = v.repeating_melee_OpposedDmg;					
-            let modt1 = v.repeating_melee_DefenseWeapon_modtype1;			
-            let mod1 = v.repeating_melee_DefenseWeapon_mod1;
-            let modt2 = v.repeating_melee_DefenseWeapon_modtype2;			
-            let mod2 = v.repeating_melee_DefenseWeapon_mod2;	
-            let modt3 = v.repeating_melee_DefenseWeapon_modtype3;			
-            let mod3 = v.repeating_melee_DefenseWeapon_mod3;	
+           } else {
+			if (t.repeating_melee_UsedTwoHanded == 0) {
+			
+output5[`repeating_melee_${id}_UsedDefense`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 1 : 0;
+setAttrs(output5, {silent: true});		
+						if (t.repeating_melee_UsedWeapon == 1) {
+                    setAttrs(output3, {silent: true});	
+						}	
+						
+						
+   getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_MeleeImpact","repeating_melee_MeleePenetrating","repeating_melee_MeleePummel","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"], function(v) {
+            let weapon = v.repeating_melee_MeleeWeapon;			
+		console.log(v.repeating_melee_MeleeWeaponSkill);			
             setAttrs({
                 "Used_DefenseWeapon": weapon,
-                "Used_DefenseWeaponSkill": wskill,
-                "Used_DefenseBonus": bonus,
-                "Used_DefenseStrengthBonus": sbonus,
-                "Used_DefenseDamageBonus": dbonus,
-                "Used_DefenseReach": reach,
-                "Used_DefenseQualities": qual,
-                "Used_DefenseDefensive": def,
-                "Used_DefenseImpale": imp,
-				"Used_DefenseOpposedDmg": oppd,
-				"Used_Defense_modtype1": modt1,
-				"Used_Defense_mod1": mod1,
-				"Used_Defense_modtype2": modt2,
-				"Used_Defense_mod2": mod2,
-				"Used_Defense_modtype3": modt3,
-				"Used_Defense_mod3": mod3,
-				"CurrDef": weapon
+                "Used_DefenseWeaponSkill": v.repeating_melee_MeleeWeaponSkill,
+                "Used_DefenseBonus": v.repeating_melee_MeleeBonus,
+                "Used_DefenseStrengthBonus": v.repeating_melee_MeleeStrengthBonus,
+                "Used_DefenseDamageBonus": v.repeating_melee_MeleeDamageBonus,
+                "Used_DefenseReach": v.repeating_melee_MeleeReach,
+                "Used_DefenseQualities": v.repeating_melee_MeleeQualities,
+                "Used_DefenseDefensive": v.repeating_melee_MeleeDefensive,
+                "Used_DefenseImpale": v.repeating_melee_MeleeImpale,
+				"Used_DefenseOpposedDmg": v.repeating_melee_OpposedDmg,
+				"Used_DefenseDamaging": v.repeating_melee_UsedDamaging,
+                "Used_DefenseFast": v.repeating_melee_MeleeFast,
+                "Used_DefenseSlow": v.repeating_melee_MeleeSlow,
+                "Used_DefenseHack": v.repeating_melee_MeleeHack,
+				"Used_DefensePrecise": v.repeating_melee_MeleePrecise,
+				"Used_DefensePractical": v.repeating_melee_MeleePractical,
+				"Used_DefenseImpact": v.repeating_melee_MeleeImpact,
+				"Used_DefensePenetrating": v.repeating_melee_MeleePenetrating,
+				"Used_DefensePummel": v.repeating_melee_MeleePummel,
+				"Used_DefenseTiring": v.repeating_melee_MeleeTiring,
+				"Used_DefenseShield": v.repeating_melee_UsedShield,
+				"Used_Defense_att_modtype1": v.repeating_melee_MeleeWeapon_modtype1,
+				"Used_Defense_att_mod1": v.repeating_melee_MeleeWeapon_mod1,
+				"Used_Defense_att_modtype2": v.repeating_melee_MeleeWeapon_modtype2,
+				"Used_Defense_att_mod2": v.repeating_melee_MeleeWeapon_mod2,
+				"Used_Defense_att_modtype3": v.repeating_melee_MeleeWeapon_modtype3,
+				"Used_Defense_att_mod3": v.repeating_melee_MeleeWeapon_mod3,
+				"Used_Defense_modtype1": v.repeating_melee_DefenseWeapon_modtype1,
+				"Used_Defense_mod1": v.repeating_melee_DefenseWeapon_mod1,
+				"Used_Defense_modtype2": v.repeating_melee_DefenseWeapon_modtype2,
+				"Used_Defense_mod2": v.repeating_melee_DefenseWeapon_mod2,
+				"Used_Defense_modtype3": v.repeating_melee_DefenseWeapon_modtype3,
+				"Used_Defense_mod3": v.repeating_melee_DefenseWeapon_mod3,
 	        }, {silent: true});
+					
+			if (t.Used_MeleeTwoHanded == 1) {			
+output4[`repeating_melee_${id}_UsedWeapon`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 0 : 0;
+setAttrs(output4, {silent: true});
+            setAttrs({
+						"Used_MeleeWeapon": '',
+						"Used_MeleeWeaponSkill": '',
+						"Used_MeleeBonus": '',
+						"Used_MeleeStrengthBonus": '',
+						"Used_MeleeDamageBonus": '',
+						"Used_MeleeReach": '',
+						"Used_MeleeQualities": '',
+						"Used_MeleeOpposedDmg": '0',
+						"Used_MeleeDamaging": '0',
+						"Used_MeleeDefensive": '0',
+						"Used_MeleeImpale": '0',
+						"Used_MeleeFast": '0',
+						"Used_MeleeSlow": '0',
+						"Used_MeleeHack": '0',
+						"Used_MeleePrecise": '0',
+						"Used_MeleePractical": '0',
+						"Used_MeleeImpact": '0',
+						"Used_MeleePenetrating": '0',
+						"Used_MeleePummel": '0',
+						"Used_MeleeTiring": '0',
+						"Used_MeleeTwoHanded": '0',
+						"Used_MeleeShield": '0',
+						"Used_Melee_modtype1": '',
+						"Used_Melee_mod1": '',
+						"Used_Melee_modtype2": '',
+						"Used_Melee_mod2": '',
+						"Used_Melee_modtype3": '',
+						"Used_Melee_mod3": '',
+						"Used_Melee_def_modtype1": '',
+						"Used_Melee_def_mod1": '',
+						"Used_Melee_def_modtype2": '',
+						"Used_Melee_def_mod2": '',
+						"Used_Melee_def_modtype3": '',
+						"Used_Melee_def_mod3": ''
+	        }, {silent: true});
+			}	
 		});
-
+			} else {
 			
-	});
+output6[`repeating_melee_${id}_UsedWeapon`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 1 : 0;
+output7[`repeating_melee_${id}_UsedDefense`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 1 : 0;
+setAttrs(output6, {silent: true});	
+setAttrs(output7, {silent: true});	
+	
+   getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_MeleeImpact","repeating_melee_MeleePenetrating","repeating_melee_MeleePummel","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"],function(v) {
+            let weapon = v.repeating_melee_MeleeWeapon;					
+            setAttrs({
+                "Used_MeleeWeapon": weapon,
+                "Used_MeleeWeaponSkill": v.repeating_melee_MeleeWeaponSkill,
+                "Used_MeleeBonus": v.repeating_melee_MeleeBonus,
+                "Used_MeleeStrengthBonus": v.repeating_melee_MeleeStrengthBonus,
+                "Used_MeleeDamageBonus": v.repeating_melee_MeleeDamageBonus,
+                "Used_MeleeReach": v.repeating_melee_MeleeReach,
+                "Used_MeleeQualities": v.repeating_melee_MeleeQualities,
+                "Used_MeleeDefensive": v.repeating_melee_MeleeDefensive,
+                "Used_MeleeImpale": v.repeating_melee_MeleeImpale,
+				"Used_MeleeOpposedDmg": v.repeating_melee_OpposedDmg,
+				"Used_MeleeDamaging": v.repeating_melee_UsedDamaging,
+                "Used_MeleeFast": v.repeating_melee_MeleeFast,
+                "Used_MeleeSlow": v.repeating_melee_MeleeSlow,
+                "Used_MeleeHack": v.repeating_melee_MeleeHack,
+				"Used_MeleePrecise": v.repeating_melee_MeleePrecise,
+				"Used_MeleePractical": v.repeating_melee_MeleePractical,
+				"Used_MeleeImpact": v.repeating_melee_MeleeImpact,
+				"Used_MeleePenetrating": v.repeating_melee_MeleePenetrating,
+				"Used_MeleePummel": v.repeating_melee_MeleePummel,
+				"Used_MeleeTiring": v.repeating_melee_MeleeTiring,
+				"Used_MeleeTwoHanded": v.repeating_melee_UsedTwoHanded,
+				"Used_MeleeShield": v.repeating_melee_UsedShield,
+				"Used_Melee_modtype1": v.repeating_melee_MeleeWeapon_modtype1,
+				"Used_Melee_mod1": v.repeating_melee_MeleeWeapon_mod1,
+				"Used_Melee_modtype2": v.repeating_melee_MeleeWeapon_modtype2,
+				"Used_Melee_mod2": v.repeating_melee_MeleeWeapon_mod2,
+				"Used_Melee_modtype3": v.repeating_melee_MeleeWeapon_modtype3,
+				"Used_Melee_mod3": v.repeating_melee_MeleeWeapon_mod3,
+				"Used_Melee_def_modtype1": v.repeating_melee_DefenseWeapon_modtype1,
+				"Used_Melee_def_mod1": v.repeating_melee_DefenseWeapon_mod1,
+				"Used_Melee_def_modtype2": v.repeating_melee_DefenseWeapon_modtype2,
+				"Used_Melee_def_mod2": v.repeating_melee_DefenseWeapon_mod2,
+				"Used_Melee_def_modtype3": v.repeating_melee_DefenseWeapon_modtype3,
+				"Used_Melee_def_mod3": v.repeating_melee_DefenseWeapon_mod3,
+                "Used_DefenseWeapon": weapon,
+                "Used_DefenseWeaponSkill": v.repeating_melee_MeleeWeaponSkill,
+                "Used_DefenseBonus": v.repeating_melee_MeleeBonus,
+                "Used_DefenseStrengthBonus": v.repeating_melee_MeleeStrengthBonus,
+                "Used_DefenseDamageBonus": v.repeating_melee_MeleeDamageBonus,
+                "Used_DefenseReach": v.repeating_melee_MeleeReach,
+                "Used_DefenseQualities": v.repeating_melee_MeleeQualities,
+                "Used_DefenseDefensive": v.repeating_melee_MeleeDefensive,
+                "Used_DefenseImpale": v.repeating_melee_MeleeImpale,
+				"Used_DefenseOpposedDmg": v.repeating_melee_OpposedDmg,
+				"Used_DefenseDamaging": v.repeating_melee_UsedDamaging,
+                "Used_DefenseFast": v.repeating_melee_MeleeFast,
+                "Used_DefenseSlow": v.repeating_melee_MeleeSlow,
+                "Used_DefenseHack": v.repeating_melee_MeleeHack,
+				"Used_DefensePrecise": v.repeating_melee_MeleePrecise,
+				"Used_DefensePractical": v.repeating_melee_MeleePractical,
+				"Used_DefenseImpact": v.repeating_melee_MeleeImpact,
+				"Used_DefensePenetrating": v.repeating_melee_MeleePenetrating,
+				"Used_DefensePummel": v.repeating_melee_MeleePummel,
+				"Used_DefenseTiring": v.repeating_melee_MeleeTiring,
+				"Used_DefenseShield": v.repeating_melee_UsedShield,
+				"Used_Defense_att_modtype1": v.repeating_melee_MeleeWeapon_modtype1,
+				"Used_Defense_att_mod1": v.repeating_melee_MeleeWeapon_mod1,
+				"Used_Defense_att_modtype2": v.repeating_melee_MeleeWeapon_modtype2,
+				"Used_Defense_att_mod2": v.repeating_melee_MeleeWeapon_mod2,
+				"Used_Defense_att_modtype3": v.repeating_melee_MeleeWeapon_modtype3,
+				"Used_Defense_att_mod3": v.repeating_melee_MeleeWeapon_mod3,
+				"Used_Defense_modtype1": v.repeating_melee_DefenseWeapon_modtype1,
+				"Used_Defense_mod1": v.repeating_melee_DefenseWeapon_mod1,
+				"Used_Defense_modtype2": v.repeating_melee_DefenseWeapon_modtype2,
+				"Used_Defense_mod2": v.repeating_melee_DefenseWeapon_mod2,
+				"Used_Defense_modtype3": v.repeating_melee_DefenseWeapon_modtype3,
+				"Used_Defense_mod3": v.repeating_melee_DefenseWeapon_mod3,
+	        }, {silent: true});
+				});
+				}
+				}
+		
+			});		
+		});  
+	});    
+			
+});						
+						
+						
 
-
-
-on('change:repeating_melee:MeleeWeapon_settings_hide change:repeating_melee:MeleeWeapon change:repeating_melee:MeleeWeaponSkill change:repeating_melee:MeleeBonus change:repeating_melee:MeleeStrengthBonus change:repeating_melee:MeleeDamageBonus change:repeating_melee:MeleeReach change:repeating_melee:MeleeQualities  change:repeating_melee:MeleeDefensive change:repeating_melee:MeleeImpale change:repeating_melee:MeleeWeapon_modtype1 change:repeating_melee:MeleeWeapon_mod1 change:repeating_melee:MeleeWeapon_modtype2 change:repeating_melee:MeleeWeapon_mod2 change:repeating_melee:MeleeWeapon_modtype3 change:repeating_melee:MeleeWeapon_mod3', function(event){
-	if (event.sourceType === 'sheetworker') return;
+on('change:repeating_melee:MeleeWeapon_settings_hide change:repeating_melee:MeleeWeapon change:repeating_melee:MeleeWeaponSkill change:repeating_melee:MeleeBonus change:repeating_melee:MeleeStrengthBonus change:repeating_melee:MeleeDamageBonus change:repeating_melee:MeleeReach change:repeating_melee:MeleeQualities  change:repeating_melee:MeleeDefensive change:repeating_melee:MeleeImpale change:repeating_melee:OpposedDmg change:repeating_melee:UsedDamaging change:repeating_melee:MeleeFast change:repeating_melee:MeleeSlow change:repeating_melee:MeleeHack change:repeating_melee:MeleePrecise change:repeating_melee:MeleePractical change:repeating_melee:MeleeImpact change:repeating_melee:MeleePenetrating change:repeating_melee:MeleePummel change:repeating_melee:MeleeTiring change:repeating_melee:UsedTwoHanded change:repeating_melee:UsedShield change:repeating_melee:MeleeWeapon_modtype1 change:repeating_melee:MeleeWeapon_mod1 change:repeating_melee:MeleeWeapon_modtype2 change:repeating_melee:MeleeWeapon_mod2 change:repeating_melee:MeleeWeapon_modtype3 change:repeating_melee:MeleeWeapon_mod3 change:repeating_melee:DefenseWeapon_modtype1 change:repeating_melee:DefenseWeapon_mod1 change:repeating_melee:DefenseWeapon_modtype2 change:repeating_melee:DefenseWeapon_mod2 change:repeating_melee:DefenseWeapon_modtype3 change:repeating_melee:DefenseWeapon_mod3', function(event){
 	const playerclickedid = event.sourceAttribute.split('_')[2] || '';
 	getSectionIDs("repeating_melee", function (ids) {
 		ids.forEach(id => {
 			if(playerclickedid.toLowerCase() == id.toLowerCase()) {
-				getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_UsedWeapon","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3"], function(v) {
+				getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_UsedWeapon","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_MeleeImpact","repeating_melee_MeleePenetrating","repeating_melee_MeleePummel","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"], function(v) {
 					if(v.repeating_melee_UsedWeapon == 1)
 					{
 						setAttrs(
@@ -26695,12 +32066,31 @@ on('change:repeating_melee:MeleeWeapon_settings_hide change:repeating_melee:Mele
 							"Used_MeleeQualities":  v.repeating_melee_MeleeQualities,
 							"Used_MeleeDefensive":  v.repeating_melee_MeleeDefensive,
 							"Used_MeleeImpale":  v.repeating_melee_MeleeImpale,
+							"Used_MeleeOpposedDmg": v.repeating_melee_OpposedDmg,
+							"Used_MeleeDamaging": v.repeating_melee_UsedDamaging,
+							"Used_MeleeFast": v.repeating_melee_MeleeFast,
+							"Used_MeleeSlow": v.repeating_melee_MeleeSlow,
+							"Used_MeleeHack": v.repeating_melee_MeleeHack,
+							"Used_MeleePrecise": v.repeating_melee_MeleePrecise,
+							"Used_MeleePractical": v.repeating_melee_MeleePractical,
+							"Used_MeleeImpact": v.repeating_melee_MeleeImpact,
+							"Used_MeleePenetrating": v.repeating_melee_MeleePenetrating,
+							"Used_MeleePummel": v.repeating_melee_MeleePummel,
+							"Used_MeleeTiring": v.repeating_melee_MeleeTiring,
+							"Used_MeleeTwoHanded": v.repeating_melee_UsedTwoHanded,	
+							"Used_MeleeShield": v.repeating_melee_UsedShield,
 							"Used_Melee_modtype1": v.repeating_melee_MeleeWeapon_modtype1,
 							"Used_Melee_mod1": v.repeating_melee_MeleeWeapon_mod1,
 							"Used_Melee_modtype2": v.repeating_melee_MeleeWeapon_modtype2,
 							"Used_Melee_mod2": v.repeating_melee_MeleeWeapon_mod2,
 							"Used_Melee_modtype3": v.repeating_melee_MeleeWeapon_modtype3,
 							"Used_Melee_mod3": v.repeating_melee_MeleeWeapon_mod3,
+							"Used_Melee_def_modtype1": v.repeating_melee_DefenseWeapon_modtype1,
+							"Used_Melee_def_mod1": v.repeating_melee_DefenseWeapon_mod1,
+							"Used_Melee_def_modtype2": v.repeating_melee_DefenseWeapon_modtype2,
+							"Used_Melee_def_mod2": v.repeating_melee_DefenseWeapon_mod2,
+							"Used_Melee_def_modtype3": v.repeating_melee_DefenseWeapon_modtype3,
+							"Used_Melee_def_mod3": v.repeating_melee_DefenseWeapon_mod3,
 							"CurrAtk": v.repeating_melee_MeleeWeapon
 						}, {silent: true});
 					}			
@@ -26711,13 +32101,12 @@ on('change:repeating_melee:MeleeWeapon_settings_hide change:repeating_melee:Mele
 });	
 
 
-on('change:repeating_melee:MeleeWeapon_settings_hide change:repeating_melee:MeleeWeapon change:repeating_melee:MeleeWeaponSkill change:repeating_melee:MeleeBonus change:repeating_melee:MeleeStrengthBonus change:repeating_melee:MeleeDamageBonus change:repeating_melee:MeleeReach change:repeating_melee:MeleeQualities change:repeating_melee:MeleeDefensive change:repeating_melee:MeleeImpale change:repeating_melee:OpposedDmg change:repeating_melee:DefenseWeapon_modtype1 change:repeating_melee:DefenseWeapon_mod1 change:repeating_melee:DefenseWeapon_modtype2 change:repeating_melee:DefenseWeapon_mod2 change:repeating_melee:DefenseWeapon_modtype3 change:repeating_melee:DefenseWeapon_mod3', function(event){
-	if (event.sourceType === 'sheetworker') return;
+on('change:repeating_melee:MeleeWeapon_settings_hide change:repeating_melee:MeleeWeapon change:repeating_melee:MeleeWeaponSkill change:repeating_melee:MeleeBonus change:repeating_melee:MeleeStrengthBonus change:repeating_melee:MeleeDamageBonus change:repeating_melee:MeleeReach change:repeating_melee:MeleeQualities change:repeating_melee:MeleeDefensive change:repeating_melee:MeleeImpale change:repeating_melee:OpposedDmg change:repeating_melee:UsedDamaging change:repeating_melee:MeleeFast change:repeating_melee:MeleeSlow change:repeating_melee:MeleeHack change:repeating_melee:MeleePrecise change:repeating_melee:MeleePractical change:repeating_melee:MeleeImpact change:repeating_melee:MeleePenetrating change:repeating_melee:MeleePummel change:repeating_melee:MeleeTiring change:repeating_melee:UsedTwoHanded change:repeating_melee:UsedShield change:repeating_melee:MeleeWeapon_modtype1 change:repeating_melee:MeleeWeapon_mod1 change:repeating_melee:MeleeWeapon_modtype2 change:repeating_melee:MeleeWeapon_mod2 change:repeating_melee:MeleeWeapon_modtype3 change:repeating_melee:MeleeWeapon_mod3 change:repeating_melee:DefenseWeapon_modtype1 change:repeating_melee:DefenseWeapon_mod1 change:repeating_melee:DefenseWeapon_modtype2 change:repeating_melee:DefenseWeapon_mod2 change:repeating_melee:DefenseWeapon_modtype3 change:repeating_melee:DefenseWeapon_mod3', function(event){
 	const playerclickedid = event.sourceAttribute.split('_')[2] || '';
 	getSectionIDs("repeating_melee", function (ids) {
 		ids.forEach(id => {
 			if(playerclickedid.toLowerCase() == id.toLowerCase()) {
-				getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_UsedDefense","repeating_melee_OpposedDmg","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"], function(v) {
+				getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_UsedDefense","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_MeleeImpact","repeating_melee_MeleePenetrating","repeating_melee_MeleePummel","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"], function(v) {
 					if(v.repeating_melee_UsedDefense == 1)
 					{
 						setAttrs(
@@ -26732,6 +32121,23 @@ on('change:repeating_melee:MeleeWeapon_settings_hide change:repeating_melee:Mele
 							"Used_DefenseDefensive":  v.repeating_melee_MeleeDefensive,
 							"Used_DefenseImpale":  v.repeating_melee_MeleeImpale,
 							"Used_DefenseOpposedDmg": v.repeating_melee_OpposedDmg,
+							"Used_DefenseDamaging": v.repeating_melee_UsedDamaging,
+							"Used_DefenseFast": v.repeating_melee_MeleeFast,
+							"Used_DefenseSlow": v.repeating_melee_MeleeSlow,
+							"Used_DefenseHack": v.repeating_melee_MeleeHack,
+							"Used_DefensePrecise": v.repeating_melee_MeleePrecise,
+							"Used_DefensePractical": v.repeating_melee_MeleePractical,
+							"Used_DefenseImpact": v.repeating_melee_MeleeImpact,
+							"Used_DefensePenetrating": v.repeating_melee_MeleePenetrating,
+							"Used_DefensePummel": v.repeating_melee_MeleePummel,
+							"Used_DefenseTiring": v.repeating_melee_MeleeTiring,
+							"Used_DefenseShield": v.repeating_melee_UsedShield,
+							"Used_Defense_att_modtype1": v.repeating_melee_MeleeWeapon_modtype1,
+							"Used_Defense_att_mod1": v.repeating_melee_MeleeWeapon_mod1,
+							"Used_Defense_att_modtype2": v.repeating_melee_MeleeWeapon_modtype2,
+							"Used_Defense_att_mod2": v.repeating_melee_MeleeWeapon_mod2,
+							"Used_Defense_att_modtype3": v.repeating_melee_MeleeWeapon_modtype3,
+							"Used_Defense_att_mod3": v.repeating_melee_MeleeWeapon_mod3,
 							"Used_Defense_modtype1": v.repeating_melee_DefenseWeapon_modtype1,
 							"Used_Defense_mod1": v.repeating_melee_DefenseWeapon_mod1,
 							"Used_Defense_modtype2": v.repeating_melee_DefenseWeapon_modtype2,
@@ -26749,76 +32155,114 @@ on('change:repeating_melee:MeleeWeapon_settings_hide change:repeating_melee:Mele
 
 
 
+
+
+
+
 on("change:repeating_ranged:UsedRanged", function (event) {
                 // makes sure the sheet worker doesnt trigger itself
                 if (event.sourceType === 'sheetworker') return;
                 // get the row id that the player clicked. the id is always between the second and third '_'
                 const playerclickedid = event.sourceAttribute.split('_')[2] || '';
 
+		getAttrs(["repeating_ranged_UsedRanged","Devmode"],function(t) {  
                 getSectionIDs("repeating_ranged", function (ids) {
                     // create an object to hold all the attributes we are bout to change
                     const output = {};
+                    const output2 = {};
+					
+					
                     // loop through the row ids
                     ids.forEach(id => {
+					
+					if (t.repeating_ranged_UsedRanged == 0) {output2[`repeating_ranged_${id}_UsedRanged`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 0 : 0;
+                    setAttrs(output2, {silent: true});
+					setAttrs({
+						"Used_RangedWeaponName": '',
+						"Used_RangedWeaponSkill": '',
+						"Used_RangedBonus": '',
+						"Used_RangedStrengthBonus": '',
+						"Used_RangedDamageBonus": '',
+						"Used_WeaponRange": '',
+						"Used_RangedQualities": '',
+						"Used_RangedDamaging": '0',
+						"Used_RangedImpale": '0',
+						"Used_RangedAccurate": '0',
+						"Used_RangedPrecise": '0',
+						"Used_RangedPractical": '0',
+						"Used_RangedPenetrating": '0',
+						"Used_RangedBlackpowder": '0',
+						"Used_RangedDamaging": '0',
+						"Used_RangedReload": '0',
+						"Used_RangedReloadRating": '0',
+						"Used_Ranged_modtype1": '',
+						"Used_Ranged_mod1": '',
+						"Used_Ranged_modtype2": '',
+						"Used_Ranged_mod2": '',
+						"Used_Ranged_modtype3": '',
+						"Used_Ranged_mod3": '',
+					}, {silent: true});} else	{
+					
+					
+					
                         // check if the id is the one the player clicked; if not, set to 0, if it is, set to 1.
                         output[`repeating_ranged_${id}_UsedRanged`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 1 : 0;
-                    });
-					
+
                     // now all attributes have been updated, save them
                     setAttrs(output, {silent: true});
                     // we use silent:true, so this change doesnt trigger the sheet worker again.
-                });
 
-   getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
-            let weapon = v.repeating_ranged_RangedWeaponName;
-            let bskill = v.repeating_ranged_RangedBalisticSkill;
-            let bonus = v.repeating_ranged_RangedBonus;
-            let sbonus = v.repeating_ranged_RangedStrengthBonus;
-            let dbonus = v.repeating_ranged_RangedDamageBonus;
-            let wrange = v.repeating_ranged_WeaponRange;
-            let ammo = v.repeating_ranged_RangedAmmo;
-            let ammot = v.repeating_ranged_RangedAmmoType;
-            let dmg = v.repeating_ranged_RangedDamage;
-            let qual = v.repeating_ranged_RangedQualities;
-            let imp = v.repeating_ranged_RangedImpale;
-            let modt1 = v.repeating_ranged_RangedWeapon_modtype1;
-            let mod1 = v.repeating_ranged_RangedWeapon_mod1;
-            let modt2 = v.repeating_ranged_RangedWeapon_modtype2;
-            let mod2 = v.repeating_ranged_RangedWeapon_mod2;
-            let modt3 = v.repeating_ranged_RangedWeapon_modtype3;
-            let mod3 = v.repeating_ranged_RangedWeapon_mod3;
+   getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedAccurate","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_RangedReloadRatingInput","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
+   
+   
+  console.log("Ranged change");
+  console.log(v.repeating_ranged_RangedReloadRating);
+  console.log(v.repeating_ranged_RangedReloadRatingInput);
+  console.log(v.repeating_ranged_RangedReload);
+   
+   
             setAttrs({
-                "Used_RangedWeaponName": weapon,
-                "Used_RangedBalisticSkill": bskill,
-                "Used_RangedBonus": bonus,
-                "Used_RangedStrengthBonus": sbonus,
-                "Used_RangedDamageBonus": dbonus,
-                "Used_WeaponRange": wrange,
-                "Used_RangedAmmo": ammo,
-				"Used_RangedAmmoType":  ammot,
-                "Used_RangedDamage": dmg,
-                "Used_RangedQualities": qual,
-                "Used_RangedImpale": imp,
-				"Used_Ranged_modtype1": modt1,
-				"Used_Ranged_mod1": mod1,
-				"Used_Ranged_modtype2": modt2,
-				"Used_Ranged_mod2": mod2,
-				"Used_Ranged_modtype3": modt3,
-				"Used_Ranged_mod3": mod3,
-                "CurrRgd": weapon				
+                "Used_RangedWeaponName": v.repeating_ranged_RangedWeaponName,
+                "Used_RangedBalisticSkill": v.repeating_ranged_RangedBalisticSkill,
+                "Used_RangedBonus": v.repeating_ranged_RangedBonus,
+                "Used_RangedStrengthBonus": v.repeating_ranged_RangedStrengthBonus,
+                "Used_RangedDamageBonus": v.repeating_ranged_RangedDamageBonus,
+                "Used_WeaponRange": v.repeating_ranged_WeaponRange,
+                "Used_RangedAmmo": v.repeating_ranged_RangedAmmo,
+				"Used_RangedAmmoType":  v.repeating_ranged_RangedAmmoType,
+                "Used_RangedDamage": v.repeating_ranged_RangedDamage,
+                "Used_RangedQualities": v.repeating_ranged_RangedQualities,
+                "Used_RangedImpale": v.repeating_ranged_RangedImpale,
+				"Used_RangedAccurate": v.repeating_ranged_RangedAccurate,
+				"Used_RangedPrecise": v.repeating_ranged_RangedPrecise,
+				"Used_RangedPractical": v.repeating_ranged_RangedPractical,
+				"Used_RangedPenetrating": v.repeating_ranged_RangedPenetrating,
+				"Used_RangedBlackpowder": v.repeating_ranged_UsedBlackpowder,
+				"Used_RangedDamaging": v.repeating_ranged_UsedDamaging,
+				"Used_RangedReload": v.repeating_ranged_RangedReload,
+				"Used_RangedReloadRatingInput": v.repeating_ranged_RangedReloadRatingInput,
+				"Used_Ranged_modtype1": v.repeating_ranged_RangedWeapon_modtype1,
+				"Used_Ranged_mod1": v.repeating_ranged_RangedWeapon_mod1,
+				"Used_Ranged_modtype2": v.repeating_ranged_RangedWeapon_modtype2,
+				"Used_Ranged_mod2": v.repeating_ranged_RangedWeapon_mod2,
+				"Used_Ranged_modtype3": v.repeating_ranged_RangedWeapon_modtype3,
+				"Used_Ranged_mod3": v.repeating_ranged_RangedWeapon_mod3,		
 	        }, {silent: true});
 		});
-			
-	});			
+		}
+      });	
+	});		
+	});				
+});		
 			
 		
-on('change:repeating_ranged:RangedWeapon_settings_hide change:repeating_ranged:RangedWeaponName change:repeating_ranged:RangedBalisticSkill change:repeating_ranged:RangedBonus change:repeating_ranged:RangedStrengthBonus change:repeating_ranged:RangedDamageBonus change:repeating_ranged:WeaponRange change:repeating_ranged:RangedAmmo change:repeating_ranged:RangedAmmoType change:repeating_ranged:RangedDamage change:repeating_ranged:RangedQualities change:repeating_ranged:RangedImpale change:repeating_ranged:RangedWeapon_modtype1 change:repeating_ranged:RangedWeapon_mod1 change:repeating_ranged:RangedWeapon_modtype2 change:repeating_ranged:RangedWeapon_mod2 change:repeating_ranged:RangedWeapon_modtype3 change:repeating_ranged:RangedWeapon_mod3', function(event){
+on('change:repeating_ranged:RangedWeapon_settings_hide change:repeating_ranged:RangedWeaponName change:repeating_ranged:RangedBalisticSkill change:repeating_ranged:RangedBonus change:repeating_ranged:RangedStrengthBonus change:repeating_ranged:RangedDamageBonus change:repeating_ranged:WeaponRange change:repeating_ranged:RangedAmmo change:repeating_ranged:RangedAmmoType change:repeating_ranged:RangedDamage change:repeating_ranged:RangedQualities change:repeating_ranged:RangedImpale change:repeating_ranged:RangedAccurate change:repeating_ranged:RangedPrecise change:repeating_ranged:RangedPractical change:repeating_ranged:RangedPenetrating change:repeating_ranged:RangedBlackpowder change:repeating_ranged:UsedDamaging change:repeating_ranged:RangedReload change:repeating_ranged:RangedReload change:repeating_ranged:RangedReloadRatingInput change:repeating_ranged:RangedWeapon_modtype1 change:repeating_ranged:RangedWeapon_mod1 change:repeating_ranged:RangedWeapon_modtype2 change:repeating_ranged:RangedWeapon_mod2 change:repeating_ranged:RangedWeapon_modtype3 change:repeating_ranged:RangedWeapon_mod3', function(event){
 	if (event.sourceType === 'sheetworker') return;
 	const playerclickedid = event.sourceAttribute.split('_')[2] || '';
 	getSectionIDs("repeating_ranged", function (ids) {
 		ids.forEach(id => {
 			if(playerclickedid.toLowerCase() == id.toLowerCase()) {
-				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale", "repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
+				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
 					if(v.repeating_ranged_UsedRanged == 1)
 					{
 						setAttrs(
@@ -26834,6 +32278,14 @@ on('change:repeating_ranged:RangedWeapon_settings_hide change:repeating_ranged:R
 							"Used_RangedDamage":  v.repeating_ranged_RangedDamage,
 							"Used_RangedQualities":  v.repeating_ranged_RangedQualities,
 							"Used_RangedImpale":  v.repeating_ranged_RangedImpale,
+							"Used_RangedAccurate": v.repeating_ranged_RangedAccurate,
+							"Used_RangedPrecise": v.repeating_ranged_RangedPrecise,
+							"Used_RangedPractical": v.repeating_ranged_RangedPractical,
+							"Used_RangedPenetrating": v.repeating_ranged_RangedPenetrating,
+							"Used_RangedBlackpowder": v.repeating_ranged_UsedBlackpowder,
+							"Used_RangedDamaging": v.repeating_ranged_UsedDamaging,
+							"Used_RangedReload": v.repeating_ranged_RangedReload,
+							"Used_RangedReloadRatingInput": v.repeating_ranged_RangedReloadRatingInput,
 							"Used_Ranged_modtype1": v.repeating_ranged_RangedWeapon_modtype1,
 							"Used_Ranged_mod1": v.repeating_ranged_RangedWeapon_mod1,
 							"Used_Ranged_modtype2": v.repeating_ranged_RangedWeapon_modtype2,
@@ -26850,6 +32302,48 @@ on('change:repeating_ranged:RangedWeapon_settings_hide change:repeating_ranged:R
 });	
 
 
+on('sheet:opened', function(event){
+	if (event.sourceType === 'sheetworker') return;
+	getSectionIDs("repeating_ranged", function (ids) {
+		ids.forEach(id => {
+				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
+					if(v.repeating_ranged_UsedRanged == 1)
+					{
+						setAttrs(
+						{
+							"Used_RangedWeaponName": v.repeating_ranged_RangedWeaponName,
+							"Used_RangedBalisticSkill" : v.repeating_ranged_RangedBalisticSkill,
+							"Used_RangedBonus": v.repeating_ranged_RangedBonus,
+							"Used_RangedStrengthBonus":  v.repeating_ranged_RangedStrengthBonus,
+							"Used_RangedDamageBonus":  v.repeating_ranged_RangedDamageBonus,
+							"Used_WeaponRange":  v.repeating_ranged_WeaponRange,
+							"Used_RangedAmmo":  v.repeating_ranged_RangedAmmo,
+							"Used_RangedAmmoType":  v.repeating_ranged_RangedAmmoType,
+							"Used_RangedDamage":  v.repeating_ranged_RangedDamage,
+							"Used_RangedQualities":  v.repeating_ranged_RangedQualities,
+							"Used_RangedImpale":  v.repeating_ranged_RangedImpale,
+							"Used_RangedAccurate": v.repeating_ranged_RangedAccurate,
+							"Used_RangedPrecise": v.repeating_ranged_RangedPrecise,
+							"Used_RangedPractical": v.repeating_ranged_RangedPractical,
+							"Used_RangedPenetrating": v.repeating_ranged_RangedPenetrating,
+							"Used_RangedBlackpowder": v.repeating_ranged_UsedBlackpowder,
+							"Used_RangedDamaging": v.repeating_ranged_UsedDamaging,
+							"Used_RangedReload": v.repeating_ranged_RangedReload,
+							"Used_RangedReloadRatingInput": v.repeating_ranged_RangedReloadRatingInput,
+							"Used_Ranged_modtype1": v.repeating_ranged_RangedWeapon_modtype1,
+							"Used_Ranged_mod1": v.repeating_ranged_RangedWeapon_mod1,
+							"Used_Ranged_modtype2": v.repeating_ranged_RangedWeapon_modtype2,
+							"Used_Ranged_mod2": v.repeating_ranged_RangedWeapon_mod2,
+							"Used_Ranged_modtype3": v.repeating_ranged_RangedWeapon_modtype3,
+							"Used_Ranged_mod3": v.repeating_ranged_RangedWeapon_mod3,
+							"CurrRgd": v.repeating_ranged_RangedWeaponName
+						}, {silent: true});
+					}
+				});		
+		});	
+	});	
+});	
+
 
 on('sheet:opened change:armorplatelegspenalty change:armorplatepenalty', function(event) {
 				getAttrs(["Armorplatelegspenalty"], function(v) {
@@ -28239,7 +33733,11 @@ on('change:repeating_divinemiracles', function(event) {
 on('sheet:opened', function() {
 			getAttrs(["sheetcheck"], function(c) {
             console.log(c.sheetcheck);
-			if (c.sheetcheck == 2) return;
+			if (c.sheetcheck == 3) return;
+			
+		setAttrs({
+            "Devmode": 0
+	    }, {silent: true});				
 
         getSectionIDs('repeating_artspecializationr', function (idArray)  {
             let attrs = [
@@ -28486,7 +33984,7 @@ on('sheet:opened', function() {
 					});
 				});
                console.log('Gathering and assigning Repeating section IDs.');	
-				setAttrs({"sheetcheck": 1}, {silent: true});	
+				setAttrs({"sheetcheck": 3}, {silent: true});	
 				});	
 				
             });
@@ -28494,7 +33992,6 @@ on('sheet:opened', function() {
 
 on('sheet:opened change:advantage', function(event) {
         // makes sure the sheet worker doesnt trigger itself
-               console.log(1);	
         if (event.sourceType === 'sheetworker') return;
 			getAttrs(["Advantage"], function(v) {
 					const adv = v.Advantage;
@@ -28530,7 +34027,6 @@ on('sheet:opened change:advantage', function(event) {
 		
 on('sheet:opened change:initiative_houserule', function(event) {
         // makes sure the sheet worker doesnt trigger itself
-               console.log(1);	
         if (event.sourceType === 'sheetworker') return;
 			getAttrs(["initiative_houserule"], function(v) {
 					const out = v.initiative_houserule;
@@ -28561,4 +34057,1339 @@ on('sheet:opened change:initiative_houserule', function(event) {
 
 
 
+on('clicked:meleeattackmain', (eventInfo) => {
+	getAttrs(["initiative_houserule"], function(v) {	
+	
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_MeleePrecise}+@{Used_MeleePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkMain}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Opposed Attack Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{ATTACK}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Opposed Attack Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttackMain)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{fast=[[@{Used_MeleeFast}]]}} {{slow=[[@{Used_MeleeSlow}]]}} {{hack=[[@{Used_MeleeHack}]]}} {{precise=[[@{Used_MeleePrecise}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[@{Used_MeleeTiring}]]}} {{penetrating=[[@{Used_MeleePenetrating}]]}} {{pummel=[[@{Used_MeleePummel}]]}} {{practical=[[@{Used_MeleePractical}]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll;
+
+				
+        startRoll(rollBegins + rollPart, (results) => {
+			const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const practical = results.results.practical.result
+            const precise = results.results.precise.result
+            const slbonus = results.results.slbonus.result
+            const SLmod = results.results.SLmod.result
+            const slbonusatk = results.results.slbonusatk.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;		
+               console.log(slbonusatk);	
+			
+			if ( test <= target ) { var computed3 = computed + precise + SLmod ;} else  { var computed3 = computed + practical + SLmod ;}
+			if ( test <= target ) { var computed4 = slbonusatk - practical ;} else  { var computed4 = practical ;}
+			if ( test <= target ) { var computed5 = slbonusatk - practical + SLmod ;} else  { var computed5 = practical + SLmod ;}
+						
+            finishRoll(
+                results.rollId,
+                {
+                    sl: computed,
+                    test: computed2,
+                    slbonus: computed3,
+                    slbonusatk: computed4,
+                    sladd: computed5,
+                }
+            );
+        });
+		
+    });
+		
+    });
+
+
+on('clicked:meleechargemain', (eventInfo) => {
+	getAttrs(["Advantageinput"], function(v) {			
+               console.log("test");	
+	var adv = parseInt(v.Advantageinput);
+	var Advadd = adv + 1;		
+               console.log(adv);	
+	
+		setAttrs({
+            "Advantageinput": Advadd
+	    }, {silent: true});	
+	
+	
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_MeleePrecise}+@{Used_MeleePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkMain}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Charge Attack Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{CHARGE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Charge Attack Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}meleechargemain)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{fast=[[@{Used_MeleeFast}]]}} {{slow=[[@{Used_MeleeSlow}]]}} {{hack=[[@{Used_MeleeHack}]]}} {{precise=[[@{Used_MeleePrecise}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[@{Used_MeleeTiring}]]}} {{penetrating=[[@{Used_MeleePenetrating}]]}} {{pummel=[[@{Used_MeleePummel}]]}} {{practical=[[@{Used_MeleePractical}]]}} {{charge=true}} ';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll;
+
+				
+        startRoll(rollBegins + rollPart, (results) => {
+			const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const practical = results.results.practical.result
+            const precise = results.results.precise.result
+            const slbonus = results.results.slbonus.result
+            const SLmod = results.results.SLmod.result
+            const slbonusatk = results.results.slbonusatk.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;		
+               console.log(slbonusatk);	
+			
+			if ( test <= target ) { var computed3 = computed + precise + SLmod ;} else  { var computed3 = computed + practical + SLmod ;}
+			if ( test <= target ) { var computed4 = slbonusatk - practical ;} else  { var computed4 = practical ;}
+			if ( test <= target ) { var computed5 = slbonusatk - practical + SLmod ;} else  { var computed5 = practical + SLmod ;}
+						
+            finishRoll(
+                results.rollId,
+                {
+                    sl: computed,
+                    test: computed2,
+                    slbonus: computed3,
+                    slbonusatk: computed4,
+                    sladd: computed5,
+                }
+            );
+        });
+		
+    });
+		
+    });
+	
+	
+
+
+on('clicked:meleeopposedmain', (eventInfo) => {
+	getAttrs(["initiative_houserule"], function(v) {	
+	
+   let roll = '{{test=[[@{roll_rule}]]}} {{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{DefensiveTotal}+@{Used_MeleePractical}+@{Talent_RiposteLvl}+@{Talent_ReversalLvl}+(@{Used_MeleeShield}*@{Talent_ShieldsmanLvl}) [SL TOTAL]]]}} {{sladd=[[0]]}} {{slbonusdef=[[@{slbonusDefMain}]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Opposed Defense Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{modvalue=[[?{Opposed Defense Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{attacktype=^{PARRY}}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{showdmg=[[@{Used_MeleeOpposedDmg}]]}} {{hitlocation=true}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{armorqualities=@{armorQuality}}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Melee_def_modtype1}]]}} {{mod1=@{Used_Melee_def_mod1}}} {{mod2type=[[@{Used_Melee_def_modtype2}]]}} {{mod2=@{Used_Melee_def_mod2}}} {{mod3type=[[@{Used_Melee_def_modtype3}]]}} {{mod3=@{Used_Melee_def_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeOpposedMain)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{RTriposte=@{RT-ripostedmgmain}}} {{hack=[[@{Used_MeleeHack}]]}} {{practical=[[@{Used_MeleePractical}]]}} {{shieldsman=[[@{Used_MeleeShield}*@{Talent_ShieldsmanLvl}]]}} {{defensive=[[@{DefensiveTotal}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[@{Used_MeleeTiring}]]}} {{penetrating=[[@{Used_MeleePenetrating}]]}} {{pummel=[[@{Used_MeleePummel}]]}} {{riposte=[[@{Talent_RiposteLvl}]]}} {{reversal=[[@{Talent_ReversalLvl}]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll;
+
+				
+        startRoll(rollBegins + rollPart, (results) => {
+            const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const slbonus = results.results.slbonus.result
+            const practical = results.results.practical.result
+            const defensive = results.results.defensive.result
+            const riposte = results.results.riposte.result
+            const reversal = results.results.reversal.result
+            const shieldsman = results.results.shieldsman.result
+            const SLmod = results.results.SLmod.result
+            const slbonusdef = results.results.slbonusdef.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;	
+
+			if ( test <= target ) { var computed3 = computed + reversal + riposte + defensive + shieldsman + SLmod ;} else  { var computed3 = computed + practical + defensive + shieldsman + SLmod ;}
+			if ( test <= target ) { var computed4 = slbonusdef - practical ;} else  { var computed4 = defensive + practical + shieldsman ;}
+			if ( test <= target ) { var computed5 = slbonusdef - practical + SLmod ;} else  { var computed5 = defensive + practical + shieldsman + SLmod ;}	
+
+		setAttrs({
+            "LastRollMain": test,		
+            "LastUnitDieMain": computed2
+	    }, {silent: true});				
+			
+               console.log(" ## MH def test ## ");	
+               console.log(computed3);	
+               console.log(computed4);	
+               console.log(SLmod);	
+               console.log(computed5);	
+            finishRoll(
+                results.rollId,
+                {
+                    sl: computed,
+                    test: computed2,
+                    slbonus: computed3,
+                    slbonusdef: computed4,
+                    sladd: computed5,
+                }
+            );
+        });
+		
+    });
+});
+
+
+on('clicked:ripostedmgmain', (eventInfo) => {
+	getAttrs(["LastUnitDieMain","LastRollMain"], function(v) {	
+	
+   let roll = '{{ripostedmg}} {{lastunitdie=@{LastUnitDieMain}}} {{test=[[@{LastRollMain}]]}} {{title=^{RIPOSTE}}} {{character_name=@{character_name}}}{{unconscious=[[@{UnconsciousMod}]]}} {{attacktype=^{DAMAGE}}} {{attacktest=true}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{showdmg=[[1]]}} {{hitlocation=true}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{mod1type=[[@{Used_Melee_def_modtype1}]]}} {{mod1=@{Used_Melee_def_mod1}}} {{mod2type=[[@{Used_Melee_def_modtype2}]]}} {{mod2=@{Used_Melee_def_mod2}}} {{mod3type=[[@{Used_Melee_def_modtype3}]]}} {{mod3=@{Used_Melee_def_mod3}}} {{NPC=[[0]]}} {{hack=[[@{Used_MeleeHack}]]}} {{defensive=[[@{DefensiveTotal}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{penetrating=[[@{Used_MeleePenetrating}]]}} {{pummel=[[@{Used_MeleePummel}]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll;
+   let computed = v.LastUnitDieMain;
+				
+        startRoll(rollBegins + rollPart, (results) => {
+            const test = results.results.test.result
+			
+            finishRoll(
+                results.rollId,
+                {
+                    test: computed,
+                }
+            );
+        });
+		
+    });
+});
+
+
+
+
+
+
+on('clicked:meleeattackoff', (eventInfo) => {
+
+	if (eventInfo.sourceType === 'sheetworker') return;
+			getAttrs(["Talent_AmbidextrousLvl","Used_MeleeTwohanded"], function(values) {	
+
+			if (values.Talent_AmbidextrousLvl == 0) {ambipen = -20;}
+			if (values.Talent_AmbidextrousLvl == 1) {ambipen = -10;}
+			if (values.Talent_AmbidextrousLvl == 2) {ambipen = 0;}
+			if (values.Used_MeleeTwohanded == 1) {ambipen = 0;}
+
+   let roll = '{{test=[[@{roll_rule}]]}} {{sl=[[0]]}} {{slbonus=[[@{Used_DefensePrecise}+@{Used_DefensePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkOff}]]}} {{sladd=[[0]]}} {{modvalue=[[?{Opposed Attack Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{ATTACK}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[>ambi<]] [PEN] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Opposed Attack Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{offpen=[[>ambi<]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{reach=@{Used_DefenseReach}}} {{damaging=[[@{Used_DefenseDamaging}]]}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttackOff)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{fast=[[@{Used_DefenseFast}]]}} {{slow=[[@{Used_DefenseSlow}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{tiring=[[@{Used_DefenseTiring}]]}} {{penetrating=[[@{Used_DefensePenetrating}]]}} {{pummel=[[@{Used_DefensePummel}]]}} {{hack=[[@{Used_DefenseHack}]]}} {{precise=[[@{Used_DefensePrecise}]]}} {{impact=[[@{Used_DefenseImpact}]]}} {{practical=[[@{Used_DefensePractical}]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e} ';
+   let rollEnds = ' {{mod1type=[[@{Used_Defense_att_modtype1}]]}} {{mod1=@{Used_Defense_att_mod1}}} {{mod2type=[[@{Used_Defense_att_modtype2}]]}} {{mod2=@{Used_Defense_att_mod2}}} {{mod3type=[[@{Used_Defense_att_modtype3}]]}} {{mod3=@{Used_Defense_att_mod3}}}';
+   let rollPart = roll.replaceAll('>ambi<', ambipen);
+				
+        startRoll(rollBegins + rollPart + rollEnds, (results) => {
+            const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const practical = results.results.practical.result
+            const precise = results.results.precise.result
+            const slbonus = results.results.slbonus.result
+            const SLmod = results.results.SLmod.result
+            const slbonusatk = results.results.slbonusatk.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;		
+               console.log("Atk Offhand");	
+               console.log(target);	
+               console.log(computed2);	
+			
+			if ( test <= target ) { var computed3 = computed + precise + SLmod ;} else  { var computed3 = computed + practical + SLmod ;}
+			if ( test <= target ) { var computed4 = slbonusatk - practical ;} else  { var computed4 = practical ;}
+			if ( test <= target ) { var computed5 = slbonusatk - practical + SLmod ;} else  { var computed5 = practical + SLmod ;}
+               console.log(computed);	
+               console.log(computed4);	
+               console.log(SLmod);	
+               console.log(computed5);			
+            finishRoll(
+                results.rollId,
+                {
+                    sl: computed,
+                    test: computed2,
+                    slbonus: computed3,
+                    slbonusatk: computed4,
+                    sladd: computed5,
+                }
+            );
+        });
+	
+				});		
+
+    });
+
+
+on('clicked:meleechargeoff', (eventInfo) => {
+	getAttrs(["Advantageinput"], function(v) {			
+               console.log("test");	
+	var adv = parseInt(v.Advantageinput);
+	var Advadd = adv + 1;		
+               console.log(adv);	
+	
+		setAttrs({
+            "Advantageinput": Advadd
+	    }, {silent: true});	
+	
+	
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_DefensePrecise}+@{Used_DefensePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkOff}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Charge Attack Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{CHARGE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Charge Attack Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Defense_att_modtype1}]]}} {{mod1=@{Used_Defense_att_mod1}}} {{mod2type=[[@{Used_Defense_att_modtype2}]]}} {{mod2=@{Used_Defense_att_mod2}}} {{mod3type=[[@{Used_Defense_att_modtype3}]]}} {{mod3=@{Used_Defense_att_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}meleechargeoff)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{fast=[[@{Used_DefenseFast}]]}} {{slow=[[@{Used_DefenseSlow}]]}} {{hack=[[@{Used_DefenseHack}]]}} {{precise=[[@{Used_MeleePrecise}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[@{Used_DefenseTiring}]]}} {{penetrating=[[@{Used_DefensePenetrating}]]}} {{pummel=[[@{Used_DefensePummel}]]}} {{practical=[[@{Used_DefensePractical}]]}} {{charge=true}} ';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll;
+
+				
+        startRoll(rollBegins + rollPart, (results) => {
+			const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const practical = results.results.practical.result
+            const precise = results.results.precise.result
+            const slbonus = results.results.slbonus.result
+            const SLmod = results.results.SLmod.result
+            const slbonusatk = results.results.slbonusatk.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;		
+               console.log(slbonusatk);	
+			
+			if ( test <= target ) { var computed3 = computed + precise + SLmod ;} else  { var computed3 = computed + practical + SLmod ;}
+			if ( test <= target ) { var computed4 = slbonusatk - practical ;} else  { var computed4 = practical ;}
+			if ( test <= target ) { var computed5 = slbonusatk - practical + SLmod ;} else  { var computed5 = practical + SLmod ;}
+						
+            finishRoll(
+                results.rollId,
+                {
+                    sl: computed,
+                    test: computed2,
+                    slbonus: computed3,
+                    slbonusatk: computed4,
+                    sladd: computed5,
+                }
+            );
+        });
+		
+    });
+		
+    });
+	
+
+on('clicked:meleeopposedoff', (eventInfo) => {
+
+	if (eventInfo.sourceType === 'sheetworker') return;
+			getAttrs(["Used_DefenseWeaponSkill","Used_DefenseDefensive","Talent_AmbidextrousLvl","Used_MeleeTwohanded"], function(values) {	
+			
+			console.log(values.Talent_AmbidextrousLvl);
+			
+			var regex = /PARRY/g;
+			if (values.Used_DefenseDefensive == 1) {defwep = 0;} else {defwep = 1;} 
+			if (values.Used_DefenseWeaponSkill.match(regex)) {parrypen = 20 * defwep;} else {parrypen = 20;}
+			if (values.Talent_AmbidextrousLvl == 0) {ambipen = 20;}
+			if (values.Talent_AmbidextrousLvl == 1) {ambipen = 10;}
+			if (values.Talent_AmbidextrousLvl == 2) {ambipen = 0;}
+			var offpen = Math.min(parrypen, ambipen) * -1;
+			if (values.Used_MeleeTwohanded == 1) {offpen = 0;}
+			
+               console.log("Test Opp OFF");	
+               console.log(offpen);		
+	
+   let roll = '{{test=[[@{roll_rule}]]}} {{sl=[[0]]}} {{slbonus=[[@{DefensiveTotal}+@{Used_DefensePractical}+@{Talent_RiposteLvl}+@{Talent_ReversalLvl}+(@{Used_DefenseShield}*@{Talent_ShieldsmanLvl})]]}} {{sladd=[[0]]}} {{slbonusdef=[[@{slbonusDefOff}]]}} {{modvalue=[[?{Opposed Defense Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[>offpen<]] [PEN] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Opposed Defense Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{reach=@{Used_DefenseReach}}} {{damaging=[[@{Used_DefenseDamaging}]]}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{offpen=[[>offpen<]]}} {{qualities=@{Used_DefenseQualities}}} {{showdmg=[[@{Used_DefenseOpposedDmg}]]}} {{hitlocation=true}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{armorqualities=@{armorQuality}}} {{attacktype=^{PARRY}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{RTriposte=@{RT-ripostedmgoff}}} {{reroll=@{RT-reroll}MeleeOpposedOff)}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{hack=[[@{Used_DefenseHack}]]}} {{shieldsman=[[@{Used_DefenseShield}*@{Talent_ShieldsmanLvl}]]}} {{practical=[[@{Used_DefensePractical}]]}} {{impact=[[@{Used_DefenseImpact}]]}} {{tiring=[[@{Used_DefenseTiring}]]}} {{penetrating=[[@{Used_DefensePenetrating}]]}} {{pummel=[[@{Used_DefensePummel}]]}} {{defensive=[[@{DefensiveTotal}]]}} {{riposte=[[@{Talent_RiposteLvl}]]}} {{reversal=[[@{Talent_ReversalLvl}]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll.replaceAll('>offpen<', offpen);
+
+				
+        startRoll(rollBegins + rollPart, (results) => {	
+            const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const slbonus = results.results.slbonus.result
+            const practical = results.results.practical.result
+            const defensive = results.results.defensive.result
+            const riposte = results.results.riposte.result
+            const reversal = results.results.reversal.result
+            const shieldsman = results.results.shieldsman.result
+            const SLmod = results.results.SLmod.result
+            const slbonusdef = results.results.slbonusdef.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;	
+
+			if ( test <= target ) { var computed3 = computed + reversal + riposte + defensive + shieldsman + SLmod ;} else  { var computed3 = computed + practical + defensive + shieldsman + SLmod ;}
+			if ( test <= target ) { var computed4 = slbonusdef - practical ;} else  { var computed4 = defensive + practical + shieldsman ;}
+			if ( test <= target ) { var computed5 = slbonusdef - practical + SLmod ;} else  { var computed5 = defensive + practical + shieldsman + SLmod ;}
+
+		setAttrs({
+            "LastRollOff": test,		
+            "LastUnitDieOff": computed2
+	    }, {silent: true});				
+			
+            finishRoll(
+                results.rollId,
+                {
+                    sl: computed,
+                    test: computed2,
+                    slbonus: computed3,
+                    slbonusdef: computed4,
+                    sladd: computed5,
+                }
+            );
+        });
+		
+    });
+    });
+	
+
+on('clicked:ripostedmgoff', (eventInfo) => {
+	getAttrs(["LastUnitDieOff","LastRollOff"], function(v) {	
+	
+   let roll = '{{ripostedmg}} {{lastunitdie=@{LastUnitDieOff}}} {{test=[[@{LastRollOff}]]}} {{title=^{RIPOSTE}}} {{character_name=@{character_name}}}{{unconscious=[[@{UnconsciousMod}]]}} {{attacktype=^{DAMAGE}}} {{attacktest=true}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{showdmg=[[1]]}} {{hitlocation=true}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{damaging=[[@{Used_DefenseDamaging}]]}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{NPC=[[0]]}} {{hack=[[@{Used_DefenseHack}]]}} {{defensive=[[@{DefensiveTotal}]]}} {{impact=[[@{Used_DefenseImpact}]]}} {{penetrating=[[@{Used_DefensePenetrating}]]}} {{pummel=[[@{Used_DefensePummel}]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll;
+   let computed = v.LastUnitDieOff;
+				
+        startRoll(rollBegins + rollPart, (results) => {
+            const test = results.results.test.result
+			
+            finishRoll(
+                results.rollId,
+                {
+                    test: computed,
+                }
+            );
+        });
+		
+    });
+});
+
+	
+	
+	
+	
+on('clicked:rangedatk', (eventInfo) => {
+	getAttrs(["initiative_houserule"], function(v) {	
+	
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_RangedPrecise}+@{Used_RangedPractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusRgd}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Ranged Attack Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}+(10*@{Used_RangedAccurate})]] [SKILL] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_RangedDamaging}]]}} {{reach=@{Used_WeaponRange}}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}+@{Talent_AccurateShotLvl}]]}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAtk)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{precise=[[@{Used_RangedPrecise}]]}} {{penetrating=[[@{Used_RangedPenetrating}]]}} {{blackpowder=[[@{Used_RangedBlackpowder}]]}} {{practical=[[@{Used_RangedPractical}]]}} {{accurate=[[@{Used_RangedAccurate}*10]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll;
+
+				
+        startRoll(rollBegins + rollPart, (results) => {
+			const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const practical = results.results.practical.result
+            const precise = results.results.precise.result
+            const slbonus = results.results.slbonus.result
+            const SLmod = results.results.SLmod.result
+            const slbonusatk = results.results.slbonusatk.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;		
+               console.log(slbonusatk);	
+			
+			if ( test <= target ) { var computed3 = computed + precise + SLmod ;} else  { var computed3 = computed + practical + SLmod ;}
+			if ( test <= target ) { var computed4 = slbonusatk - practical ;} else  { var computed4 = practical ;}
+			if ( test <= target ) { var computed5 = slbonusatk - practical + SLmod ;} else  { var computed5 = practical + SLmod ;}
+						
+            finishRoll(
+                results.rollId,
+                {
+                    sl: computed,
+                    test: computed2,
+                    slbonus: computed3,
+                    slbonusatk: computed4,
+                    sladd: computed5,
+                }
+            );
+        });
+		 
+    });
+		
+    });
+	
+on('clicked:rangedweaponrld', (eventInfo) => {
+	getAttrs(["initiative_houserule"], function(v) {	
+	
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Talent_GunnerLvl} [SL TOTAL]]]}} {{slbonusatk=[[@{Talent_GunnerLvl}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Reload Roll Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{RELOAD}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[@{Advantage}*10]] [ADV] +?{Reload Roll Modifier|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{reach=@{Used_WeaponRange}}} {{qualities=@{Used_RangedQualities}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedWeaponRld)}} {{reload=[[1]]}} {{reloadrating=[[@{Used_RangedReloadRatingInput}*@{Used_RangedReload}]]}} {{gunner=[[@{Talent_GunnerLvl}]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll;
+
+				
+        startRoll(rollBegins + rollPart, (results) => {
+			const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const slbonus = results.results.slbonus.result
+            const SLmod = results.results.SLmod.result
+            const slbonusatk = results.results.slbonusatk.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;	
+			
+			if ( test <= target ) { var computed3 = computed + slbonusatk + SLmod ;} else  { var computed3 = computed + slbonusatk + SLmod ;}
+			if ( test <= target ) { var computed4 = slbonusatk ;} else  { var computed4 = slbonusatk ;}
+			if ( test <= target ) { var computed5 = slbonusatk + SLmod ;} else  { var computed5 = SLmod + slbonusatk ;}
+						
+            finishRoll(
+                results.rollId,
+                {
+                    sl: computed,
+                    test: computed2,
+                    slbonus: computed3,
+                    slbonusatk: computed4,
+                    sladd: computed5,
+                }
+            );
+        });
+		
+    });
+		
+    });
+
+
+	
+	
+
+on('clicked:repeating_spellbookpetty:spellcast clicked:repeating_spellbookpetty:spellcastdmg', (eventInfo) => {
+	getAttrs(["initiative_houserule"], function(v) {	
+	
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Talent_InstinctiveDictionLvl}+@{Talent_PerfectPitchLvl} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusCast}]]}} {{sladd=[[0]]}} {{modvalue=[[?{@{translation_modifier}|@{prefix2-_SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{prefix2-_spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{prefix2-_PettySpell_modtype1}]]}} {{mod1=@{prefix2-_PettySpell_mod1}}} {{mod2type=[[@{prefix2-_PettySpell_modtype2}]]}} {{mod2=@{prefix2-_PettySpell_mod2}}} {{mod3type=[[@{prefix2-_PettySpell_modtype3}]]}} {{mod3=@{prefix2-_PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=[1](~@{character_name}|prefix2-_spellcast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveandPitch}]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var skillpre = trigger.split('_');
+   var skill = skillpre[3];
+   if (skill === "spellcast") {rollDmgPart = '';
+   var prefix = eventInfo.triggerName.slice(8, -10);}
+   if (skill === "spellcastdmg") {rollDmgPart = ' {{hitlocation=true}} {{spelldamage=[[@{prefix2-_spelldamage}+@{prefix2-_spelldamagewb}]]}}';
+   var prefix = eventInfo.triggerName.slice(8, -13);}
+   
+   var skillcap = skill.toUpperCase();
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollDmg = rollDmgPart.replaceAll('prefix2-', `${prefix}`);
+   let rollPart = roll.replaceAll('prefix2-', `${prefix}`);
+   
+   
+				
+        startRoll(rollBegins + rollPart + rollDmg, (results) => {
+            const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const slbonus = results.results.slbonus.result
+            const slbonusatk = results.results.slbonusatk.result
+            const sptal2 = results.results.sptal2.result
+            const sptal3 = results.results.sptal3.result
+            const SLmod = results.results.SLmod.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;
+
+			if ( test <= target ) { var computed3 = computed + sptal2 + sptal3 + SLmod ;} else  { var computed3 = computed + SLmod ;}
+			if ( test <= target ) { var computed4 = slbonusatk ;} else  { var computed4 = 0 ;}
+			if ( test <= target ) { var computed5 = slbonusatk + SLmod ;} else  { var computed5 = SLmod ;}
+
+            finishRoll(
+                results.rollId,
+                {
+                    test: computed2,
+                    sl: computed,
+                    slbonus: computed3,
+                    slbonusatk: computed4,
+                    sladd: computed5,
+                }
+            );
+        });
+    });
+    });
+
+
+
+on('clicked:repeating_spellbookarcane:spellcast clicked:repeating_spellbookarcane:spellcastdmg', (eventInfo) => {
+	getAttrs(["initiative_houserule"], function(v) {	
+	
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Talent_InstinctiveDictionLvl}+@{Talent_PerfectPitchLvl} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusCast}]]}} {{sladd=[[0]]}} {{modvalue=[[?{@{translation_modifier}|@{prefix2-_SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{prefix2-_spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{spellcastingnumber=[[@{prefix2-_spellcastingnumber}]]}} {{accuchanexlsl=[[@{prefix2-_spellchannelsl}]]}} {{mod1type=[[@{prefix2-_ArcaneSpell_modtype1}]]}} {{mod1=@{prefix2-_ArcaneSpell_mod1}}} {{mod2type=[[@{prefix2-_ArcaneSpell_modtype2}]]}} {{mod2=@{prefix2-_ArcaneSpell_mod2}}} {{mod3type=[[@{prefix2-_ArcaneSpell_modtype3}]]}} {{mod3=@{prefix2-_ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=[1](~@{character_name}|prefix2-_spellcast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveandPitch}]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var skillpre = trigger.split('_');
+   var skill = skillpre[3];
+   if (skill === "spellcast") {rollDmgPart = '';
+   var prefix = eventInfo.triggerName.slice(8, -10);}
+   if (skill === "spellcastdmg") {rollDmgPart = ' {{hitlocation=true}} {{spelldamage=[[@{prefix2-_spelldamage}+@{prefix2-_spelldamagewb}]]}}';
+   var prefix = eventInfo.triggerName.slice(8, -13);}
+   
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollDmg = rollDmgPart.replaceAll('prefix2-', `${prefix}`);
+   let rollPart = roll.replaceAll('prefix2-', `${prefix}`);
+   
+   
+				
+        startRoll(rollBegins + rollPart + rollDmg, (results) => {
+            const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const slbonus = results.results.slbonus.result
+            const slbonusatk = results.results.slbonusatk.result
+            const sptal2 = results.results.sptal2.result
+            const sptal3 = results.results.sptal3.result
+            const SLmod = results.results.SLmod.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;
+
+			if ( test <= target ) { var computed3 = computed + sptal2 + sptal3 + SLmod ;} else  { var computed3 = computed + SLmod ;}
+			if ( test <= target ) { var computed4 = slbonusatk ;} else  { var computed4 = 0 ;}
+			if ( test <= target ) { var computed5 = slbonusatk + SLmod ;} else  { var computed5 = SLmod ;}
+
+            finishRoll(
+                results.rollId,
+                {
+                    test: computed2,
+                    sl: computed,
+                    slbonus: computed3,
+                    slbonusatk: computed4,
+                    sladd: computed5,
+                }
+            );
+        });
+    });
+    });
+	
+	
+	
+	
+	
+	
+	
+	
+on('clicked:repeating_spellbookarcane:extchannellingloreroll', (eventInfo) => {
+	getAttrs(["initiative_houserule"], function(v) {	
+	
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Talent_AethyricAttunementLvl} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusChannel}]]}} {{sladd=[[0]]}} {{modvalue=[[?{Channeling Roll Modifier|@{prefix2-_ChanMod}}]]}} {{title=@{spellname}}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + @{prefix2-_ExtChannellingLore} [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{accuchanexlsl=[[?{Accumulated Extended Channelling SL (Start at 0)|@{prefix2-_spellchannelsl}}}} {{SLmod=[[?{SL Modifier|0}]]]]}} {{spellcastingnumber=[[@{prefix2-_spellcastingnumber}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{prefix2-_ExtChannellingLoreRoll_modtype1}]]}} {{mod1=@{prefix2-_ExtChannellingLoreRoll_mod1}}} {{mod2type=[[@{prefix2-_ExtChannellingLoreRoll_modtype2}]]}} {{mod2=@{prefix2-_ExtChannellingLoreRoll_mod2}}} {{mod3type=[[@{prefix2-_ExtChannellingLoreRoll_modtype3}]]}} {{mod3=@{prefix2-_ExtChannellingLoreRoll_mod3}}} {{NPC=[[0]]}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=[1](~@{character_name}|prefix2-_extchannellingloreroll)}} {{sptal1=[[@{Talent_AethyricAttunementLvl}]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = eventInfo.triggerName.slice(8, -23);
+   
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll.replaceAll('prefix2-', `${prefix}`);
+   
+               console.log("Test Skill");	
+               console.log(trigger);		
+               console.log(prefix);		
+   
+				
+        startRoll(rollBegins + rollPart, (results) => {
+            const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const slbonus = results.results.slbonus.result
+            const slbonusatk = results.results.slbonusatk.result
+            const sptal1 = results.results.sptal1.result
+            const SLmod = results.results.SLmod.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;
+
+			if ( test <= target ) { var computed3 = computed + sptal1 + SLmod ;} else  { var computed3 = computed + SLmod ;}
+			if ( test <= target ) { var computed4 = slbonusatk ;} else  { var computed4 = 0 ;}
+			if ( test <= target ) { var computed5 = slbonusatk + SLmod ;} else  { var computed5 = SLmod ;}
+
+            finishRoll(
+                results.rollId,
+                {
+                    test: computed2,
+                    sl: computed,
+                    slbonus: computed3,
+                    slbonusatk: computed4,
+                    sladd: computed5,
+                }
+            );
+        });
+    });
+    });
+		
+	
+
+on('clicked:repeating_divineblessings:bless', (eventInfo) => {
+	getAttrs(["initiative_houserule"], function(v) {	
+	
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[ [SL TOTAL]]]}} {{sladd=[[0]]}} {{slbonusatk=[[0]]}} {{modvalue=[[?{@{translation_modifier}|@{prefix2-_BlessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{prefix2-_blessingrange}}} {{spelltarget=Targets: @{prefix2-_blessingtarget}}} {{spellduration=Duration: @{prefix2-_blessingduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[{@{PrayChar}+@{PrayAdv}+@{PrayMisc}}]] [SKILL] + ?{@{translation_modifier}|@{prefix2-_BlessMod}} [MOD] ]]}} {{spelldescription=@{prefix2-_blessingdesc}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[7]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{mod1type=[[@{prefix2-_BlessingSpell_modtype1}]]}} {{mod1=@{prefix2-_BlessingSpell_mod1}}} {{mod2type=[[@{prefix2-_BlessingSpell_modtype2}]]}} {{mod2=@{prefix2-_BlessingSpell_mod2}}} {{mod3type=[[@{prefix2-_BlessingSpell_modtype3}]]}} {{mod3=@{prefix2-_BlessingSpell_mod3}}} {{NPC=[[0]]}} {{RTwrath=@{RT-wrath}}} {{reroll=[1](~@{character_name}|bless)}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = eventInfo.triggerName.slice(8, -6);
+   
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll.replaceAll('prefix2-', `${prefix}`);
+   
+               console.log("Test Skill");	
+               console.log(trigger);		
+               console.log(prefix);		
+   
+				
+        startRoll(rollBegins + rollPart, (results) => {
+            const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const slbonus = results.results.slbonus.result
+            const slbonusatk = results.results.slbonusatk.result
+            const SLmod = results.results.SLmod.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;
+
+			if ( test <= target ) { var computed3 = computed + SLmod ;} else  { var computed3 = computed + SLmod ;}
+			if ( test <= target ) { var computed4 = 0 ;} else  { var computed4 = 0 ;}
+			if ( test <= target ) { var computed5 = SLmod ;} else  { var computed5 = SLmod ;}
+
+            finishRoll(
+                results.rollId,
+                {
+                    test: computed2,
+                    sl: computed,
+                    slbonus: computed3,
+                    slbonusatk: computed4,
+                    sladd: computed5,
+                }
+            );
+        });
+    });
+    });	
+	
+	
+	
+
+on('clicked:repeating_divinemiracles:miracle clicked:repeating_divinemiracles:miracledmg', (eventInfo) => {
+	getAttrs(["initiative_houserule"], function(v) {	
+	
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[0 [SL TOTAL]]]}} {{slbonusatk=[[0]]}} {{sladd=[[0]]}} {{modvalue=[[?{@{translation_modifier}|@{prefix2-_MiracleMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{prefix2-_spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{prefix2-_miraclerange}}} {{spelltarget=Targets: @{prefix2-_miracletarget}}} {{spellduration=Duration: @{prefix2-_miracleduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|@{prefix2-_MiracleMod}} [MOD] ]]}} {{spelldescription=@{prefix2-_miracledesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{rolltype=[[8]]}} {{mod1type=[[@{prefix2-_MiracleSpell_modtype1}]]}} {{mod1=@{prefix2-_MiracleSpell_mod1}}} {{mod2type=[[@{prefix2-_MiracleSpell_modtype2}]]}} {{mod2=@{prefix2-_MiracleSpell_mod2}}} {{mod3type=[[@{prefix2-_MiracleSpell_modtype3}]]}} {{mod3=@{prefix2-_MiracleSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTwrath=@{RT-wrath}}} {{reroll=[1](~@{character_name}|prefix2-_miracledmg)}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var skillpre = trigger.split('_');
+   var skill = skillpre[3];
+   if (skill === "miracle") {rollDmgPart = '';
+   var prefix = eventInfo.triggerName.slice(8, -8);}
+   if (skill === "miracledmg") {rollDmgPart = ' {{hitlocation=true}} {{spelldamage=[[@{prefix2-_miracledamage}+@{Talent_HolyHatredLvl}]]}}';
+   var prefix = eventInfo.triggerName.slice(8, -11);}
+   
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollDmg = rollDmgPart.replaceAll('prefix2-', `${prefix}`);
+   let rollPart = roll.replaceAll('prefix2-', `${prefix}`);
+   
+   
+				
+        startRoll(rollBegins + rollPart + rollDmg, (results) => {
+            const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const slbonus = results.results.slbonus.result
+            const slbonusatk = results.results.slbonusatk.result
+            const SLmod = results.results.SLmod.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;
+
+			if ( test <= target ) { var computed3 = computed + SLmod ;} else  { var computed3 = computed + SLmod ;}
+			if ( test <= target ) { var computed4 = 0 ;} else  { var computed4 = 0 ;}
+			if ( test <= target ) { var computed5 = SLmod ;} else  { var computed5 = SLmod ;}
+
+            finishRoll(
+                results.rollId,
+                {
+                    test: computed2,
+                    sl: computed,
+                    slbonus: computed3,
+                    slbonusatk: computed4,
+                    sladd: computed5,
+                }
+            );
+        });
+    });
+    });
+	
+	
+	
+	
+	
+	
+   on('clicked:weaponskill clicked:ballisticskill clicked:strength clicked:toughness clicked:initiative clicked:agility clicked:dexterity clicked:intelligence clicked:willpower clicked:fellowship', (eventInfo) => {
+	
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[0 [SL TOTAL]]]}} {{slbonusatk=[[0]]}} {{sladd=[[0]]}} {{modvalue=[[?{@{translation_modifier}|@{>Char<Mod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{>Charcap<}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen}*-1)]] [COND] + @{>Char<} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{>Char<SL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=[1](~@{character_name}|>Char<)}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var triggercap = trigger.toUpperCase();		
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPartPart = roll.replaceAll('>Char<', trigger);
+   let rollPart = rollPartPart.replaceAll('>Charcap<', triggercap);
+   
+ 
+        startRoll(rollBegins + rollPart, (results) => {
+            const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const slbonus = results.results.slbonus.result
+            const slbonusatk = results.results.slbonusatk.result
+            const SLmod = results.results.SLmod.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;
+			
+			if ( test <= target ) { var computed3 = computed + SLmod ;} else  { var computed3 = computed + SLmod ;}
+			if ( test <= target ) { var computed4 = 0 ;} else  { var computed4 = 0 ;}
+			if ( test <= target ) { var computed5 = SLmod ;} else  { var computed5 = SLmod ;}
+
+            finishRoll(
+                results.rollId,
+                {
+                    test: computed2,
+                    sl: computed,
+                    slbonus: computed3,
+                    slbonusatk: computed4,
+                    sladd: computed5,
+                }
+            );
+        });
+    });	
+	
+	
+	
+	
+	
+	
+   on('clicked:art clicked:athletics clicked:bribery clicked:charm clicked:charmanimal clicked:climb clicked:consumealcohol clicked:drive clicked:endurance clicked:entertain clicked:gamble clicked:gossip clicked:haggle clicked:intimidate clicked:intuition clicked:leadership clicked:navigation clicked:outdoorsurvival clicked:perception clicked:ride clicked:row clicked:stealth clicked:animalcare clicked:channellingfire clicked:channellingheavens clicked:channellingmetal clicked:channellingbeasts clicked:channellinglife clicked:channellinglight clicked:channellingdeath clicked:channellingshadows clicked:channellingwitch clicked:channellingdark clicked:channellingchaos clicked:channellingmisc clicked:evaluate clicked:heal clicked:picklock clicked:pray clicked:research clicked:settrap clicked:sleightofhand clicked:swim clicked:track', (eventInfo) => {
+	
+   let roll = '{{test=[[@{roll_rule}]]}} {{sl=[[0]]}} {{slbonus=[[0]]}} {{sladd=[[0]]}} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}}  {{title=^{>Charcap<}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{cond-}*-1]] [COND] + [[@{>Char<Char}+@{>Char<Adv}+@{>Char<Misc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{mod1type=[[@{>Char<_modtype1}]]}} {{mod1=@{>Char<_mod1}}} {{mod2type=[[@{>Char<_modtype2}]]}} {{mod2=@{>Char<_mod2}}} {{mod3type=[[@{>Char<_modtype3}]]}} {{mod3=@{>Char<_mod3}}} {{reroll=@{RT-reroll}>Char<)}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var triggercap = trigger.toUpperCase();		
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPartPart = roll.replaceAll('>Char<', trigger);
+   let rollPart4 = rollPartPart.replaceAll('>Charcap<', triggercap);
+   
+	if (trigger === 'perception') {var pen = '[SKILL] + [[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]] [PEN]';}
+	if (trigger === 'perception') {rollPart3 = rollPart4.replaceAll('[SKILL]', pen);} else {rollPart3 = rollPart4;}
+	
+	if (trigger === 'stealth') {var pen = '[SKILL] + [[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]] [PEN]';}
+	if (trigger === 'stealth') {rollPart2 = rollPart3.replaceAll('[SKILL]', pen);} else {rollPart2 = rollPart3;}
+	
+	if (trigger === 'perception') {rollpen = '{{armorpen=[[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]]}}';} 
+	else if (trigger === 'stealth') {rollpen = '{{armorpen=[[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]]}}';} else {rollpen = '';}
+	
+	if (trigger === 'art') {cond = '{{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see`);}   
+	else if (trigger === 'evaluate') {cond = '{{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see`);}   
+	else if (trigger === 'heal') {cond = '{{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see`);}   
+	else if (trigger === 'picklock') {cond = '{{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see`);}   
+	else if (trigger === 'play') {cond = '{{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see`);}   
+	else if (trigger === 'research') {cond = '{{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see`);}   
+	
+	else if (trigger === 'athletics') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}   	
+	else if (trigger === 'climb') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}   
+	else if (trigger === 'drive') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}   	
+	else if (trigger === 'navigation') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}   	
+	else if (trigger === 'outdoorsurvival') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}    	
+	else if (trigger === 'ride') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}    	
+	else if (trigger === 'stealth') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}    	
+	else if (trigger === 'channellingfire') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}    	
+	else if (trigger === 'channellingheavens') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}    	
+	else if (trigger === 'channellingmetal') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}    	
+	else if (trigger === 'channellingbeasts') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}    	
+	else if (trigger === 'channellinglife') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}    	
+	else if (trigger === 'channellinglight') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}      	
+	else if (trigger === 'channellingdeath') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}     	
+	else if (trigger === 'channellingshadows') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}     	
+	else if (trigger === 'channellingwitch') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}     	
+	else if (trigger === 'channellingdark') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}     	
+	else if (trigger === 'channellingchaos') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}     	
+	else if (trigger === 'channellingmisc') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}       	
+	else if (trigger === 'settrap') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}      	
+	else if (trigger === 'sleightofhand') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}      	
+	else if (trigger === 'swim') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}      	
+	else if (trigger === 'track') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}  	
+	
+	else if (trigger === 'bribery') {cond = '{{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen`);}  
+	else if (trigger === 'charm') {cond = '{{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen`);}  
+	else if (trigger === 'charmanimal') {cond = '{{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen`);}  
+	else if (trigger === 'consumealcohol') {cond = '{{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen`);}  
+	else if (trigger === 'endurance') {cond = '{{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen`);}  
+	else if (trigger === 'entertain') {cond = '{{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen`);}  
+	else if (trigger === 'gamble') {cond = '{{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen`);}  
+	else if (trigger === 'gossip') {cond = '{{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen`);}  
+	else if (trigger === 'haggle') {cond = '{{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen`);}  
+	else if (trigger === 'leadership') {cond = '{{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen`);}  
+	else if (trigger === 'row') {cond = '{{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen`);}
+	else if (trigger === 'animalcare') {cond = '{{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen`);}
+	else if (trigger === 'pray') {cond = '{{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen`);}  
+	
+	else if (trigger === 'intuition') {cond = '{{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[@{DeafenedMod}]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_hear`);}  
+	else if (trigger === 'perception') {cond = '{{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[@{DeafenedMod}]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_hear`);}  
+	
+	else {cond = ''}
+	
+		
+ 
+        startRoll(rollBegins + rollPart + rollpen + cond, (results) => {
+            const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const slbonus = results.results.slbonus.result
+            const SLmod = results.results.SLmod.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;
+			
+			if ( test <= target ) { var computed3 = computed + SLmod ;} else  { var computed3 = computed + SLmod ;}
+			if ( test <= target ) { var computed5 = SLmod ;} else  { var computed5 = SLmod ;}
+
+            finishRoll(
+                results.rollId,
+                {
+                    test: computed2,
+                    sl: computed,
+                    slbonus: computed3,
+                    sladd: computed5,
+                }
+            );
+        });
+    });
+	
+	
+   on('clicked:cool clicked:dodge clicked:meleebasic clicked:meleebrawling clicked:meleecavalry clicked:meleefencing clicked:meleeflail clicked:meleeparry clicked:meleepolearm clicked:meleetwohanded clicked:langmagick clicked:rangedblackpowder clicked:rangedbow clicked:rangedcrossbow clicked:rangedengineering clicked:rangedentangling clicked:rangedexplosives clicked:rangedsling clicked:rangedthrowing', (eventInfo) => {
+	
+   let roll = '{{test=[[@{roll_rule}]]}} {{sl=[[0]]}} {{slbonus=[[0]]}} {{sladd=[[0]]}} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{>Charcap<}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{cond-}*-1]] [COND] + [[@{>Char<Char}+@{>Char<Adv}+@{>Char<Misc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{mod1type=[[@{>Char<_modtype1}]]}} {{mod1=@{>Char<_mod1}}} {{mod2type=[[@{>Char<_modtype2}]]}} {{mod2=@{>Char<_mod2}}} {{mod3type=[[@{>Char<_modtype3}]]}} {{mod3=@{>Char<_mod3}}} {{reroll=@{RT-reroll}>Char<)}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var triggercap = trigger.toUpperCase();		
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPartPart = roll.replaceAll('>Char<', trigger);
+   let rollPart2 = rollPartPart.replaceAll('>Charcap<', triggercap);
+
+
+	if (trigger === 'cool') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}  
+	else if (trigger === 'dodge') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}   
+	else if (trigger === 'meleebasic') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}  
+	else if (trigger === 'meleebrawling') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}   
+	else if (trigger === 'meleecavalry') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}   
+	else if (trigger === 'meleefencing') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}   
+	else if (trigger === 'meleetwohanded') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}   
+	else if (trigger === 'meleeflail') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}   
+	else if (trigger === 'meleeparry') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}   
+	else if (trigger === 'meleepolearm') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}   
+	else if (trigger === 'rangedblackpowder') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}  
+	else if (trigger === 'rangedbow') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}   
+	else if (trigger === 'rangedcrossbow') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}   
+	else if (trigger === 'rangedengineering') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}  
+	else if (trigger === 'rangedentangling') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}  
+	else if (trigger === 'rangedexplosives') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}  
+	else if (trigger === 'rangedsling') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}  
+	else if (trigger === 'rangedthrowing') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}  
+
+	else if (trigger === 'langmagick') {cond = '{{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see`);}  
+	
+	else {cond = ''}
+	
+        startRoll(rollBegins + rollPart + cond, (results) => {
+            const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const slbonus = results.results.slbonus.result
+            const SLmod = results.results.SLmod.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;
+
+			if ( test <= target ) { var computed3 = computed + SLmod ;} else  { var computed3 = computed + SLmod ;}
+			if ( test <= target ) { var computed5 = SLmod ;} else  { var computed5 = SLmod ;}
+
+            finishRoll(
+                results.rollId,
+                {
+                    test: computed2,
+                    sl: computed,
+                    slbonus: computed3,
+                    sladd: computed5,
+                }
+            );
+        });
+    });
+	
+	
+
+    on('clicked:repeating_artspecializationr:artspecialization clicked:repeating_entertainspecialization:entertainspecialization clicked:repeating_ridespecialization:ridespecialization clicked:repeating_stealthspecialization:stealthspecialization', (eventInfo) => {
+               console.log("test");
+	
+   let roll = '{{test=[[@{roll_rule}]]}} {{sl=[[0]]}} {{slbonus=[[0]]}} {{sladd=[[0]]}} {{target=[[ [[@{cond-}*-1]] [COND] + [[@{prefix-Char}+@{prefix-Adv}+@{prefix-Misc}]] [SKILL] +?{@{translation_modifier}|0} [MOD] ]]}} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=@{prefix-Name}}} {{skill=^{>Skill<}}} {{character_name=@{character_name}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{mod1type=[[@{prefix2-_Custom_modtype1}]]}} {{mod1=@{prefix2-_Custom_mod1}}} {{mod2type=[[@{prefix2-_Custom_modtype2}]]}} {{mod2=@{prefix2-_Custom_mod2}}} {{mod3type=[[@{prefix2-_Custom_modtype3}]]}} {{mod3=@{prefix2-_Custom_mod3}}} {{reroll=[1](~@{character_name}|prefix2-specialization)}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   var prefix2 = eventInfo.triggerName.slice(8, -14);
+   var skillpre = trigger.split('_').slice(-1);
+   var skill = skillpre[0].slice(0, -14);
+   var skillcap = skill.toUpperCase();
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart3 = roll.replaceAll('prefix-', `${trigger}`).replaceAll('prefix2-', `${prefix2}`).replaceAll('>Skill<', `${skillcap}`);
+
+	if (skill === 'stealth') {var pen = '[SKILL] + [[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]] [PEN]';}
+	if (skill === 'stealth') {rollPart2 = rollPart3.replaceAll('[SKILL]', pen);} else {rollPart2 = rollPart3;}
+	if (skill === 'stealth') {rollpen = '{{armorpen=[[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]]}}';} else {rollpen = ''}
+
+	if (skill === 'art') {cond = '{{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see`);}  
+	
+	else if (skill === 'ride') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}  
+	else if (skill === 'stealth') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}    
+	
+	else if (skill === 'entertain') {cond = '{{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen`);}    
+	
+	else {cond = ''}
+
+               console.log("Test Rep Skill");	
+               console.log(skill);		
+               console.log(prefix2);		
+               console.log(rollpen);	
+				
+        startRoll(rollBegins + rollPart + rollpen + cond, (results) => {
+            const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const slbonus = results.results.slbonus.result
+            const SLmod = results.results.SLmod.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;
+
+			if ( test <= target ) { var computed3 = computed + SLmod ;} else  { var computed3 = computed + SLmod ;}
+			if ( test <= target ) { var computed5 = SLmod ;} else  { var computed5 = SLmod ;}
+
+            finishRoll(
+                results.rollId,
+                {
+                    test: computed2,
+                    sl: computed,
+                    slbonus: computed3,
+                    sladd: computed5,
+                }
+            );
+        });
+    });
+
+
+	
+
+    on('clicked:repeating_animaltraining:animaltraining clicked:repeating_language:language clicked:repeating_lore:lore clicked:repeating_perform:perform clicked:repeating_play:play clicked:repeating_sail:sail clicked:repeating_secretsigns:secretsigns clicked:repeating_trade:trade', (eventInfo) => {
+               console.log("test");
+	
+   let roll = '{{test=[[@{roll_rule}]]}} {{sl=[[0]]}} {{slbonus=[[0]]}} {{sladd=[[0]]}} {{target=[[ [[@{cond-}*-1]] [COND] + [[@{prefix-Char}+@{prefix-Adv}+@{prefix-Misc}]] [SKILL] +?{@{translation_modifier}|0} [MOD] ]]}} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=@{prefix-Specialization}}} {{skill=^{>Skill<}}} {{character_name=@{character_name}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{mod1type=[[@{prefix-_modtype1}]]}} {{mod1=@{prefix-_mod1}}} {{mod2type=[[@{prefix-_modtype2}]]}} {{mod2=@{prefix-_mod2}}} {{mod3type=[[@{prefix-_modtype3}]]}} {{mod3=@{prefix-_mod3}}} {{reroll=[1](~@{character_name}|prefix-specialization)}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   var prefix2 = eventInfo.triggerName.slice(8, -14);
+   var skillpre = trigger.split('_');
+   var skill = skillpre[3];
+   var skillcap = skill.toUpperCase();
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart2 = roll.replaceAll('prefix-', `${trigger}`).replaceAll('>Skill<', `${skillcap}`);
+
+	if (skill === 'language') {cond = '{{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see`);} 
+	else if (skill === 'lore') {cond = '{{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see`);} 
+	else if (skill === 'lore') {cond = '{{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see`);} 
+	else if (skill === 'sail') {cond = '{{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see`);} 
+	else if (skill === 'secretsigns') {cond = '{{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see`);} 	
+
+	else if (skill === 'perform') {cond = '{{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen_see_move`);}  
+	
+	else if (skill === 'animaltraining') {cond = '{{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen`);} 
+	else if (skill === 'trade') {cond = '{{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}';
+	rollPart = rollPart2.replaceAll('cond-', `condgen`);} 
+	
+	else {cond = ''}
+	
+	
+               console.log("Test Rep Skill");	
+               console.log(trigger);	
+               console.log(skill);
+               console.log(cond);	
+               console.log(rollPart);		
+				
+        startRoll(rollBegins + rollPart + cond, (results) => {
+            const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const slbonus = results.results.slbonus.result
+            const SLmod = results.results.SLmod.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;
+
+			if ( test <= target ) { var computed3 = computed + SLmod ;} else  { var computed3 = computed + SLmod ;}
+			if ( test <= target ) { var computed5 = SLmod ;} else  { var computed5 = SLmod ;}
+
+            finishRoll(
+                results.rollId,
+                {
+                    test: computed2,
+                    sl: computed,
+                    slbonus: computed3,
+                    sladd: computed5,
+                }
+            );
+        });
+    });
+
+
+				
+
+
+on('clicked:initiative_houserule0', (eventInfo) => {
+	getAttrs(["initiative_houserule"], function(v) {	
+	
+	
+	
+	
+	
+   let roll = '{{modvalue=[[?{@{translation_modifier}|0}]]}} {{sl=[[0]]}} {{slbonus=[[0]]}} {{sladd=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ @{Initiative} [INIT] +?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}} {{SLmod=[[?{SL Modifier|0}]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll;
+
+				
+        startRoll(rollBegins + rollPart, (results) => {
+			const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const SLmod = results.results.SLmod.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;		
+               console.log(slbonusatk);	
+			
+			if ( test <= target ) { var computed3 = computed + SLmod ;} else  { var computed3 = computed + SLmod ;}
+			if ( test <= target ) { var computed5 = SLmod ;} else  { var computed5 = SLmod ;}
+						
+            finishRoll(
+                results.rollId,
+                {
+                    sl: computed,
+                    test: computed2,
+                    slbonus: computed3,
+                    sladd: computed5,
+                }
+            );
+        });
+		
+    });
+		
+    });
+
+
+on('clicked:initiative_houserule1', (eventInfo) => {
+	getAttrs(["initiative_houserule"], function(v) {	
+	
+	
+   let roll = '{{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[1d10 [d10] +(@{Initiative} [INIT] +?{@{translation_modifier}|0})&{tracker}]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll;
+
+				
+        startRoll(rollBegins + rollPart, (results) => {
+						
+            finishRoll(
+                results.rollId,
+                {
+                }
+            );
+        });
+		
+    });
+		
+    });
+
+on('clicked:initiative_houserule2', (eventInfo) => {
+	getAttrs(["initiative_houserule"], function(v) {	
+	
+	
+	
+	
+	
+   let roll = '{{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[[[1d10]] [d10] +[[floor((@{Agility})/10)]] [AGIB] +[[floor((@{Initiative}+?{@{translation_modifier}|0})/10)]] [INITB] &{tracker}]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll;
+
+				
+        startRoll(rollBegins + rollPart, (results) => {
+						
+            finishRoll(
+                results.rollId,
+                {
+                }
+            );
+        });
+		
+    });
+		
+    });
+
+on('clicked:criticaltest', (eventInfo) => {
+	getAttrs(["initiative_houserule"], function(v) {	
+	
+	
+	
+	
+	
+   let roll = '{{unconscious=[[@{UnconsciousMod}]]}} {{title=Critical Roll}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{critdmgbonus=[[@{Talent_StrikeToInjureLvl} [STRIKE TO INJURE]]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll;
+				
+        startRoll(rollBegins + rollPart, (results) => {
+						
+            finishRoll(
+                results.rollId,
+                {
+                }
+            );
+        });
+		
+    });
+		
+    });
+	
+on('clicked:fumbletest', (eventInfo) => {
+	getAttrs(["initiative_houserule"], function(v) {	
+		
+	
+   let roll = '{{unconscious=[[@{UnconsciousMod}]]}} {{title=^{FUMBLE}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll;
+
+				
+        startRoll(rollBegins + rollPart, (results) => {
+						
+            finishRoll(
+                results.rollId,
+                {
+                }
+            );
+        });
+		
+    });
+		
+    });	
+
+on('clicked:AmputationTest', (eventInfo) => {
+	getAttrs(["initiative_houserule"], function(v) {	
+		
+	
+   let roll = '{{modvalue=[[?{@{translation_modifier}|0}]]}} {{sl=[[0]]}} {{slbonus=[[0]]}} {{sladd=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AMPUTATION}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{amputationroll=true}} {{test=[[@{roll_rule}]]}} {{target=[[ [[@{condgen_move}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}}';
+   var trigger = eventInfo.triggerName.slice(8);
+   var prefix = trigger.split('_').slice(0,3).join('_') + '_';
+   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollPart = roll;
+
+				
+        startRoll(rollBegins + rollPart, (results) => {
+			const target = results.results.target.result
+            const test = results.results.test.result
+            const sl = results.results.sl.result
+            const SLmod = results.results.SLmod.result
+            const computed = (Math.floor(target / 10) - Math.floor(test / 10)) ;
+            const computed2 = (((test-1)%10)+1) ;		
+			
+			if ( test <= target ) { var computed3 = computed + SLmod ;} else  { var computed3 = computed + SLmod ;}
+			if ( test <= target ) { var computed5 = SLmod ;} else  { var computed5 = SLmod ;}
+						
+            finishRoll(
+                results.rollId,
+                {
+                    sl: computed,
+                    test: computed2,
+                    slbonus: computed3,
+                    sladd: computed5,
+                }
+            );
+        });
+		
+    });
+		
+    });
+		
+
+on('change:repeating_melee:usedshield', function(event){
+        if (event.sourceType === 'sheetworker') return;
+	const playerclickedid = event.sourceAttribute.split('_')[2] || '';
+                    const output = {};
+	getSectionIDs("repeating_melee", function (ids) {
+		ids.forEach(id => {
+			if(playerclickedid.toLowerCase() == id.toLowerCase()) {
+				getAttrs(["repeating_melee_UsedShield"], function(v) {
+					if(v.repeating_melee_UsedShield == 1)
+					{
+						output[`repeating_melee_${id}_UsedTwohanded`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 0 : 0;
+						setAttrs(output, {silent: true});
+					}			
+				});			
+			} 
+		});	
+	});	
+});	
+
+on('change:repeating_melee:usedtwohanded', function(event){
+        if (event.sourceType === 'sheetworker') return;
+	const playerclickedid = event.sourceAttribute.split('_')[2] || '';
+                    const output = {};
+	getSectionIDs("repeating_melee", function (ids) {
+		ids.forEach(id => {
+			if(playerclickedid.toLowerCase() == id.toLowerCase()) {
+				getAttrs(["repeating_melee_UsedShield"], function(v) {
+					if(v.repeating_melee_UsedShield == 1)
+					{
+						output[`repeating_melee_${id}_UsedShield`] = (playerclickedid.toLowerCase() == id.toLowerCase()) ? 0 : 0;
+						setAttrs(output, {silent: true});
+					}			
+				});			
+			} 
+		});	
+	});	
+});	
+
+
 </script>
\ No newline at end of file
diff --git a/Warhammer 4e Character Sheet/translation.json b/Warhammer 4e Character Sheet/translation.json
index ec48853dfd..9fb5db20ab 100644
--- a/Warhammer 4e Character Sheet/translation.json	
+++ b/Warhammer 4e Character Sheet/translation.json	
@@ -20,7 +20,9 @@
 	"ADVANCEMENTS": "Advancements",
 	"SUCCESS-LEVEL": "Success Level",
 	"WEAPON-SKILL": "Weapon Skill",
+	"WEAPONSKILL": "Weapon Skill",
 	"BALLISTIC-SKILL": "Ballistic Skill",
+	"BALLISTICSKILL": "Ballistic Skill",
 	"OOPS": "Oops",
 	"FUMBLE": "Fumble",
 	"STURDY": "Sturdy",
@@ -57,6 +59,7 @@
 	"SHIELD": "Shield",
 	"LARGE-SHIELD": "Large Shield",
 	"EFFECTS": "Effects",
+	"SL-MODIFIERS": "SL Modifiers",
 	"SIN-AND-CORRUPTION": "Sin & Corruption",
 	"CORRUPTION": "Corruption",
 	"SIN": "Sin",
@@ -87,6 +90,7 @@
 	"ENC-PENALTY": "Enc Penalty",
 	"COND-RESET": "Clear Conditions",
 	"DMG": "Dmg",
+	"+DMG": "+Dmg",
 	"OPPOSE": "Oppose",
 	"OPPOSED": "Opposed",
 	"OPPOSED-SHOWDMG": "Show Dmg/HitLoc",
@@ -206,6 +210,7 @@
 	"RIDE-SPECIALIZATION": "Ride Specialization",
 	"SAIL-SKILLS": "Sail Skills",
 	"SECRET-SIGNS": "Secret Signs",
+	"SECRETSIGNS": "Secret Signs",
 	"TRADE": "Trade",
 	"TRAINED": "Trained",
 	"BASIC": "Basic",
@@ -228,11 +233,14 @@
 	"PRAY": "Pray",
 	"STEALTH": "Stealth",
 	"ANIMAL-CARE": "Animal Care",
+	"ANIMALCARE": "Animal Care",
 	"CHARM": "Charm",
 	"CHARM-ANIMAL": "Charm Animal",
+	"CHARMANIMAL": "Charm Animal",
 	"COMMAND": "Command",
 	"CONCEALMENT": "Concealment",
 	"CONSUME-ALCOHOL": "Consume Alcohol",
+	"CONSUMEALCOHOL": "Consume Alcohol",
 	"DISGUISE": "Disguise",
 	"EVALUATE": "Evaluate",
 	"GAMBLE": "Gamble",
@@ -242,6 +250,7 @@
 	"INTUITION": "Intuition",
 	"LEADERSHIP": "Leadership",
 	"OUTDOOR-SURVIVAL": "Outdoor Survival",
+	"OUTDOORSURVIVAL": "Outdoor Survival",
 	"PERCEPTION": "Perception",
 	"RIDE": "Ride",
 	"ROW": "Row",
@@ -249,27 +258,26 @@
 	"MELEE-SPECIALIZATION": "Melee Specialization",
 	"RANGED-SKILLS": "Ranged Skills",
 	"WEAPON": "Weapon",
-	"SCALE-SHEER-SURFACE": "Scale Sheer Surface",
 	"SEARCH": "Search",
-	"SILENT-MOVE": "Silent Move",
 	"SWIM": "Swim",
 	"ANIMAL-TRAINING": "Animal Training",
+	"ANIMALTRAINING": "Animal Training",
 	"BLATHER": "Blather",
 	"CHANNELLING": "Channelling",
 	"DODGE-BLOW": "Dodge Blow",
-	"FOLLOW-TRAIL": "Follow Trail",
 	"HEAL": "Heal",
 	"RESEARCH": "Research",
 	"HYPNOTISM": "Hypnotism",
-	"LIP-READING": "Lip Reading",
 	"MAGICAL-SENSE": "Magical Sense",
 	"NAVIGATION": "Navigation",
 	"PICK-LOCK": "Pick Lock",
+	"PICKLOCK": "Pick Lock",
 	"PREPARE-POISON": "Prepare Poison",
 	"READ-AND-WRITE": "Read and Write",
 	"SET-TRAP": "Set Trap",
-	"SHADOWING": "Shadowing",
+	"SETTRAP": "Set Trap",
 	"SLEIGHT-OF-HAND": "Sleight of Hand",
+	"SLEIGHTOFHAND": "Sleight of Hand",
 	"TORTURE": "Torture",
 	"VENTRILOQUISM": "Ventriloquism",
 	"ASTROLOGY": "Astrology",
@@ -303,6 +311,7 @@
 	"DEXTERITY": "Dexterity",
 	"INTELLIGENCE": "Intelligence",
 	"WILL-POWER": "Will Power",
+	"WILLPOWER": "Will Power",
 	"FELLOWSHIP": "Fellowship",
 	"CAREER-SECONDARY-PROFILE": "Career Secondary Profile",
 	"ATTACKS": "Attacks",
@@ -322,34 +331,65 @@
 	"MELEE-WEAPONS": "MELEE WEAPONS",
 	"MELEE": "Melee",
 	"MELEE-BASIC": "Melee (Basic)",
+	"MELEEBASIC": "Melee (Basic)",
 	"MELEE-BRAWLING": "Melee (Brawling)",
+	"MELEEBRAWLING": "Melee (Brawling)",
 	"MELEE-CAVALRY": "Melee (Cavalry)",
+	"MELEECAVALRY": "Melee (Cavalry)",
 	"MELEE-FENCING": "Melee (Fencing)",
+	"MELEEFENCING": "Melee (Fencing)",
 	"MELEE-FLAIL": "Melee (Flail)",
+	"MELEEFLAIL": "Melee (Flail)",
 	"MELEE-PARRY": "Melee (Parry)",
+	"MELEEPARRY": "Melee (Parry)",
 	"MELEE-POLEARM": "Melee (Polearm)",
+	"MELEEPOLEARM": "Melee (Polearm)",
 	"MELEE-TWOHANDED": "Melee (Two-Handed)",
+	"MELEETWOHANDED": "Melee (Two-Handed)",
+	"ONE-HANDED": "One-Handed",
+	"TWO-HANDED": "Two-Handed",
 	"RANGED-BLACKPOWDER": "Ranged (Blackpowder)",
+	"RANGEDBLACKPOWDER": "Ranged (Blackpowder)",
 	"RANGED-BOW": "Ranged (Bow)",
+	"RANGEDBOW": "Ranged (Bow)",
 	"RANGED-CROSSBOW": "Ranged (Crossbow)",
+	"RANGEDCROSSBOW": "Ranged (Crossbow)",
 	"RANGED-ENGINEERING": "Ranged (Engineering)",
+	"RANGEDENGINEERING": "Ranged (Engineering)",
 	"RANGED-ENTANGLING": "Ranged (Entangling)",
+	"RANGEDENTANGLING": "Ranged (Entangling)",
 	"RANGED-EXPLOSIVES": "Ranged (Explosives)",
+	"RANGEDEXPLOSIVES": "Ranged (Explosives)",
 	"RANGED-SLING": "Ranged (Sling)",
+	"RANGEDSLING": "Ranged (Sling)",
 	"RANGED-THROWING": "Ranged (Throwing)",
+	"RANGEDTHROWING": "Ranged (Throwing)",
 	"LANG-MAGICK": "Language (Magick)",
+	"LANGMAGICK": "Language (Magick)",
 	"CHANNELLING-FIRE": "Channelling (Fire)",
+	"CHANNELLINGFIRE": "Channelling (Fire)",
 	"CHANNELLING-HEAVENS": "Channelling (Heavens)",
+	"CHANNELLINGHEAVENS": "Channelling (Heavens)",
 	"CHANNELLING-METAL": "Channelling (Metal)",
+	"CHANNELLINGMETAL": "Channelling (Metal)",
 	"CHANNELLING-BEASTS": "Channelling (Beasts)",
+	"CHANNELLINGBEASTS": "Channelling (Beasts)",
 	"CHANNELLING-LIFE": "Channelling (Life)",
+	"CHANNELLINGLIFE": "Channelling (Life)",
 	"CHANNELLING-LIGHT": "Channelling (Light)",
+	"CHANNELLINGLIGHT": "Channelling (Light)",
 	"CHANNELLING-DEATH": "Channelling (Death)",
+	"CHANNELLINGDEATH": "Channelling (Death)",
 	"CHANNELLING-SHADOWS": "Channelling (Shadows)",
+	"CHANNELLINGSHADOWS": "Channelling (Shadows)",
 	"CHANNELLING-WITCH": "Channelling (Witch)",
+	"CHANNELLINGWITCH": "Channelling (Witch)",
 	"CHANNELLING-DARK": "Channelling (Dark)",
+	"CHANNELLINGDARK": "Channelling (Dark)",
 	"CHANNELLING-CHAOS": "Channelling (Chaos)",
+	"CHANNELLINGCHAOS": "Channelling (Chaos)",
 	"CHANNELLING-MISC": "Channelling (Misc)",
+	"CHANNELLINGMISC": "Channelling (Misc)",
 	"ABBREVIATE-PROFICIENCY": "Prof?",
 	"CRAFTSMANSHIP": "Craftsmanship",
 	"ABBREVIATE-CRAFTSMANSHIP": "Craft",
@@ -1023,8 +1063,13 @@
 	"DICE-ROLLS": "Dice Rolls",
 	"MOVEMENT-ROLLS": "Movement Rolls",
 	"CURRENT-ATTACK-WEAPON": "Current Attack Weapon",
+	"MAINHAND-WEAPON": "Mainhand Weapon",
+	"MAIN-WEAPON": "Main|Off-hand",
 	"CURRENT-OPPOSED-WEAPON": "Current Opposed Weapon",
+	"OFFHAND-WEAPON": "Off-hand Weapon",
+	"OFF-WEAPON": "",
 	"CURRENT-RANGED-WEAPON": "Current Ranged Weapon",
+	"RANGED-WEAPON": "Ranged Weapon",
 	"CLIMBING": "Climing",
 	"FALLING": "Falling",
 	"LEAPING": "Leaping",
@@ -1067,7 +1112,7 @@
 	"PACKS-CARRIES": "Carries:",	
 	"VEHICLE": "Vehicle",
 	"VEHICLE-TOUGHNESS": "Toughness:",	
-	"VEHICLE-WOUNDS": "Wounds:",	
+	"VEHICLE-WOUNDS": "Wounds",	
 	"INVENTORY-NOTES": "INVENTORY NOTES",
 	"CS-UI-THEME": "CS UI Theme",
 	"ROLL-TYPE": "Roll Type",
@@ -1102,13 +1147,28 @@
 	"HEAL-DESC2": "+ SL",
 	"SKILLTEST-SUCCESS": "Skill Test Successful",
 	"SKILLTEST-FAILURE": "Skill Test Failed",
+	"SKILL-TEST-SUCCESS": "Skill Test Successful",
+	"SKILL-TEST-FAILURE": "Skill Test Failed",
+	"SKILL-TEST-MARGINAL-SUCCESS": "Skill Test - Marginal Success",
+	"SKILL-TEST-SUCCESS": "Skill Test - Success",
+	"SKILL-TEST-IMPRESSIVE-SUCCESS": "Skill Test - Impressive Success",
+	"SKILL-TEST-ASTOUNDING-SUCCESS": "Skill Test - Astounding Success",
+	"SKILL-TEST-MARGINAL-FAILURE": "Skill Test - Marginal Failure",
+	"SKILL-TEST-FAILURE": "Skill Test - Failure",
+	"SKILL-TEST-IMPRESSIVE-FAILURE": "Skill Test - Impressive Failure",
+	"SKILL-TEST-ASTOUNDING-FAILURE": "Skill Test - Astounding Failure",
+	"DAMAGING": "Damaging",
+	"UNIT-DIE": ": Unit Die",
 	"CASTING-SUCCESS": "Casting Test Successful",
+	"CASTING-FAILURE": "Casting Test Failure",
 	"PRAY-SUCCESS": "Pray Test Successful",
+	"PRAY-FAILURE": "Pray Test Failure",
 	"OPPOSED-SL": "Opposed SL",
 	"DISTANCE": "Distance",
 	"EQUIP-WEAPON": "Equip in Weapons Tab",
 	"TOTAL-WORN-ENC": "Total Worn Enc",
 	"MODIFIER": "Modifier",
+	"OFFHAND-PENALTY": "Off-hand Penalty",
 	"ABBREVIATE-RANGED": "Rgd?",
 	"SETTINGS-ROLL-OUTCOME": "Roll Outcome",
 	"SETTINGS-ROLL-OUTCOME-ATK": "Attack Roll Outcome",
@@ -1189,8 +1249,71 @@
 	"CORRUPTION-MAXMODTEXT": "(Pure Soul and other mods)",
 	"SKILLLABEL": "{ Char + Adv + Mod + Cond }",
 	"SKILLADV": "Modified by Advantage",
+	"SKILL-ARMOR-PENALTIES": "Modified by Armor Penalties",
 	"FREE-OTHER-XP": "FREE & OTHER XP",
 	"OTHER-XP": "Other XP",
+	"RATING": "Rating",	
+	"PARRY-BONUS": "Parry Bonus",
+	"PARRY-BONUS-DESC": "Parry Bonus Desc",
 	"EXP-SPENT": "Experience Spent",
-	"EXP-REMAINING": "Experience Remaining"
+	"TARGET-V-TEST": "Target v Test",
+	"TARGET-MODIFIERS": "Target Modifiers",
+	"ACCURATE-SHOT": "Accurate Shot",
+	"FAST": "Fast",
+	"FAST-EFFECT": "Fast: Defender -10 Roll if not Fast",
+	"SLOW": "Slow",
+	"SLOW-EFFECT": "Slow: Defender gains +1 SL Mod",
+	"TIRING": "Tiring",
+	"HACK": "Hack",
+	"HACK-EFFECT": "Hack: On hit HitLoc Armor Dmg +1",
+	"PUMMEL": "Pummel",
+	"PUMMEL-EFFECT": "Pummel: Opposed (Str/End) to Stun",
+	"PENETRATING": "Penetrating",
+	"PENETRATING-EFFECT": "Ignore Non-Metal AP & -1 AP Metal armor",
+	"RELOAD": "Reload",
+	"RELOAD-RATING": "Reload Rating",
+	"IMPACT-EFFECT": "Impact: Add",
+	"PRACTICAL": "Practical",
+	"PRECISE": "Precise",
+	"BLAST": "Blast",
+	"ACCURATE": "Accurate",
+	"BLACKPOWDER": "Blackpowder",
+	"BLACKPOWDER-EFFECT": "Target +20 Cool test or +1 Broken",
+	"AMBIDEXTROUS": "Ambidextrous",
+	"ANIMAL-AFFINITY": "Animal Affinity",
+	"ARCANE-MAGIC": "Arcane Magic",
+	"ACUTE-SENSE": "Acute Sense (Sense)",
+	"ANIMAL-AFFINITY": "Animal Affinity",
+	"ARCANE-MAGIC-LORE": "Arcane Magic (Lore)",
+	"ALLEY-CAT": "Alley Cat",
+	"GUNNER": "Gunner",
+	"REVERSAL": "Reversal",
+	"RIPOSTE": "Riposte",
+	"RIPOSTE-EFFECT": "Riposte",
+	"SHIELDSMAN": "Shieldsman",
+	"SHIELDSMAN-EFFECT": "Shieldsman: If Opp Roll lost",
+	"DANGEROUS": "Dangerous",
+	"IMPRECISE": "Imprecise",
+	"STRIKE-TO-INJURE": "Strike to Injure",
+	"FIRE": "Fire",
+	"HEAVENS": "Heavens",
+	"METAL": "Metal",
+	"BEASTS": "Beasts",
+	"LIFE": "Life",
+	"LIGHT": "Light",
+	"DEATH": "Death",
+	"SHADOWS": "Shadows",
+	"WITCH": "Witch",
+	"DARK": "Dark",
+	"CHAOS": "Chaos",
+	"MISC": "Misc",
+	"NO-RELOAD": "This Weapon doesnt have Reload!",
+	"EXP-REMAINING": "Experience Remaining",
+	"OPPOSED-ATTACK-MOD": "Opposed Attack Modifier",
+	"OPPOSED-DEFENSE-MOD": "Opposed Attack Modifier",
+	"RANGED-ATTACK-MOD": "Ranged Attack Modifier",
+	"INSUFFICIENT-SL": "Note: Insufficient Accu Ext SL",
+	"SHEET-INTEGRATION": "Talent Integrated",
+	"CUSTOM-MODIFIERS": "Add Custom & Situational Bonus manually:",
+	"CHARGE-NOTE": "Charge Attack"
 }
\ No newline at end of file

From b1eacc68d8d211d9a65828aa798cc7f4577619d3 Mon Sep 17 00:00:00 2001
From: Djjus <59532170+Djjus@users.noreply.github.com>
Date: Tue, 14 Sep 2021 18:44:21 +0100
Subject: [PATCH 2/9] fixes

---
 .../Warhammer 4e Character Sheet.html         | 138 ++++++++++++++----
 Warhammer 4e Character Sheet/translation.json |   9 +-
 2 files changed, 119 insertions(+), 28 deletions(-)

diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index 9e5f861dc7..9dc05613c0 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
@@ -17513,6 +17513,12 @@
 						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
 							<input type="checkbox" name="attr_MeleeSlow" value="1" />
 						</div>	
+						<div class="sheet-col-1-13 sheet-right">		
+						<span style="padding-left: 8px; font-size: 11px" data-i18n="DISTRACT">Distract</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_UsedWrap" value="1" />
+						</div>
 	
 					</div>	
 					
@@ -17549,6 +17555,18 @@
 						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
 							<input type="checkbox" name="attr_MeleePummel" value="1" />
 						</div>
+						<div class="sheet-col-1-10 sheet-right">		
+						<span style="padding-left: 8px; font-size: 11px; white-space: nowrap;" data-i18n="TRAP-BLADE">Trap Blade</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_UsedEntangle" value="1" />
+						</div>
+						<div class="sheet-col-1-13 sheet-right">		
+						<span style="padding-left: 8px; font-size: 11px" data-i18n="WRAP">Wrap</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_UsedWrap" value="1" />
+						</div>
 					</div>				
 					
 					
@@ -17597,7 +17615,7 @@
 				</div>
               </div>
 					<div class="sheet-row sheet-sub-header">
-						<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME-OPP" style="padding-left: 22px;">Opposed Roll Outcome</div>
+						<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="SETTINGS-ROLL-OUTCOME-OPP" style="padding-left: 22px; white-space: nowrap;">Opposed Roll Outcome</div>
 						<div class="sheet-col-3-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" style="padding-left: 123px;" data-i18n="SETTINGS-ROLL-TEXT">Text to show</div>
 						<div class="sheet-col-3-20 sheet-center sheet-small-label sheet-vert-middle" style="text-align: right; padding-right: 4px;" data-i18n="OPPOSED-SHOWDMG">Show Dmg/Hitloc</div>
 						<div class="sheet-col-1-50 sheet-center  sheet-vert-middle" style="margin-right: 12px;"><input type="checkbox" style="right: 15px" name="attr_OpposedDmg" value="1" /></div>					
@@ -17985,6 +18003,20 @@
 				<input type="checkbox" name="attr_RangedBlast" class="sheet-hidden sheet-hider" value="1"/>	
 						<div class="sheet-col-1-30 sheet-left sheet-pad-l-sm">
 							<input type="number" name="attr_RangedBlastRating" value="0" min="0" max="9"  style="height: 14px;"/>
+						</div>				
+						<div class="sheet-col-1-6 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="REPEATER">Repeater</span>
+						</div>	
+						<div class="sheet-col-1-15 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_RangedRepeater" value="1" />
+						</div>	
+				<input type="checkbox" name="attr_RangedRepeater" class="sheet-hidden sheet-hider" value="1"/>		
+						<div class="sheet-col-1-18 sheet-left">	
+						<span style="padding-left: 0px; font-size: 11px" data-i18n="RATING">Rating</span>
+						</div>	
+				<input type="checkbox" name="attr_RangedRepeater" class="sheet-hidden sheet-hider" value="1"/>	
+						<div class="sheet-col-1-30 sheet-left sheet-pad-l-sm">
+							<input type="number" name="attr_RangedRepeaterRating" value="0" min="0" max="9"  style="height: 14px;"/>
 						</div>	
 					</div>
 						
@@ -18052,6 +18084,12 @@
 						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
 							<input type="checkbox" name="attr_UsedImprecise" value="1" />
 						</div>
+						<div class="sheet-col-1-11 sheet-right">		
+						<span style="padding-left: 5px; font-size: 11px" data-i18n="ENTANGLE">Entangle</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_UsedImprecise" value="1" />
+						</div>
 					</div>	
 								
 		<span class="sheet-spacer"></span>	
@@ -22855,7 +22893,7 @@
 
 				{{#charge}}
 				<div class="sheet-row sheet-center">
-					<div class="sheet-col-1-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span  data-i18n="CHARGE-NOTE">Charge Attack</span> <span style="background-color:  yellow">+1 Adv</span></div>
+					<div class="sheet-col-1-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span  data-i18n="CHARGE-NOTE">Charge Attack</span></div>
 				</div>	
 				{{/charge}}	
 				{{#qualities}}
@@ -26674,6 +26712,12 @@
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-LEFT-ARM">Hit Left Arm</div>
 										</div>
 										{{/rollTotal() test 01}}
+										{{#rollTotal() test 02}}
+										<div class="sheet-row">
+											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
+											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-LEFT-ARM">Hit Left Arm</div>
+										</div>
+										{{/rollTotal() test 02}}
 										{{#rollTotal() test 11}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
@@ -27249,82 +27293,82 @@
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
-										</div>
 										{{#rollGreater() pummel 0}}	
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
 										{{/rollGreater() pummel 0}}
+										</div>
 										{{/rollTotal() test 10}}
 										{{#rollTotal() test 20}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
-										</div>
 										{{#rollGreater() pummel 0}}
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
 										{{/rollGreater() pummel 0}}
+										</div>
 										{{/rollTotal() test 20}}
 										{{#rollTotal() test 30}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
-										</div>
 										{{#rollGreater() pummel 0}}
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
 										{{/rollGreater() pummel 0}}
+										</div>
 										{{/rollTotal() test 30}}
 										{{#rollTotal() test 40}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
-										</div>
 										{{#rollGreater() pummel 0}}
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
 										{{/rollGreater() pummel 0}}
+										</div>
 										{{/rollTotal() test 40}}
 										{{#rollTotal() test 50}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
-										</div>
 										{{#rollGreater() pummel 0}}
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
 										{{/rollGreater() pummel 0}}
+										</div>
 										{{/rollTotal() test 50}}
 										{{#rollTotal() test 60}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
-										</div>
 										{{#rollGreater() pummel 0}}
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
 										{{/rollGreater() pummel 0}}
+										</div>
 										{{/rollTotal() test 60}}
 										{{#rollTotal() test 70}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
-										</div>
 										{{#rollGreater() pummel 0}}
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
 										{{/rollGreater() pummel 0}}
+										</div>
 										{{/rollTotal() test 70}}
 										{{#rollTotal() test 80}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
-										</div>
 										{{#rollGreater() pummel 0}}
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
 										{{/rollGreater() pummel 0}}
+										</div>
 										{{/rollTotal() test 80}}
 										{{#rollTotal() test 90}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-HEAD">Hit Head</div>
-										</div>
 										{{#rollGreater() pummel 0}}
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide"><span style="margin-right: 3px; color: #858585" data-i18n="PUMMEL-EFFECT">Head hits stun (Opposed Str/End)</span></div>
 										{{/rollGreater() pummel 0}}
+										</div>
 										{{/rollTotal() test 90}}
 										
 										
@@ -27335,6 +27379,12 @@
 											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-LEFT-ARM">Hit Left Arm</div>
 										</div>
 										{{/rollTotal() test 01}}
+										{{#rollTotal() test 02}}
+										<div class="sheet-row">
+											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
+											<div class="sheet-col-13-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" data-i18n="HIT-LEFT-ARM">Hit Left Arm</div>
+										</div>
+										{{/rollTotal() test 02}}
 										{{#rollTotal() test 11}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="HIT-LOCATION">Hit Location</div>
@@ -27891,9 +27941,21 @@
 										{{#damage}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="DAMAGE">Damage</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-rt-key">{{damage}} <span style="color: #858585; font-size: 11px;">+ </span><span data-i18n="OPPOSED-SL" style="color: #858585; font-size: 11px;">Opposed SL</span> </div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-rt-key">{{damage}} <span style="color: #858585; font-size: 11px;"> 
+											
+											
+										{{#rollGreater() damaging 0}} {{#rollTotal() tiring 0}}+ </span><span data-i18n="OPPOSED-SL-UD" style="color: #858585; font-size: 10px;"></span>{{/rollTotal() tiring 0}} {{/rollGreater() damaging 0}}
+										
+										
+										{{#rollTotal() damaging 0}}+ </span><span data-i18n="OPPOSED-SL" style="color: #858585; font-size: 11px;">Opposed SL</span>{{/rollTotal() damaging 0}}
+											</div>
+											
+										{{#rollGreater() impact 0}}	{{#rollTotal() tiring 0}}	
+											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" style="color: #858585;" data-i18n="IMPACT">Impact</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-rt-key sheet-rt-no-border">+{{computed::test}}</div>
+										{{/rollTotal() tiring 0}} {{/rollGreater() impact 0}}
 										</div>
-										{{/damage}}
+										{{/damage}}	
 										{{/rollGreater() showdmg 0}}
 										{{/attacktest}}
 										
@@ -27903,8 +27965,7 @@
 										<div class="sheet-row">
 										{{#rollGreater() showdmg 0}}
 										{{#rollGreater() damaging 0}}
-											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>		
-											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-rt-no-border" style="color: #858585; border: 0xp"><span data-i18n="DAMAGING">Damaging</span><span style="margin-right: 3px" data-i18n="UNIT-DIE">Unit Die</span>({{computed::test}})</div>							
+											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>						
 										{{/rollGreater() damaging 0}}
 										{{#rollTotal() damaging 0}}{{#rollGreater() fast 0}}
 											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>
@@ -27919,9 +27980,12 @@
 											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>
 										{{/rollGreater() penetrating 0}} {{/rollTotal() hack 0}}{{/rollTotal() slow 0}}{{/rollTotal() fast 0}}{{/rollTotal() damaging 0}}
 										
-										{{#rollGreater() impact 0}}	{{#rollTotal() tiring 0}}	
-											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects" style="color: #858585"><span style="margin-right: 3px;" data-i18n="IMPACT-EFFECT">Impact: Add</span>+{{computed::test}}<span data-i18n="DMG"></span></div>
-										{{/rollTotal() tiring 0}} {{/rollGreater() impact 0}}	
+										{{#rollGreater() damaging 0}} {{#rollTotal() tiring 0}}
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-rt-no-border" style="color: #858585; border: 0xp"><span data-i18n="DAMAGING">Damaging</span><span style="margin-right: 3px" data-i18n="UNIT-DIE">Unit Die</span>({{computed::test}})</div>					
+										{{/rollTotal() tiring 0}} {{/rollGreater() damaging 0}}
+										{{#^rollTotal() tiring 0}}
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-rt-no-border" style="color: #858585; border: 0xp"><span data-i18n="TIRING">Tiring</span></div>								
+										{{/^rollTotal() tiring 0}}
 										{{#rollGreater() fast 0}}
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="FAST-EFFECT">Fast: Opposed -10 Roll if not Fast</span></div>
 										{{/rollGreater() fast 0}}
@@ -27949,7 +28013,7 @@
 										{{/rollGreater() riposte 0}} {{/^rollGreater() showdmg 0}}
 										
 										{{#rollGreater() riposte 0}} 
-											<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects" style="color: #858585"><span data-i18n="RIPOSTE"></span>{{riposte}}: <span class="sheet-chat-button-ripostedmg" style="height: 10px">{{RTriposte}}</span></div>
+											<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects" style="color: #858585"><span data-i18n="RIPOSTE"></span>: <span class="sheet-chat-button-ripostedmg" style="height: 10px" data-i18n-title=""USE-RIPOSTE" >{{RTriposte}}</span></div>
 										{{/rollGreater() riposte 0}}
 										
 										{{#rollTotal() damaging 0}}{{#rollTotal() fast 0}}{{#rollTotal() slow 0}}{{#rollTotal() hack 0}} {{#rollTotal() penetrating 0}} {{#rollTotal() riposte 0}} {{#rollGreater() shieldsman 0}}
@@ -32194,7 +32258,12 @@ on("change:repeating_ranged:UsedRanged", function (event) {
 						"Used_RangedBlackpowder": '0',
 						"Used_RangedDamaging": '0',
 						"Used_RangedReload": '0',
-						"Used_RangedReloadRating": '0',
+						"Used_RangedReloadRatingInput": '0',
+						"Used_RangedBlast": '0',
+						"Used_RangedBlastRating": '0',
+						"Used_RangedRepeater": '0',
+						"Used_RangedRepeaterRating": '0',
+						"Used_RangedEntangle": '0',
 						"Used_Ranged_modtype1": '',
 						"Used_Ranged_mod1": '',
 						"Used_Ranged_modtype2": '',
@@ -32212,7 +32281,7 @@ on("change:repeating_ranged:UsedRanged", function (event) {
                     setAttrs(output, {silent: true});
                     // we use silent:true, so this change doesnt trigger the sheet worker again.
 
-   getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedAccurate","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_RangedReloadRatingInput","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
+   getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedAccurate","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedReload","repeating_ranged_RangedReloadRatingInput","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
    
    
   console.log("Ranged change");
@@ -32241,6 +32310,11 @@ on("change:repeating_ranged:UsedRanged", function (event) {
 				"Used_RangedDamaging": v.repeating_ranged_UsedDamaging,
 				"Used_RangedReload": v.repeating_ranged_RangedReload,
 				"Used_RangedReloadRatingInput": v.repeating_ranged_RangedReloadRatingInput,
+				"Used_RangedBlast": v.repeating_ranged_RangedBlast,
+				"Used_RangedBlastRating": v.repeating_ranged_RangedBlastRating,
+				"Used_RangedRepeater": v.repeating_ranged_RangedRepeater,
+				"Used_RangedRepeaterRating": v.repeating_ranged_RangedRepeaterRating,
+				"Used_RangedEntangle": v.repeating_ranged_RangedEntangle,
 				"Used_Ranged_modtype1": v.repeating_ranged_RangedWeapon_modtype1,
 				"Used_Ranged_mod1": v.repeating_ranged_RangedWeapon_mod1,
 				"Used_Ranged_modtype2": v.repeating_ranged_RangedWeapon_modtype2,
@@ -32256,13 +32330,13 @@ on("change:repeating_ranged:UsedRanged", function (event) {
 });		
 			
 		
-on('change:repeating_ranged:RangedWeapon_settings_hide change:repeating_ranged:RangedWeaponName change:repeating_ranged:RangedBalisticSkill change:repeating_ranged:RangedBonus change:repeating_ranged:RangedStrengthBonus change:repeating_ranged:RangedDamageBonus change:repeating_ranged:WeaponRange change:repeating_ranged:RangedAmmo change:repeating_ranged:RangedAmmoType change:repeating_ranged:RangedDamage change:repeating_ranged:RangedQualities change:repeating_ranged:RangedImpale change:repeating_ranged:RangedAccurate change:repeating_ranged:RangedPrecise change:repeating_ranged:RangedPractical change:repeating_ranged:RangedPenetrating change:repeating_ranged:RangedBlackpowder change:repeating_ranged:UsedDamaging change:repeating_ranged:RangedReload change:repeating_ranged:RangedReload change:repeating_ranged:RangedReloadRatingInput change:repeating_ranged:RangedWeapon_modtype1 change:repeating_ranged:RangedWeapon_mod1 change:repeating_ranged:RangedWeapon_modtype2 change:repeating_ranged:RangedWeapon_mod2 change:repeating_ranged:RangedWeapon_modtype3 change:repeating_ranged:RangedWeapon_mod3', function(event){
+on('change:repeating_ranged:RangedWeapon_settings_hide change:repeating_ranged:RangedWeaponName change:repeating_ranged:RangedBalisticSkill change:repeating_ranged:RangedBonus change:repeating_ranged:RangedStrengthBonus change:repeating_ranged:RangedDamageBonus change:repeating_ranged:WeaponRange change:repeating_ranged:RangedAmmo change:repeating_ranged:RangedAmmoType change:repeating_ranged:RangedDamage change:repeating_ranged:RangedQualities change:repeating_ranged:RangedImpale change:repeating_ranged:RangedAccurate change:repeating_ranged:RangedPrecise change:repeating_ranged:RangedPractical change:repeating_ranged:RangedBlast change:repeating_ranged:RangedBlastRating change:repeating_ranged:RangedRepeater change:repeating_ranged:RangedRepeaterRating change:repeating_ranged:RangedEntangle change:repeating_ranged:RangedPenetrating change:repeating_ranged:UsedBlackpowder change:repeating_ranged:UsedDamaging change:repeating_ranged:RangedReload change:repeating_ranged:RangedReload change:repeating_ranged:RangedReloadRatingInput change:repeating_ranged:RangedWeapon_modtype1 change:repeating_ranged:RangedWeapon_mod1 change:repeating_ranged:RangedWeapon_modtype2 change:repeating_ranged:RangedWeapon_mod2 change:repeating_ranged:RangedWeapon_modtype3 change:repeating_ranged:RangedWeapon_mod3', function(event){
 	if (event.sourceType === 'sheetworker') return;
 	const playerclickedid = event.sourceAttribute.split('_')[2] || '';
 	getSectionIDs("repeating_ranged", function (ids) {
 		ids.forEach(id => {
 			if(playerclickedid.toLowerCase() == id.toLowerCase()) {
-				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
+				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_RangedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
 					if(v.repeating_ranged_UsedRanged == 1)
 					{
 						setAttrs(
@@ -32286,6 +32360,11 @@ on('change:repeating_ranged:RangedWeapon_settings_hide change:repeating_ranged:R
 							"Used_RangedDamaging": v.repeating_ranged_UsedDamaging,
 							"Used_RangedReload": v.repeating_ranged_RangedReload,
 							"Used_RangedReloadRatingInput": v.repeating_ranged_RangedReloadRatingInput,
+							"Used_RangedBlast": v.repeating_ranged_RangedBlast,
+							"Used_RangedBlastRating": v.repeating_ranged_RangedBlastRating,
+							"Used_RangedRepeater": v.repeating_ranged_RangedRepeater,
+							"Used_RangedRepeaterRating": v.repeating_ranged_RangedRepeaterRating,
+							"Used_RangedEntangle": v.repeating_ranged_RangedEntangle,
 							"Used_Ranged_modtype1": v.repeating_ranged_RangedWeapon_modtype1,
 							"Used_Ranged_mod1": v.repeating_ranged_RangedWeapon_mod1,
 							"Used_Ranged_modtype2": v.repeating_ranged_RangedWeapon_modtype2,
@@ -32306,7 +32385,7 @@ on('sheet:opened', function(event){
 	if (event.sourceType === 'sheetworker') return;
 	getSectionIDs("repeating_ranged", function (ids) {
 		ids.forEach(id => {
-				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
+				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_RangedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
 					if(v.repeating_ranged_UsedRanged == 1)
 					{
 						setAttrs(
@@ -32330,6 +32409,11 @@ on('sheet:opened', function(event){
 							"Used_RangedDamaging": v.repeating_ranged_UsedDamaging,
 							"Used_RangedReload": v.repeating_ranged_RangedReload,
 							"Used_RangedReloadRatingInput": v.repeating_ranged_RangedReloadRatingInput,
+							"Used_RangedBlast": v.repeating_ranged_RangedBlast,
+							"Used_RangedBlastRating": v.repeating_ranged_RangedBlastRating,
+							"Used_RangedRepeater": v.repeating_ranged_RangedRepeater,
+							"Used_RangedRepeaterRating": v.repeating_ranged_RangedRepeaterRating,
+							"Used_RangedEntangle": v.repeating_ranged_RangedEntangle,
 							"Used_Ranged_modtype1": v.repeating_ranged_RangedWeapon_modtype1,
 							"Used_Ranged_mod1": v.repeating_ranged_RangedWeapon_mod1,
 							"Used_Ranged_modtype2": v.repeating_ranged_RangedWeapon_modtype2,
@@ -34113,7 +34197,7 @@ on('clicked:meleechargemain', (eventInfo) => {
 	    }, {silent: true});	
 	
 	
-   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_MeleePrecise}+@{Used_MeleePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkMain}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Charge Attack Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{CHARGE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Charge Attack Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}meleechargemain)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{fast=[[@{Used_MeleeFast}]]}} {{slow=[[@{Used_MeleeSlow}]]}} {{hack=[[@{Used_MeleeHack}]]}} {{precise=[[@{Used_MeleePrecise}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[@{Used_MeleeTiring}]]}} {{penetrating=[[@{Used_MeleePenetrating}]]}} {{pummel=[[@{Used_MeleePummel}]]}} {{practical=[[@{Used_MeleePractical}]]}} {{charge=true}} ';
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_MeleePrecise}+@{Used_MeleePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkMain}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Charge Attack Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{CHARGE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Charge Attack Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}meleechargemain)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{fast=[[@{Used_MeleeFast}]]}} {{slow=[[@{Used_MeleeSlow}]]}} {{hack=[[@{Used_MeleeHack}]]}} {{precise=[[@{Used_MeleePrecise}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[0]]}} {{penetrating=[[@{Used_MeleePenetrating}]]}} {{pummel=[[@{Used_MeleePummel}]]}} {{practical=[[@{Used_MeleePractical}]]}} {{charge=true}} ';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
    let rollBegins = '@{Whisper} &{template:wfrp4e}';
@@ -34308,7 +34392,7 @@ on('clicked:meleechargeoff', (eventInfo) => {
 	    }, {silent: true});	
 	
 	
-   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_DefensePrecise}+@{Used_DefensePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkOff}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Charge Attack Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{CHARGE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Charge Attack Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Defense_att_modtype1}]]}} {{mod1=@{Used_Defense_att_mod1}}} {{mod2type=[[@{Used_Defense_att_modtype2}]]}} {{mod2=@{Used_Defense_att_mod2}}} {{mod3type=[[@{Used_Defense_att_modtype3}]]}} {{mod3=@{Used_Defense_att_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}meleechargeoff)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{fast=[[@{Used_DefenseFast}]]}} {{slow=[[@{Used_DefenseSlow}]]}} {{hack=[[@{Used_DefenseHack}]]}} {{precise=[[@{Used_MeleePrecise}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[@{Used_DefenseTiring}]]}} {{penetrating=[[@{Used_DefensePenetrating}]]}} {{pummel=[[@{Used_DefensePummel}]]}} {{practical=[[@{Used_DefensePractical}]]}} {{charge=true}} ';
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_DefensePrecise}+@{Used_DefensePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkOff}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Charge Attack Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{CHARGE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Charge Attack Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Defense_att_modtype1}]]}} {{mod1=@{Used_Defense_att_mod1}}} {{mod2type=[[@{Used_Defense_att_modtype2}]]}} {{mod2=@{Used_Defense_att_mod2}}} {{mod3type=[[@{Used_Defense_att_modtype3}]]}} {{mod3=@{Used_Defense_att_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}meleechargeoff)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{fast=[[@{Used_DefenseFast}]]}} {{slow=[[@{Used_DefenseSlow}]]}} {{hack=[[@{Used_DefenseHack}]]}} {{precise=[[@{Used_MeleePrecise}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[0]]}} {{penetrating=[[@{Used_DefensePenetrating}]]}} {{pummel=[[@{Used_DefensePummel}]]}} {{practical=[[@{Used_DefensePractical}]]}} {{charge=true}} ';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
    let rollBegins = '@{Whisper} &{template:wfrp4e}';
@@ -34446,7 +34530,7 @@ on('clicked:ripostedmgoff', (eventInfo) => {
 on('clicked:rangedatk', (eventInfo) => {
 	getAttrs(["initiative_houserule"], function(v) {	
 	
-   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_RangedPrecise}+@{Used_RangedPractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusRgd}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Ranged Attack Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}+(10*@{Used_RangedAccurate})]] [SKILL] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_RangedDamaging}]]}} {{reach=@{Used_WeaponRange}}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}+@{Talent_AccurateShotLvl}]]}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAtk)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{precise=[[@{Used_RangedPrecise}]]}} {{penetrating=[[@{Used_RangedPenetrating}]]}} {{blackpowder=[[@{Used_RangedBlackpowder}]]}} {{practical=[[@{Used_RangedPractical}]]}} {{accurate=[[@{Used_RangedAccurate}*10]]}}';
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_RangedPrecise}+@{Used_RangedPractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusRgd}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Ranged Attack Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[10*@{Used_RangedAccurate}]] [TALENTS] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_RangedDamaging}]]}} {{reach=@{Used_WeaponRange}}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}+@{Talent_AccurateShotLvl}]]}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAtk)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{precise=[[@{Used_RangedPrecise}]]}} {{penetrating=[[@{Used_RangedPenetrating}]]}} {{tiring=[[0]]}} {{blackpowder=[[@{Used_RangedBlackpowder}]]}} {{practical=[[@{Used_RangedPractical}]]}} {{accurate=[[@{Used_RangedAccurate}*10]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
    let rollBegins = '@{Whisper} &{template:wfrp4e}';
diff --git a/Warhammer 4e Character Sheet/translation.json b/Warhammer 4e Character Sheet/translation.json
index 9fb5db20ab..ba7a428ac6 100644
--- a/Warhammer 4e Character Sheet/translation.json	
+++ b/Warhammer 4e Character Sheet/translation.json	
@@ -1164,6 +1164,7 @@
 	"PRAY-SUCCESS": "Pray Test Successful",
 	"PRAY-FAILURE": "Pray Test Failure",
 	"OPPOSED-SL": "Opposed SL",
+	"OPPOSED-SL-UD": "Opp SL/Unit Die",
 	"DISTANCE": "Distance",
 	"EQUIP-WEAPON": "Equip in Weapons Tab",
 	"TOTAL-WORN-ENC": "Total Worn Enc",
@@ -1277,6 +1278,11 @@
 	"PRECISE": "Precise",
 	"BLAST": "Blast",
 	"ACCURATE": "Accurate",
+	"DISTRACT": "Distract",
+	"WRAP": "Wrap",
+	"ENTANGLE": "Entangle",
+	"REPEATER": "Repeater",
+	"TRAP-BLADE": "Trap Blade",
 	"BLACKPOWDER": "Blackpowder",
 	"BLACKPOWDER-EFFECT": "Target +20 Cool test or +1 Broken",
 	"AMBIDEXTROUS": "Ambidextrous",
@@ -1290,6 +1296,7 @@
 	"REVERSAL": "Reversal",
 	"RIPOSTE": "Riposte",
 	"RIPOSTE-EFFECT": "Riposte",
+	"USE-RIPOSTE": "Use Riposte",
 	"SHIELDSMAN": "Shieldsman",
 	"SHIELDSMAN-EFFECT": "Shieldsman: If Opp Roll lost",
 	"DANGEROUS": "Dangerous",
@@ -1315,5 +1322,5 @@
 	"INSUFFICIENT-SL": "Note: Insufficient Accu Ext SL",
 	"SHEET-INTEGRATION": "Talent Integrated",
 	"CUSTOM-MODIFIERS": "Add Custom & Situational Bonus manually:",
-	"CHARGE-NOTE": "Charge Attack"
+	"CHARGE-NOTE": "Charge Attack +1 Adv Added"
 }
\ No newline at end of file

From e08737fa5473cada38247ebc9659af7c0d0931bd Mon Sep 17 00:00:00 2001
From: Djjus <59532170+Djjus@users.noreply.github.com>
Date: Tue, 14 Sep 2021 19:46:08 +0100
Subject: [PATCH 3/9] added more qualities to custom parser

---
 .../Warhammer 4e Character Sheet.css          |  6 +--
 .../Warhammer 4e Character Sheet.html         | 52 +++++++++----------
 Warhammer 4e Character Sheet/translation.json |  4 +-
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css
index 0185a8f073..9a64162d15 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css	
@@ -2094,7 +2094,7 @@ select.sheet-inv-select{
 	select.sheet-combat-select{
 		height: 24px !important;
 		margin-top: 0px !important;
-		text-indent: 18px !important;
+		text-indent: 7px !important;
 		text-align-last: center;
 	}
 }
@@ -2102,7 +2102,7 @@ select.sheet-inv-select{
 	select.sheet-combat-select{
 		height: 24px !important;
 		margin-top: 0px !important;
-		text-indent: 18px !important;
+		text-indent: 7px !important;
 		text-align-last: center;
 	}
 }
@@ -2110,7 +2110,7 @@ select.sheet-inv-select{
 	select.sheet-combat-select{
 		height: 24px !important;
 		margin-top: 0px !important;
-		text-indent: 18px !important;
+		text-indent: 7px !important;
 		text-align-last: center;
 	}
 }
diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index 9dc05613c0..ea5dd90271 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
@@ -17559,7 +17559,7 @@
 						<span style="padding-left: 8px; font-size: 11px; white-space: nowrap;" data-i18n="TRAP-BLADE">Trap Blade</span>
 						</div>	
 						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
-							<input type="checkbox" name="attr_UsedEntangle" value="1" />
+							<input type="checkbox" name="attr_UsedTrapBlade" value="1" />
 						</div>
 						<div class="sheet-col-1-13 sheet-right">		
 						<span style="padding-left: 8px; font-size: 11px" data-i18n="WRAP">Wrap</span>
@@ -18088,7 +18088,7 @@
 						<span style="padding-left: 5px; font-size: 11px" data-i18n="ENTANGLE">Entangle</span>
 						</div>	
 						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
-							<input type="checkbox" name="attr_UsedImprecise" value="1" />
+							<input type="checkbox" name="attr_UsedEntangle" value="1" />
 						</div>
 					</div>	
 								
@@ -27954,6 +27954,13 @@
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" style="color: #858585;" data-i18n="IMPACT">Impact</div>
 											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-rt-key sheet-rt-no-border">+{{computed::test}}</div>
 										{{/rollTotal() tiring 0}} {{/rollGreater() impact 0}}
+										{{#rollGreater() damaging 0}} {{#rollTotal() tiring 0}}
+											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" style="color: #858585;" data-i18n="DAMAGING">Damaging</div>
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-rt-key sheet-rt-no-border" style="color: #858585;" >({{computed::test}}) <span style="margin-right: 3px" data-i18n="UNIT-DIE">Unit Die</span></div>		
+										{{/rollTotal() tiring 0}} {{/rollGreater() damaging 0}}
+										{{#rollGreater() blast 0}}		
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="BLAST-EFFECT">Blast: Dmg hits all within</span> {{blast}} <span style="margin-right: 3px; color: #858585" data-i18n="YDS">yds</span> </div>
+										{{/rollGreater() blast 0}}
 										</div>
 										{{/damage}}	
 										{{/rollGreater() showdmg 0}}
@@ -27964,25 +27971,19 @@
 										{{#attacktest}}
 										<div class="sheet-row">
 										{{#rollGreater() showdmg 0}}
-										{{#rollGreater() damaging 0}}
-											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>						
-										{{/rollGreater() damaging 0}}
-										{{#rollTotal() damaging 0}}{{#rollGreater() fast 0}}
+										{{#rollGreater() penetrating 0}}
 											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>
-										{{/rollGreater() fast 0}}{{/rollTotal() damaging 0}}
-										{{#rollTotal() damaging 0}}{{#rollTotal() fast 0}}{{#rollGreater() slow 0}}
+										{{/rollGreater() penetrating 0}}
+										{{#rollTotal() penetrating 0}}{{#rollGreater() slow 0}}
 											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>
-										{{/rollGreater() slow 0}}{{/rollTotal() fast 0}}{{/rollTotal() damaging 0}}
-										{{#rollTotal() damaging 0}}{{#rollTotal() fast 0}}{{#rollTotal() slow 0}}{{#rollGreater() hack 0}}
+										{{/rollGreater() slow 0}}{{/rollTotal() penetrating 0}}
+										{{#rollTotal() penetrating 0}}{{#rollTotal() slow 0}}{{#rollGreater() hack 0}}
 											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>
-										{{/rollGreater() hack 0}}{{/rollTotal() slow 0}}{{/rollTotal() fast 0}}{{/rollTotal() damaging 0}}
-										{{#rollTotal() damaging 0}}{{#rollTotal() fast 0}}{{#rollTotal() slow 0}}{{#rollTotal() hack 0}} {{#rollGreater() penetrating 0}}
+										{{/rollGreater() hack 0}}{{/rollTotal() slow 0}}{{/rollTotal() penetrating 0}}
+										{{#rollTotal() penetrating 0}}{{#rollTotal() slow 0}}{{#rollTotal() hack 0}} {{#rollGreater() fast 0}}
 											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>
-										{{/rollGreater() penetrating 0}} {{/rollTotal() hack 0}}{{/rollTotal() slow 0}}{{/rollTotal() fast 0}}{{/rollTotal() damaging 0}}
+										{{/rollGreater() fast 0}} {{/rollTotal() hack 0}}{{/rollTotal() slow 0}}{{/rollTotal() penetrating 0}}
 										
-										{{#rollGreater() damaging 0}} {{#rollTotal() tiring 0}}
-											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-rt-no-border" style="color: #858585; border: 0xp"><span data-i18n="DAMAGING">Damaging</span><span style="margin-right: 3px" data-i18n="UNIT-DIE">Unit Die</span>({{computed::test}})</div>					
-										{{/rollTotal() tiring 0}} {{/rollGreater() damaging 0}}
 										{{#^rollTotal() tiring 0}}
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-rt-no-border" style="color: #858585; border: 0xp"><span data-i18n="TIRING">Tiring</span></div>								
 										{{/^rollTotal() tiring 0}}
@@ -28013,7 +28014,7 @@
 										{{/rollGreater() riposte 0}} {{/^rollGreater() showdmg 0}}
 										
 										{{#rollGreater() riposte 0}} 
-											<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects" style="color: #858585"><span data-i18n="RIPOSTE"></span>: <span class="sheet-chat-button-ripostedmg" style="height: 10px" data-i18n-title=""USE-RIPOSTE" >{{RTriposte}}</span></div>
+											<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects" style="color: #858585"><span data-i18n="RIPOSTE"></span>: <span class="sheet-chat-button-ripostedmg" style="height: 10px" data-i18n-title="USE-RIPOSTE" >{{RTriposte}}</span></div>
 										{{/rollGreater() riposte 0}}
 										
 										{{#rollTotal() damaging 0}}{{#rollTotal() fast 0}}{{#rollTotal() slow 0}}{{#rollTotal() hack 0}} {{#rollTotal() penetrating 0}} {{#rollTotal() riposte 0}} {{#rollGreater() shieldsman 0}}
@@ -32281,7 +32282,7 @@ on("change:repeating_ranged:UsedRanged", function (event) {
                     setAttrs(output, {silent: true});
                     // we use silent:true, so this change doesnt trigger the sheet worker again.
 
-   getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedAccurate","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedReload","repeating_ranged_RangedReloadRatingInput","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
+   getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedAccurate","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_UsedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedReload","repeating_ranged_RangedReloadRatingInput","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
    
    
   console.log("Ranged change");
@@ -32314,7 +32315,7 @@ on("change:repeating_ranged:UsedRanged", function (event) {
 				"Used_RangedBlastRating": v.repeating_ranged_RangedBlastRating,
 				"Used_RangedRepeater": v.repeating_ranged_RangedRepeater,
 				"Used_RangedRepeaterRating": v.repeating_ranged_RangedRepeaterRating,
-				"Used_RangedEntangle": v.repeating_ranged_RangedEntangle,
+				"Used_RangedEntangle": v.repeating_ranged_UsedEntangle,
 				"Used_Ranged_modtype1": v.repeating_ranged_RangedWeapon_modtype1,
 				"Used_Ranged_mod1": v.repeating_ranged_RangedWeapon_mod1,
 				"Used_Ranged_modtype2": v.repeating_ranged_RangedWeapon_modtype2,
@@ -32330,13 +32331,13 @@ on("change:repeating_ranged:UsedRanged", function (event) {
 });		
 			
 		
-on('change:repeating_ranged:RangedWeapon_settings_hide change:repeating_ranged:RangedWeaponName change:repeating_ranged:RangedBalisticSkill change:repeating_ranged:RangedBonus change:repeating_ranged:RangedStrengthBonus change:repeating_ranged:RangedDamageBonus change:repeating_ranged:WeaponRange change:repeating_ranged:RangedAmmo change:repeating_ranged:RangedAmmoType change:repeating_ranged:RangedDamage change:repeating_ranged:RangedQualities change:repeating_ranged:RangedImpale change:repeating_ranged:RangedAccurate change:repeating_ranged:RangedPrecise change:repeating_ranged:RangedPractical change:repeating_ranged:RangedBlast change:repeating_ranged:RangedBlastRating change:repeating_ranged:RangedRepeater change:repeating_ranged:RangedRepeaterRating change:repeating_ranged:RangedEntangle change:repeating_ranged:RangedPenetrating change:repeating_ranged:UsedBlackpowder change:repeating_ranged:UsedDamaging change:repeating_ranged:RangedReload change:repeating_ranged:RangedReload change:repeating_ranged:RangedReloadRatingInput change:repeating_ranged:RangedWeapon_modtype1 change:repeating_ranged:RangedWeapon_mod1 change:repeating_ranged:RangedWeapon_modtype2 change:repeating_ranged:RangedWeapon_mod2 change:repeating_ranged:RangedWeapon_modtype3 change:repeating_ranged:RangedWeapon_mod3', function(event){
+on('change:repeating_ranged:RangedWeapon_settings_hide change:repeating_ranged:RangedWeaponName change:repeating_ranged:RangedBalisticSkill change:repeating_ranged:RangedBonus change:repeating_ranged:RangedStrengthBonus change:repeating_ranged:RangedDamageBonus change:repeating_ranged:WeaponRange change:repeating_ranged:RangedAmmo change:repeating_ranged:RangedAmmoType change:repeating_ranged:RangedDamage change:repeating_ranged:RangedQualities change:repeating_ranged:RangedImpale change:repeating_ranged:RangedAccurate change:repeating_ranged:RangedPrecise change:repeating_ranged:RangedPractical change:repeating_ranged:RangedBlast change:repeating_ranged:RangedBlastRating change:repeating_ranged:RangedRepeater change:repeating_ranged:RangedRepeaterRating change:repeating_ranged:UsedEntangle change:repeating_ranged:RangedPenetrating change:repeating_ranged:UsedBlackpowder change:repeating_ranged:UsedDamaging change:repeating_ranged:RangedReload change:repeating_ranged:RangedReload change:repeating_ranged:RangedReloadRatingInput change:repeating_ranged:RangedWeapon_modtype1 change:repeating_ranged:RangedWeapon_mod1 change:repeating_ranged:RangedWeapon_modtype2 change:repeating_ranged:RangedWeapon_mod2 change:repeating_ranged:RangedWeapon_modtype3 change:repeating_ranged:RangedWeapon_mod3', function(event){
 	if (event.sourceType === 'sheetworker') return;
 	const playerclickedid = event.sourceAttribute.split('_')[2] || '';
 	getSectionIDs("repeating_ranged", function (ids) {
 		ids.forEach(id => {
 			if(playerclickedid.toLowerCase() == id.toLowerCase()) {
-				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_RangedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
+				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_UsedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
 					if(v.repeating_ranged_UsedRanged == 1)
 					{
 						setAttrs(
@@ -32364,7 +32365,7 @@ on('change:repeating_ranged:RangedWeapon_settings_hide change:repeating_ranged:R
 							"Used_RangedBlastRating": v.repeating_ranged_RangedBlastRating,
 							"Used_RangedRepeater": v.repeating_ranged_RangedRepeater,
 							"Used_RangedRepeaterRating": v.repeating_ranged_RangedRepeaterRating,
-							"Used_RangedEntangle": v.repeating_ranged_RangedEntangle,
+							"Used_RangedEntangle": v.repeating_ranged_UsedEntangle,
 							"Used_Ranged_modtype1": v.repeating_ranged_RangedWeapon_modtype1,
 							"Used_Ranged_mod1": v.repeating_ranged_RangedWeapon_mod1,
 							"Used_Ranged_modtype2": v.repeating_ranged_RangedWeapon_modtype2,
@@ -32385,7 +32386,7 @@ on('sheet:opened', function(event){
 	if (event.sourceType === 'sheetworker') return;
 	getSectionIDs("repeating_ranged", function (ids) {
 		ids.forEach(id => {
-				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_RangedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
+				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_UsedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
 					if(v.repeating_ranged_UsedRanged == 1)
 					{
 						setAttrs(
@@ -32413,7 +32414,7 @@ on('sheet:opened', function(event){
 							"Used_RangedBlastRating": v.repeating_ranged_RangedBlastRating,
 							"Used_RangedRepeater": v.repeating_ranged_RangedRepeater,
 							"Used_RangedRepeaterRating": v.repeating_ranged_RangedRepeaterRating,
-							"Used_RangedEntangle": v.repeating_ranged_RangedEntangle,
+							"Used_RangedEntangle": v.repeating_ranged_UsedEntangle,
 							"Used_Ranged_modtype1": v.repeating_ranged_RangedWeapon_modtype1,
 							"Used_Ranged_mod1": v.repeating_ranged_RangedWeapon_mod1,
 							"Used_Ranged_modtype2": v.repeating_ranged_RangedWeapon_modtype2,
@@ -34530,12 +34531,11 @@ on('clicked:ripostedmgoff', (eventInfo) => {
 on('clicked:rangedatk', (eventInfo) => {
 	getAttrs(["initiative_houserule"], function(v) {	
 	
-   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_RangedPrecise}+@{Used_RangedPractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusRgd}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Ranged Attack Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[10*@{Used_RangedAccurate}]] [TALENTS] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_RangedDamaging}]]}} {{reach=@{Used_WeaponRange}}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}+@{Talent_AccurateShotLvl}]]}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAtk)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{precise=[[@{Used_RangedPrecise}]]}} {{penetrating=[[@{Used_RangedPenetrating}]]}} {{tiring=[[0]]}} {{blackpowder=[[@{Used_RangedBlackpowder}]]}} {{practical=[[@{Used_RangedPractical}]]}} {{accurate=[[@{Used_RangedAccurate}*10]]}}';
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_RangedPrecise}+@{Used_RangedPractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusRgd}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Ranged Attack Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[10*@{Used_RangedAccurate}]] [TALENTS] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_RangedDamaging}]]}} {{reach=@{Used_WeaponRange}}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}+@{Talent_AccurateShotLvl}]]}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAtk)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{precise=[[@{Used_RangedPrecise}]]}} {{blast=[[@{Used_RangedBlast}*@{Used_RangedBlastRating}]]}} {{repeater=[[@{Used_RangedRepeater}*@{Used_RangedRepeaterRating}]]}} {{entangle=[[@{Used_RangedEntangle}]]}} {{penetrating=[[@{Used_RangedPenetrating}]]}} {{tiring=[[0]]}} {{blackpowder=[[@{Used_RangedBlackpowder}]]}} {{practical=[[@{Used_RangedPractical}]]}} {{accurate=[[@{Used_RangedAccurate}*10]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
    let rollBegins = '@{Whisper} &{template:wfrp4e}';
    let rollPart = roll;
-
 				
         startRoll(rollBegins + rollPart, (results) => {
 			const target = results.results.target.result
diff --git a/Warhammer 4e Character Sheet/translation.json b/Warhammer 4e Character Sheet/translation.json
index ba7a428ac6..51e86d2e50 100644
--- a/Warhammer 4e Character Sheet/translation.json	
+++ b/Warhammer 4e Character Sheet/translation.json	
@@ -1033,6 +1033,7 @@
 	"HARDY": "Hardy",
 	"BASE": "Base",
 	"WALK": "Walk (yds)",
+	"YDS": "yds",
 	"SPRINT": "Sprint",
 	"SPRINT-ROLL": "Sprinting Roll",
 	"CHANNEL-NUMBER": "Channel SL",
@@ -1158,7 +1159,7 @@
 	"SKILL-TEST-IMPRESSIVE-FAILURE": "Skill Test - Impressive Failure",
 	"SKILL-TEST-ASTOUNDING-FAILURE": "Skill Test - Astounding Failure",
 	"DAMAGING": "Damaging",
-	"UNIT-DIE": ": Unit Die",
+	"UNIT-DIE": "Unit Die",
 	"CASTING-SUCCESS": "Casting Test Successful",
 	"CASTING-FAILURE": "Casting Test Failure",
 	"PRAY-SUCCESS": "Pray Test Successful",
@@ -1277,6 +1278,7 @@
 	"PRACTICAL": "Practical",
 	"PRECISE": "Precise",
 	"BLAST": "Blast",
+	"BLAST-EFFECT": "Blast: Dmg hits all within",
 	"ACCURATE": "Accurate",
 	"DISTRACT": "Distract",
 	"WRAP": "Wrap",

From 9ef536f9030e82997b8b1d002a851e5208ce9679 Mon Sep 17 00:00:00 2001
From: Djjus <59532170+Djjus@users.noreply.github.com>
Date: Tue, 14 Sep 2021 20:21:03 +0100
Subject: [PATCH 4/9] fixes

---
 .../Warhammer 4e Character Sheet.html         | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index ea5dd90271..07810731b5 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
@@ -457,7 +457,7 @@
 			<input type="hidden" name="attr_Used_MeleeTwoHanded" value="0" disabled="true" />	
 			<input type="hidden" name="attr_slbonusAtkMain" value="@{Used_MeleePractical}+@{Used_MeleePrecise}" disabled="true" />	
 			<input type="hidden" name="attr_slbonusAtkOff" value="@{Used_DefensePractical}+@{Used_DefensePrecise}" disabled="true" />	
-			<input type="hidden" name="attr_slbonusRgd" value="@{Used_RangedPractical}+@{Used_RangedPrecise}" disabled="true" />	
+			<input type="hidden" name="attr_slbonusRgd" value="@{Used_RangedPractical}+@{Used_RangedPrecise}-@{Used_RangedImprecise}" disabled="true" />	
 			<input type="hidden" name="attr_slbonusCast" value="@{Talent_InstinctiveDictionLvl}+@{Talent_PerfectPitchLvl}" disabled="true" />	
 			<input type="hidden" name="attr_slbonusChannel" value="@{Talent_AethyricAttunementLvl}" disabled="true" />	
 			<input type="hidden" name="attr_slbonusDefMain" value="@{DefensiveTotal}+@{Used_MeleePractical}+@{Talent_RiposteLvl}+@{Talent_ReversalLvl}+(@{Used_MeleeShield}*@{Talent_ShieldsmanLvl})" disabled="true" />
@@ -25973,14 +25973,14 @@
 					{{/rollTotal() computed::SLmod 0}}{{/computed::slbonusdef}}{{/computed::slbonusatk}}
 					
 					{{#rollGreater() computed::slbonusatk 0}}	
-					<span style="color: red">{{computed::sl}}</span>
+					<span style="color: red">-{{computed::sl}}</span>
 					{{/rollGreater() computed::slbonusatk 0}}
 					{{#^rollGreater() computed::slbonusatk 0}}	
 					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">-{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
 					{{#^rollTotal() computed::SLmod 0}}<span style="color: red">-{{computed::sl}}</span>{{/^rollTotal() computed::SLmod 0}}
 					{{/^rollGreater() computed::slbonusatk 0}}					
 					{{#rollGreater() computed::slbonusdef 0}}	
-					<span style="color: red">{{computed::sl}}</span>
+					<span style="color: red">-{{computed::sl}}</span>
 					{{/rollGreater() computed::slbonusdef 0}}				
 					{{#^rollGreater() computed::slbonusdef 0}}	
 					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">-{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
@@ -26012,17 +26012,17 @@
 					{{/rollTotal() computed::SLmod 0}}{{/computed::slbonusdef}}{{/computed::slbonusatk}}
 					
 					{{#rollGreater() computed::slbonusatk 0}}	
-					<span style="color: red">{{computed::sl}}</span>
+					<span style="color: red">-{{computed::sl}}</span>
 					{{/rollGreater() computed::slbonusatk 0}}
 					{{#^rollGreater() computed::slbonusatk 0}}	
 					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">-{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
 					{{#^rollTotal() computed::SLmod 0}}<span style="color: red">-{{computed::sl}}</span>{{/^rollTotal() computed::SLmod 0}}
 					{{/^rollGreater() computed::slbonusatk 0}}					
 					{{#rollGreater() computed::slbonusdef 0}}	
-					<span style="color: red">{{computed::sl}}</span>
+					<span style="color: red">-{{computed::sl}}</span>
 					{{/rollGreater() computed::slbonusdef 0}}				
 					{{#^rollGreater() computed::slbonusdef 0}}	
-					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
+					{{#rollTotal() computed::SLmod 0}}<span style="background-color: yellow">-{{computed::sl}}</span>{{/rollTotal() computed::SLmod 0}}
 					{{#^rollTotal() computed::SLmod 0}}<span style="color: red">-{{computed::sl}}</span>{{/^rollTotal() computed::SLmod 0}}
 					{{/^rollGreater() computed::slbonusdef 0}}
 					
@@ -26164,6 +26164,9 @@
 				{{#rollLess() SLmod 0}}
 					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod" style="color: red">{{SLmod}}SL <span data-i18n="MODIFIER"></span></div>
 				{{/rollLess() SLmod 0}}
+				{{#rollGreater() imprecise 0}}
+					<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-slmod" style="color: red">-{{imprecise}}SL <span data-i18n="IMPRECISE"></span></div>
+				{{/rollGreater() imprecise 0}}
 
 				<!-- SL SUCCESSFUL TEST MOD -->	
 				
@@ -32265,6 +32268,7 @@ on("change:repeating_ranged:UsedRanged", function (event) {
 						"Used_RangedRepeater": '0',
 						"Used_RangedRepeaterRating": '0',
 						"Used_RangedEntangle": '0',
+						"Used_RangedImprecise": '0',
 						"Used_Ranged_modtype1": '',
 						"Used_Ranged_mod1": '',
 						"Used_Ranged_modtype2": '',
@@ -32282,7 +32286,7 @@ on("change:repeating_ranged:UsedRanged", function (event) {
                     setAttrs(output, {silent: true});
                     // we use silent:true, so this change doesnt trigger the sheet worker again.
 
-   getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedAccurate","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_UsedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedReload","repeating_ranged_RangedReloadRatingInput","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
+   getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_UsedImprecise","repeating_ranged_RangedAccurate","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_UsedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedReload","repeating_ranged_RangedReloadRatingInput","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
    
    
   console.log("Ranged change");
@@ -32305,6 +32309,7 @@ on("change:repeating_ranged:UsedRanged", function (event) {
                 "Used_RangedImpale": v.repeating_ranged_RangedImpale,
 				"Used_RangedAccurate": v.repeating_ranged_RangedAccurate,
 				"Used_RangedPrecise": v.repeating_ranged_RangedPrecise,
+				"Used_RangedImprecise": v.repeating_ranged_UsedImprecise,
 				"Used_RangedPractical": v.repeating_ranged_RangedPractical,
 				"Used_RangedPenetrating": v.repeating_ranged_RangedPenetrating,
 				"Used_RangedBlackpowder": v.repeating_ranged_UsedBlackpowder,
@@ -32331,13 +32336,13 @@ on("change:repeating_ranged:UsedRanged", function (event) {
 });		
 			
 		
-on('change:repeating_ranged:RangedWeapon_settings_hide change:repeating_ranged:RangedWeaponName change:repeating_ranged:RangedBalisticSkill change:repeating_ranged:RangedBonus change:repeating_ranged:RangedStrengthBonus change:repeating_ranged:RangedDamageBonus change:repeating_ranged:WeaponRange change:repeating_ranged:RangedAmmo change:repeating_ranged:RangedAmmoType change:repeating_ranged:RangedDamage change:repeating_ranged:RangedQualities change:repeating_ranged:RangedImpale change:repeating_ranged:RangedAccurate change:repeating_ranged:RangedPrecise change:repeating_ranged:RangedPractical change:repeating_ranged:RangedBlast change:repeating_ranged:RangedBlastRating change:repeating_ranged:RangedRepeater change:repeating_ranged:RangedRepeaterRating change:repeating_ranged:UsedEntangle change:repeating_ranged:RangedPenetrating change:repeating_ranged:UsedBlackpowder change:repeating_ranged:UsedDamaging change:repeating_ranged:RangedReload change:repeating_ranged:RangedReload change:repeating_ranged:RangedReloadRatingInput change:repeating_ranged:RangedWeapon_modtype1 change:repeating_ranged:RangedWeapon_mod1 change:repeating_ranged:RangedWeapon_modtype2 change:repeating_ranged:RangedWeapon_mod2 change:repeating_ranged:RangedWeapon_modtype3 change:repeating_ranged:RangedWeapon_mod3', function(event){
+on('change:repeating_ranged:RangedWeapon_settings_hide change:repeating_ranged:RangedWeaponName change:repeating_ranged:RangedBalisticSkill change:repeating_ranged:RangedBonus change:repeating_ranged:RangedStrengthBonus change:repeating_ranged:RangedDamageBonus change:repeating_ranged:WeaponRange change:repeating_ranged:RangedAmmo change:repeating_ranged:RangedAmmoType change:repeating_ranged:RangedDamage change:repeating_ranged:RangedQualities change:repeating_ranged:RangedImpale change:repeating_ranged:RangedAccurate change:repeating_ranged:RangedPrecise change:repeating_ranged:UsedImprecise change:repeating_ranged:RangedPractical change:repeating_ranged:RangedBlast change:repeating_ranged:RangedBlastRating change:repeating_ranged:RangedRepeater change:repeating_ranged:RangedRepeaterRating change:repeating_ranged:UsedEntangle change:repeating_ranged:RangedPenetrating change:repeating_ranged:UsedBlackpowder change:repeating_ranged:UsedDamaging change:repeating_ranged:RangedReload change:repeating_ranged:RangedReload change:repeating_ranged:RangedReloadRatingInput change:repeating_ranged:RangedWeapon_modtype1 change:repeating_ranged:RangedWeapon_mod1 change:repeating_ranged:RangedWeapon_modtype2 change:repeating_ranged:RangedWeapon_mod2 change:repeating_ranged:RangedWeapon_modtype3 change:repeating_ranged:RangedWeapon_mod3', function(event){
 	if (event.sourceType === 'sheetworker') return;
 	const playerclickedid = event.sourceAttribute.split('_')[2] || '';
 	getSectionIDs("repeating_ranged", function (ids) {
 		ids.forEach(id => {
 			if(playerclickedid.toLowerCase() == id.toLowerCase()) {
-				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_UsedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
+				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_UsedImprecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_UsedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
 					if(v.repeating_ranged_UsedRanged == 1)
 					{
 						setAttrs(
@@ -32355,6 +32360,7 @@ on('change:repeating_ranged:RangedWeapon_settings_hide change:repeating_ranged:R
 							"Used_RangedImpale":  v.repeating_ranged_RangedImpale,
 							"Used_RangedAccurate": v.repeating_ranged_RangedAccurate,
 							"Used_RangedPrecise": v.repeating_ranged_RangedPrecise,
+							"Used_RangedImprecise": v.repeating_ranged_UsedImprecise,
 							"Used_RangedPractical": v.repeating_ranged_RangedPractical,
 							"Used_RangedPenetrating": v.repeating_ranged_RangedPenetrating,
 							"Used_RangedBlackpowder": v.repeating_ranged_UsedBlackpowder,
@@ -32386,7 +32392,7 @@ on('sheet:opened', function(event){
 	if (event.sourceType === 'sheetworker') return;
 	getSectionIDs("repeating_ranged", function (ids) {
 		ids.forEach(id => {
-				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_UsedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
+				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_UsedImprecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_UsedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
 					if(v.repeating_ranged_UsedRanged == 1)
 					{
 						setAttrs(
@@ -32404,6 +32410,7 @@ on('sheet:opened', function(event){
 							"Used_RangedImpale":  v.repeating_ranged_RangedImpale,
 							"Used_RangedAccurate": v.repeating_ranged_RangedAccurate,
 							"Used_RangedPrecise": v.repeating_ranged_RangedPrecise,
+							"Used_RangedImprecise": v.repeating_ranged_UsedImprecise,
 							"Used_RangedPractical": v.repeating_ranged_RangedPractical,
 							"Used_RangedPenetrating": v.repeating_ranged_RangedPenetrating,
 							"Used_RangedBlackpowder": v.repeating_ranged_UsedBlackpowder,
@@ -34531,7 +34538,7 @@ on('clicked:ripostedmgoff', (eventInfo) => {
 on('clicked:rangedatk', (eventInfo) => {
 	getAttrs(["initiative_houserule"], function(v) {	
 	
-   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_RangedPrecise}+@{Used_RangedPractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusRgd}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Ranged Attack Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[10*@{Used_RangedAccurate}]] [TALENTS] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_RangedDamaging}]]}} {{reach=@{Used_WeaponRange}}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}+@{Talent_AccurateShotLvl}]]}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAtk)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{precise=[[@{Used_RangedPrecise}]]}} {{blast=[[@{Used_RangedBlast}*@{Used_RangedBlastRating}]]}} {{repeater=[[@{Used_RangedRepeater}*@{Used_RangedRepeaterRating}]]}} {{entangle=[[@{Used_RangedEntangle}]]}} {{penetrating=[[@{Used_RangedPenetrating}]]}} {{tiring=[[0]]}} {{blackpowder=[[@{Used_RangedBlackpowder}]]}} {{practical=[[@{Used_RangedPractical}]]}} {{accurate=[[@{Used_RangedAccurate}*10]]}}';
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_RangedPrecise}+@{Used_RangedPractical}-@{Used_RangedImprecise} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusRgd}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Ranged Attack Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[10*@{Used_RangedAccurate}]] [TALENTS] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_RangedDamaging}]]}} {{reach=@{Used_WeaponRange}}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}+@{Talent_AccurateShotLvl}]]}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAtk)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{precise=[[@{Used_RangedPrecise}]]}} {{imprecise=[[@{Used_RangedImprecise}]]}} {{blast=[[@{Used_RangedBlast}*@{Used_RangedBlastRating}]]}} {{repeater=[[@{Used_RangedRepeater}*@{Used_RangedRepeaterRating}]]}} {{entangle=[[@{Used_RangedEntangle}]]}} {{penetrating=[[@{Used_RangedPenetrating}]]}} {{tiring=[[0]]}} {{blackpowder=[[@{Used_RangedBlackpowder}]]}} {{practical=[[@{Used_RangedPractical}]]}} {{accurate=[[@{Used_RangedAccurate}*10]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
    let rollBegins = '@{Whisper} &{template:wfrp4e}';
@@ -34543,6 +34550,7 @@ on('clicked:rangedatk', (eventInfo) => {
             const sl = results.results.sl.result
             const practical = results.results.practical.result
             const precise = results.results.precise.result
+            const imprecise = results.results.imprecise.result
             const slbonus = results.results.slbonus.result
             const SLmod = results.results.SLmod.result
             const slbonusatk = results.results.slbonusatk.result
@@ -34550,9 +34558,9 @@ on('clicked:rangedatk', (eventInfo) => {
             const computed2 = (((test-1)%10)+1) ;		
                console.log(slbonusatk);	
 			
-			if ( test <= target ) { var computed3 = computed + precise + SLmod ;} else  { var computed3 = computed + practical + SLmod ;}
-			if ( test <= target ) { var computed4 = slbonusatk - practical ;} else  { var computed4 = practical ;}
-			if ( test <= target ) { var computed5 = slbonusatk - practical + SLmod ;} else  { var computed5 = practical + SLmod ;}
+			if ( test <= target ) { var computed3 = computed + precise + SLmod - imprecise ;} else  { var computed3 = computed + practical + SLmod - imprecise  ;}
+			if ( test <= target ) { var computed4 = slbonusatk - practical  ;} else  { var computed4 = practical - imprecise ;}
+			if ( test <= target ) { var computed5 = slbonusatk - practical + SLmod ;} else  { var computed5 = practical + SLmod - imprecise ;}
 						
             finishRoll(
                 results.rollId,

From 4bd7278f0f6e084b6b45196478c60e2770ad3810 Mon Sep 17 00:00:00 2001
From: Djjus <59532170+Djjus@users.noreply.github.com>
Date: Tue, 14 Sep 2021 23:57:40 +0100
Subject: [PATCH 5/9] more qualities

---
 .../Warhammer 4e Character Sheet.css          |   2 +-
 .../Warhammer 4e Character Sheet.html         | 160 ++++++++++++++----
 Warhammer 4e Character Sheet/translation.json |   6 +-
 3 files changed, 134 insertions(+), 34 deletions(-)

diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css
index 9a64162d15..82e15d8146 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css	
@@ -2739,7 +2739,7 @@ input[disabled].sheet-passive-skill-score {
 	font-size: 1em;
 }
 .sheet-rolltemplate-wfrp4e .inlinerollresult {
-	padding: 0 2px;
+	padding: 0 2px
 }
 .sheet-rolltemplate-wfrp4e .sheet-rt-header:before,
 .sheet-rolltemplate-wfrp4e .sheet-rt-header:after {
diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index 07810731b5..8d57d2c94b 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
@@ -17517,7 +17517,7 @@
 						<span style="padding-left: 8px; font-size: 11px" data-i18n="DISTRACT">Distract</span>
 						</div>	
 						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
-							<input type="checkbox" name="attr_UsedWrap" value="1" />
+							<input type="checkbox" name="attr_UsedDistract" value="1" />
 						</div>
 	
 					</div>	
@@ -18090,6 +18090,18 @@
 						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
 							<input type="checkbox" name="attr_UsedEntangle" value="1" />
 						</div>
+						<div class="sheet-col-1-10 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="HACK">Hack</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_UsedHack" value="1" />
+						</div>	
+						<div class="sheet-col-1-13 sheet-right">		
+						<span style="padding-left: 14px; font-size: 11px" data-i18n="IMPACT">Impact</span>
+						</div>	
+						<div class="sheet-col-1-30 sheet-center sheet-pad-l-sm">
+							<input type="checkbox" name="attr_UsedImpact"  value="1" />
+						</div>
 					</div>	
 								
 		<span class="sheet-spacer"></span>	
@@ -22960,9 +22972,9 @@
 				{{/offpen}} {{/rollTotal() cond 0}}{{/^rollTotal() modvalue 0}}{{/^rollGreater() advantage 0}}	
 				{{/sl}}		
 				<!-- OFFHAND PENALTY -->				
-				{{#offpen}}			
+				{{#rollLess() offpen 0}}		
 						<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-fatigued"><span data-i18n="OFFHAND-PENALTY">Modifier</span> {{offpen}}</div>
-				{{/offpen}}					
+				{{/rollLess() offpen 0}}					
 				<!-- ADVANTAGE MODIFIER -->
 				{{#rollGreater() advantage 0}}
 						<div class="sheet-col-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-adv"><span data-i18n="ADVANTAGE">Advantage</span> +{{advantage}}</div>
@@ -23031,7 +23043,7 @@
 				{{#test}}{{^lastunitdie}}
 				<div class="sheet-row">
 					<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="TARGET-V-TEST">Target v Test</div>
-					<div class="sheet-col-35-100 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value  sheet-no-yellow-bg2 sheet-rt-test"> <span style="border: 1px solid black; background-color: yellow; padding-top: 2px; padding-left: 1px;">{{target}}</span> v {{#rollWasCrit() test}} {{#rollGreater() test target}} {{#rollBetween() test 1 5}}<span style="border: 3px solid #55B800; background-color: yellow; padding-top: 2px; padding-left: 1px;">{{test}}</span> {{/rollBetween() test 1 5}} {{/rollGreater() test target}} {{/rollWasCrit() test}}  {{#rollWasCrit() test}} {{#^rollWasFumble() test}} {{#rollGreater() test target}} {{#rollBetween() test 6 99}}<span style="border: 3px solid red; background-color: yellow; padding-top: 2px; padding-left: 1px;">{{test}}</span> {{/rollBetween() test 6 99}} {{/rollGreater() test target}} {{/^rollWasFumble() test}} {{/rollWasCrit() test}}  {{#rollWasCrit() test}} {{#rollGreater() target test}} <span style="border: 3px solid #55B800; background-color: yellow; padding-top: 2px; padding-left: 1px;">{{test}}</span> {{/rollGreater() target test}} {{/rollWasCrit() test}} {{#rollWasFumble() test}} {{#rollGreater() test target}} <span style="border: 3px solid red; background-color: yellow; padding-top: 2px; padding-left: 1px;">{{test}}</span> {{/rollGreater() test target}} {{/rollWasFumble() test}} {{#rollWasFumble() test}} {{#^rollGreater() test target}} <span style="border: 3px solid red; background-color: yellow; padding-top: 2px; padding-left: 1px;">{{test}}</span> {{/^rollGreater() test target}} {{/rollWasFumble() test}} {{#^rollWasFumble() test}} {{#^rollWasCrit() test}} <span style="border: 1px solid black; background-color: yellow; padding-top: 2px; padding-left: 1px;">{{test}}</span> {{/^rollWasCrit() test}} {{/^rollWasFumble() test}} </div>
+					<div class="sheet-col-35-100 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value  sheet-no-yellow-bg2 sheet-rt-test"> <span style="border: 1px solid black; background-color: yellow; padding-top: 3px; padding-left: 1px; padding-right: 1px">{{target}}</span> v {{#rollWasCrit() test}} {{#rollGreater() test target}} {{#rollBetween() test 1 5}}<span style="border: 3px solid #55B800; background-color: yellow; padding-top: 3px; padding-left: 1px; padding-right: 1px;">{{test}}</span> {{/rollBetween() test 1 5}} {{/rollGreater() test target}} {{/rollWasCrit() test}}  {{#rollWasCrit() test}} {{#^rollWasFumble() test}} {{#rollGreater() test target}} {{#rollBetween() test 6 99}}<span style="border: 3px solid red; background-color: yellow; padding-top: 3px; padding-left: 1px; padding-right: 1px;">{{test}}</span> {{/rollBetween() test 6 99}} {{/rollGreater() test target}} {{/^rollWasFumble() test}} {{/rollWasCrit() test}}  {{#rollWasCrit() test}} {{#rollGreater() target test}} <span style="border: 3px solid #55B800; background-color: yellow; padding-top: 3px; padding-left: 1px; padding-right: 1px;">{{test}}</span> {{/rollGreater() target test}} {{/rollWasCrit() test}} {{#rollWasFumble() test}} {{#rollGreater() test target}} <span style="border: 3px solid red; background-color: yellow; padding-top: 3px; padding-left: 1px; padding-right: 1px;">{{test}}</span> {{/rollGreater() test target}} {{/rollWasFumble() test}} {{#rollWasFumble() test}} {{#^rollGreater() test target}} <span style="border: 3px solid red; background-color: yellow; padding-top: 3px; padding-left: 1px; padding-right: 1px;">{{test}}</span> {{/^rollGreater() test target}} {{/rollWasFumble() test}} {{#^rollWasFumble() test}} {{#^rollWasCrit() test}} <span style="border: 1px solid black; background-color: yellow; padding-top: 3px; padding-left: 1px; padding-right: 1px;">{{test}}</span> {{/^rollWasCrit() test}} {{/^rollWasFumble() test}} </div>
 					<div class="sheet-col-3-20 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value"><span class="sheet-chat-button-white sheet-right" style="padding-left: 25px;font-size: 15px" data-i18n-title="REROLL" title="Reroll">{{reroll}}</span></div>
 				</div>
 				{{/lastunitdie}}{{/test}}		
@@ -23166,7 +23178,6 @@
 					{{/rollWasFumble() test}}
 				{{/rollTotal() test 100}}	
 
-
 				<!-- WRATH UNIT DIE -->
 
 				{{#rollTotal() sin 1}}
@@ -23744,6 +23755,7 @@
 					{{/rollTotal() rolltype 4}}
 				{{/^rollWasCrit() test}}
 
+
 				<!-- SUCCESS LEVELS -->
 				{{^sl}}	
 				{{#rollBetween() target 250 259}}
@@ -27944,7 +27956,7 @@
 										{{#damage}}
 										<div class="sheet-row">
 											<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key" data-i18n="DAMAGE">Damage</div>
-											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-rt-key">{{damage}} <span style="color: #858585; font-size: 11px;"> 
+											<div class="sheet-col-13-24 sheet-pad-r-sm sheet-rt-key" style="font-size: 12.5px;">{{damage}} <span style="color: #858585; font-size: 11px;"> 
 											
 											
 										{{#rollGreater() damaging 0}} {{#rollTotal() tiring 0}}+ </span><span data-i18n="OPPOSED-SL-UD" style="color: #858585; font-size: 10px;"></span>{{/rollTotal() tiring 0}} {{/rollGreater() damaging 0}}
@@ -27986,9 +27998,18 @@
 										{{#rollTotal() penetrating 0}}{{#rollTotal() slow 0}}{{#rollTotal() hack 0}} {{#rollGreater() fast 0}}
 											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>
 										{{/rollGreater() fast 0}} {{/rollTotal() hack 0}}{{/rollTotal() slow 0}}{{/rollTotal() penetrating 0}}
+										{{#rollTotal() penetrating 0}}{{#rollTotal() slow 0}}{{#rollTotal() hack 0}} {{#rollTotal() fast 0}} {{#rollGreater() wrap 0}}
+											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>
+										{{/rollGreater() wrap 0}} {{/rollTotal() fast 0}} {{/rollTotal() hack 0}}{{/rollTotal() slow 0}}{{/rollTotal() penetrating 0}}
+										{{#rollTotal() penetrating 0}} {{#rollTotal() slow 0}} {{#rollTotal() hack 0}} {{#rollTotal() fast 0}} {{#rollTotal() wrap 0}} {{#rollGreater() distract 0}}
+											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>
+										{{/rollGreater() distract 0}} {{/rollTotal() wrap 0}} {{/rollTotal() fast 0}} {{/rollTotal() hack 0}} {{/rollTotal() slow 0}} {{/rollTotal() penetrating 0}}
+										{{#rollTotal() penetrating 0}} {{#rollTotal() slow 0}} {{#rollTotal() hack 0}} {{#rollTotal() fast 0}} {{#rollTotal() wrap 0}} {{#rollTotal() distract 0}} {{#rollTotal() dangerous 1}}
+											<div class="sheet-col-100-100" style="color: black; font-size: 9px; padding-left: 3px; line-height: 10px" data-i18n="EFFECTS">Effects</div>
+										{{/rollTotal() dangerous 1}} {{/rollTotal() distract 0}} {{/rollTotal() wrap 0}} {{/rollTotal() fast 0}} {{/rollTotal() hack 0}} {{/rollTotal() slow 0}} {{/rollTotal() penetrating 0}}
 										
 										{{#^rollTotal() tiring 0}}
-											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects sheet-rt-no-border" style="color: #858585; border: 0xp"><span data-i18n="TIRING">Tiring</span></div>								
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects" style="margin-right: 3px;color: #858585"><span data-i18n="TIRING">Tiring</span></div>								
 										{{/^rollTotal() tiring 0}}
 										{{#rollGreater() fast 0}}
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="FAST-EFFECT">Fast: Opposed -10 Roll if not Fast</span></div>
@@ -27996,11 +28017,16 @@
 																		
 										{{#rollGreater() slow 0}}
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="SLOW-EFFECT">Slow: Opposed gains +1 SL</span></div>
-										{{/rollGreater() slow 0}}
-																		
+										{{/rollGreater() slow 0}}	
 										{{#rollGreater() hack 0}}
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="HACK-EFFECT">Hack: HitLoc Armor Dmg +1</span></div>
-										{{/rollGreater() hack 0}}
+										{{/rollGreater() hack 0}}		
+										{{#rollGreater() wrap 0}}
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="WRAP-EFFECT">Wrap: Defender gains -1 SL Mod</span></div>
+										{{/rollGreater() wrap 0}}
+										{{#rollGreater() distract 0}}
+											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="DISTRACT-EFFECT">Distract: Push back defender</span> {{computed::slbonus}} <span style="color: #858585" data-i18n="YDS">yds</span></div>
+										{{/rollGreater() distract 0}}
 										{{#rollGreater() penetrating 0}}		
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="PENETRATING">Penetrating</span>:</div>		
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="PENETRATING-EFFECT">Ignore Metal-AP & -1 remaining AP</span></div>
@@ -28008,7 +28034,14 @@
 										{{#rollGreater() blackpowder 0}}
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="BLACKPOWDER">Blackpowder</span>:</div>		
 											<div class="sheet-col-100-100 sheet-pad-l-md sheet-pad-r-md sheet-rt-effects"><span style="margin-right: 3px; color: #858585" data-i18n="BLACKPOWDER-EFFECT">Target +20 Cool test or +1 Broken</span></div>
-										{{/rollGreater() blackpowder 0}}
+										{{/rollGreater() blackpowder 0}}			
+										{{#rollTotal() dangerous 1}}
+											{{#rollBetween() computed::test 9 10}}
+												<div class="sheet-row">
+													<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-no-border" style="color: red; font-size: 11px"><span data-i18n="DANGEROUS"></span> <span data-i18n="FUMBLE"></span>: <span data-i18n="UNIT-DIE"> </span> = ({{computed::test}}) <span class="sheet-chat-button-white">{{RTfumble}}</span></div>
+												</div>				
+											{{/rollBetween() computed::test 9 10}}	
+										{{/rollTotal() dangerous 1}}	
 										{{/rollGreater() showdmg 0}}
 										
 										
@@ -31445,6 +31478,9 @@ on("change:repeating_melee:UsedWeapon", function (event) {
 						"Used_DefensePenetrating": '0',
 						"Used_DefensePummel": '0',
 						"Used_DefenseTiring": '0',
+						"Used_DefenseWrap": '0',
+						"Used_DefenseTrapBlade": '0',
+						"Used_DefenseDistract": '0',
 						"Used_DefenseShield": '0',
 						"Used_Defense_att_modtype1": '',
 						"Used_Defense_att_mod1": '',
@@ -31485,6 +31521,9 @@ on("change:repeating_melee:UsedWeapon", function (event) {
 						"Used_MeleeImpact": '0',
 						"Used_MeleePenetrating": '0',
 						"Used_MeleeTiring": '0',
+						"Used_MeleeWrap": '0',
+						"Used_MeleeTrapBlade": '0',
+						"Used_MeleeDistract": '0',
 						"Used_MeleePummel": '0',
 						"Used_MeleeShield": '0',
 						"Used_Melee_modtype1": '',
@@ -31522,6 +31561,9 @@ on("change:repeating_melee:UsedWeapon", function (event) {
 						"Used_MeleeImpact": '0',
 						"Used_MeleePenetrating": '0',
 						"Used_MeleeTiring": '0',
+						"Used_MeleeWrap": '0',
+						"Used_MeleeTrapBlade": '0',
+						"Used_MeleeDistract": '0',
 						"Used_MeleePummel": '0',
 						"Used_MeleeShield": '0',
 						"Used_MeleeTwoHanded": '0',
@@ -31558,6 +31600,9 @@ on("change:repeating_melee:UsedWeapon", function (event) {
 						"Used_DefensePenetrating": '0',
 						"Used_DefensePummel": '0',
 						"Used_DefenseTiring": '0',
+						"Used_DefenseWrap": '0',
+						"Used_DefenseTrapBlade": '0',
+						"Used_DefenseDistract": '0',
 						"Used_DefenseShield": '0',
 						"Used_Defense_att_modtype1": '',
 						"Used_Defense_att_mod1": '',
@@ -31588,7 +31633,7 @@ setAttrs(output5, {silent: true});
 						if (t.repeating_melee_UsedDefense == 1) {
                     setAttrs(output3, {silent: true});	
 						}			
-   getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_MeleeImpact","repeating_melee_MeleePenetrating","repeating_melee_MeleePummel","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"],function(v) {
+   getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_MeleeImpact","repeating_melee_MeleePenetrating","repeating_melee_MeleePummel","repeating_melee_UsedDistract","repeating_melee_UsedWrap","repeating_melee_UsedTrapBlade","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"],function(v) {
             let weapon = v.repeating_melee_MeleeWeapon;					
             setAttrs({
                 "Used_MeleeWeapon": weapon,
@@ -31611,6 +31656,9 @@ setAttrs(output5, {silent: true});
 				"Used_MeleePenetrating": v.repeating_melee_MeleePenetrating,
 				"Used_MeleePummel": v.repeating_melee_MeleePummel,
 				"Used_MeleeTiring": v.repeating_melee_MeleeTiring,
+				"Used_MeleeWrap": v.repeating_melee_UsedWrap,
+				"Used_MeleeTrapBlade": v.repeating_melee_UsedTrapBlade,
+				"Used_MeleeDistract": v.repeating_melee_UsedDistract,
 				"Used_MeleeTwoHanded": v.repeating_melee_UsedTwoHanded,
 				"Used_MeleeShield": v.repeating_melee_UsedShield,
 				"Used_Melee_modtype1": v.repeating_melee_MeleeWeapon_modtype1,
@@ -31651,6 +31699,9 @@ setAttrs(output5, {silent: true});
 						"Used_DefensePenetrating": '',
 						"Used_DefensePummel": '',
 						"Used_DefenseTiring": '0',
+						"Used_DefenseWrap": '0',
+						"Used_DefenseTrapBlade": '0',
+						"Used_DefenseDistract": '0',
 						"Used_DefenseShield": '',
 						"Used_Defense_att_modtype1": '',
 						"Used_Defense_att_mod1": '',
@@ -31674,7 +31725,7 @@ output7[`repeating_melee_${id}_UsedDefense`] = (playerclickedid.toLowerCase() ==
 setAttrs(output6, {silent: true});	
 setAttrs(output7, {silent: true});	
 	
-   getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_MeleeImpact","repeating_melee_MeleePenetrating","repeating_melee_MeleePummel","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"],function(v) {
+   getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_MeleeImpact","repeating_melee_MeleePenetrating","repeating_melee_UsedDistract","repeating_melee_MeleePummel","repeating_melee_UsedWrap","repeating_melee_UsedTrapBlade","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"],function(v) {
             let weapon = v.repeating_melee_MeleeWeapon;					
             setAttrs({
                 "Used_MeleeWeapon": weapon,
@@ -31697,8 +31748,11 @@ setAttrs(output7, {silent: true});
 				"Used_MeleePenetrating": v.repeating_melee_MeleePenetrating,
 				"Used_MeleePummel": v.repeating_melee_MeleePummel,
 				"Used_MeleeTiring": v.repeating_melee_MeleeTiring,
-				"Used_MeleeShield": v.repeating_melee_UsedShield,
+				"Used_MeleeWrap": v.repeating_melee_UsedWrap,
+				"Used_MeleeTrapBlade": v.repeating_melee_UsedTrapBlade,
+				"Used_MeleeDistract": v.repeating_melee_UsedDistract,
 				"Used_MeleeTwoHanded": v.repeating_melee_UsedTwoHanded,
+				"Used_MeleeShield": v.repeating_melee_UsedShield,
 				"Used_Melee_modtype1": v.repeating_melee_MeleeWeapon_modtype1,
 				"Used_Melee_mod1": v.repeating_melee_MeleeWeapon_mod1,
 				"Used_Melee_modtype2": v.repeating_melee_MeleeWeapon_modtype2,
@@ -31731,6 +31785,9 @@ setAttrs(output7, {silent: true});
 				"Used_DefensePenetrating": v.repeating_melee_MeleePenetrating,
 				"Used_DefensePummel": v.repeating_melee_MeleePummel,
 				"Used_DefenseTiring": v.repeating_melee_MeleeTiring,
+				"Used_DefenseWrap": v.repeating_melee_UsedWrap,
+				"Used_DefenseTrapBlade": v.repeating_melee_UsedTrapBlade,
+				"Used_DefenseDistract": v.repeating_melee_UsedDistract,
 				"Used_DefenseShield": v.repeating_melee_UsedShield,
 				"Used_Defense_att_modtype1": v.repeating_melee_MeleeWeapon_modtype1,
 				"Used_Defense_att_mod1": v.repeating_melee_MeleeWeapon_mod1,
@@ -31801,6 +31858,9 @@ on("change:repeating_melee:UsedDefense", function (event) {
 						"Used_MeleePenetrating": '0',
 						"Used_MeleePummel": '0',
 						"Used_MeleeTiring": '0',
+						"Used_MeleeWrap": '0',
+						"Used_MeleeTrapBlade": '0',
+						"Used_MeleeDistract": '0',
 						"Used_MeleeShield": '0',
 						"Used_Melee_modtype1": '',
 						"Used_Melee_mod1": '',
@@ -31842,6 +31902,9 @@ on("change:repeating_melee:UsedDefense", function (event) {
 						"Used_DefensePenetrating": '0',
 						"Used_DefensePummel": '0',
 						"Used_DefenseTiring": '0',
+						"Used_DefenseWrap": '0',
+						"Used_DefenseTrapBlade": '0',
+						"Used_DefenseDistract": '0',
 						"Used_DefenseShield": '0',
 						"Used_Defense_att_modtype1": '',
 						"Used_Defense_att_mod1": '',
@@ -31879,6 +31942,9 @@ on("change:repeating_melee:UsedDefense", function (event) {
 						"Used_MeleePenetrating": '0',
 						"Used_MeleePummel": '0',
 						"Used_MeleeTiring": '0',
+						"Used_MeleeWrap": '0',
+						"Used_MeleeTrapBlade": '0',
+						"Used_MeleeDistract": '0',
 						"Used_MeleeTwoHanded": '0',
 						"Used_MeleeShield": '0',
 						"Used_Melee_modtype1": '',
@@ -31913,6 +31979,9 @@ on("change:repeating_melee:UsedDefense", function (event) {
 						"Used_DefensePenetrating": '',
 						"Used_DefensePummel": '',
 						"Used_DefenseTiring": '',
+						"Used_DefenseWrap": '0',
+						"Used_DefenseTrapBlade": '0',
+						"Used_DefenseDistract": '0',
 						"Used_DefenseShield": '',
 						"Used_Defense_att_modtype1": '',
 						"Used_Defense_att_mod1": '',
@@ -31945,7 +32014,7 @@ setAttrs(output5, {silent: true});
 						}	
 						
 						
-   getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_MeleeImpact","repeating_melee_MeleePenetrating","repeating_melee_MeleePummel","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"], function(v) {
+   getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_MeleeImpact","repeating_melee_MeleePenetrating","repeating_melee_UsedDistract","repeating_melee_UsedWrap","repeating_melee_UsedTrapBlade","repeating_melee_MeleePummel","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"], function(v) {
             let weapon = v.repeating_melee_MeleeWeapon;			
 		console.log(v.repeating_melee_MeleeWeaponSkill);			
             setAttrs({
@@ -31969,6 +32038,9 @@ setAttrs(output5, {silent: true});
 				"Used_DefensePenetrating": v.repeating_melee_MeleePenetrating,
 				"Used_DefensePummel": v.repeating_melee_MeleePummel,
 				"Used_DefenseTiring": v.repeating_melee_MeleeTiring,
+				"Used_DefenseWrap": v.repeating_melee_UsedWrap,
+				"Used_DefenseTrapBlade": v.repeating_melee_UsedTrapBlade,
+				"Used_DefenseDistract": v.repeating_melee_UsedDistract,
 				"Used_DefenseShield": v.repeating_melee_UsedShield,
 				"Used_Defense_att_modtype1": v.repeating_melee_MeleeWeapon_modtype1,
 				"Used_Defense_att_mod1": v.repeating_melee_MeleeWeapon_mod1,
@@ -32008,6 +32080,9 @@ setAttrs(output4, {silent: true});
 						"Used_MeleePenetrating": '0',
 						"Used_MeleePummel": '0',
 						"Used_MeleeTiring": '0',
+						"Used_MeleeWrap": '0',
+						"Used_MeleeTrapBlade": '0',
+						"Used_MeleeDistract": '0',
 						"Used_MeleeTwoHanded": '0',
 						"Used_MeleeShield": '0',
 						"Used_Melee_modtype1": '',
@@ -32032,7 +32107,7 @@ output7[`repeating_melee_${id}_UsedDefense`] = (playerclickedid.toLowerCase() ==
 setAttrs(output6, {silent: true});	
 setAttrs(output7, {silent: true});	
 	
-   getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_MeleeImpact","repeating_melee_MeleePenetrating","repeating_melee_MeleePummel","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"],function(v) {
+   getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_MeleeImpact","repeating_melee_MeleePenetrating","repeating_melee_UsedDistract","repeating_melee_MeleePummel","repeating_melee_UsedWrap","repeating_melee_UsedTrapBlade","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"],function(v) {
             let weapon = v.repeating_melee_MeleeWeapon;					
             setAttrs({
                 "Used_MeleeWeapon": weapon,
@@ -32055,6 +32130,9 @@ setAttrs(output7, {silent: true});
 				"Used_MeleePenetrating": v.repeating_melee_MeleePenetrating,
 				"Used_MeleePummel": v.repeating_melee_MeleePummel,
 				"Used_MeleeTiring": v.repeating_melee_MeleeTiring,
+				"Used_MeleeWrap": v.repeating_melee_UsedWrap,
+				"Used_MeleeTrapBlade": v.repeating_melee_UsedTrapBlade,
+				"Used_MeleeDistract": v.repeating_melee_UsedDistract,
 				"Used_MeleeTwoHanded": v.repeating_melee_UsedTwoHanded,
 				"Used_MeleeShield": v.repeating_melee_UsedShield,
 				"Used_Melee_modtype1": v.repeating_melee_MeleeWeapon_modtype1,
@@ -32089,6 +32167,9 @@ setAttrs(output7, {silent: true});
 				"Used_DefensePenetrating": v.repeating_melee_MeleePenetrating,
 				"Used_DefensePummel": v.repeating_melee_MeleePummel,
 				"Used_DefenseTiring": v.repeating_melee_MeleeTiring,
+				"Used_DefenseWrap": v.repeating_melee_UsedWrap,
+				"Used_DefenseTrapBlade": v.repeating_melee_UsedTrapBlade,
+				"Used_DefenseDistract": v.repeating_melee_UsedDistract,
 				"Used_DefenseShield": v.repeating_melee_UsedShield,
 				"Used_Defense_att_modtype1": v.repeating_melee_MeleeWeapon_modtype1,
 				"Used_Defense_att_mod1": v.repeating_melee_MeleeWeapon_mod1,
@@ -32115,12 +32196,12 @@ setAttrs(output7, {silent: true});
 						
 						
 
-on('change:repeating_melee:MeleeWeapon_settings_hide change:repeating_melee:MeleeWeapon change:repeating_melee:MeleeWeaponSkill change:repeating_melee:MeleeBonus change:repeating_melee:MeleeStrengthBonus change:repeating_melee:MeleeDamageBonus change:repeating_melee:MeleeReach change:repeating_melee:MeleeQualities  change:repeating_melee:MeleeDefensive change:repeating_melee:MeleeImpale change:repeating_melee:OpposedDmg change:repeating_melee:UsedDamaging change:repeating_melee:MeleeFast change:repeating_melee:MeleeSlow change:repeating_melee:MeleeHack change:repeating_melee:MeleePrecise change:repeating_melee:MeleePractical change:repeating_melee:MeleeImpact change:repeating_melee:MeleePenetrating change:repeating_melee:MeleePummel change:repeating_melee:MeleeTiring change:repeating_melee:UsedTwoHanded change:repeating_melee:UsedShield change:repeating_melee:MeleeWeapon_modtype1 change:repeating_melee:MeleeWeapon_mod1 change:repeating_melee:MeleeWeapon_modtype2 change:repeating_melee:MeleeWeapon_mod2 change:repeating_melee:MeleeWeapon_modtype3 change:repeating_melee:MeleeWeapon_mod3 change:repeating_melee:DefenseWeapon_modtype1 change:repeating_melee:DefenseWeapon_mod1 change:repeating_melee:DefenseWeapon_modtype2 change:repeating_melee:DefenseWeapon_mod2 change:repeating_melee:DefenseWeapon_modtype3 change:repeating_melee:DefenseWeapon_mod3', function(event){
+on('change:repeating_melee:MeleeWeapon_settings_hide change:repeating_melee:MeleeWeapon change:repeating_melee:MeleeWeaponSkill change:repeating_melee:MeleeBonus change:repeating_melee:MeleeStrengthBonus change:repeating_melee:MeleeDamageBonus change:repeating_melee:MeleeReach change:repeating_melee:MeleeQualities  change:repeating_melee:MeleeDefensive change:repeating_melee:MeleeImpale change:repeating_melee:OpposedDmg change:repeating_melee:UsedDamaging change:repeating_melee:MeleeFast change:repeating_melee:MeleeSlow change:repeating_melee:MeleeHack change:repeating_melee:MeleePrecise change:repeating_melee:MeleePractical change:repeating_melee:UsedTrapBlade change:repeating_melee:UsedWrap change:repeating_melee:MeleeImpact change:repeating_melee:MeleePenetrating change:repeating_melee:MeleePummel change:repeating_melee:MeleeTiring change:repeating_melee:UsedDistract change:repeating_melee:UsedTwoHanded change:repeating_melee:UsedShield change:repeating_melee:MeleeWeapon_modtype1 change:repeating_melee:MeleeWeapon_mod1 change:repeating_melee:MeleeWeapon_modtype2 change:repeating_melee:MeleeWeapon_mod2 change:repeating_melee:MeleeWeapon_modtype3 change:repeating_melee:MeleeWeapon_mod3 change:repeating_melee:DefenseWeapon_modtype1 change:repeating_melee:DefenseWeapon_mod1 change:repeating_melee:DefenseWeapon_modtype2 change:repeating_melee:DefenseWeapon_mod2 change:repeating_melee:DefenseWeapon_modtype3 change:repeating_melee:DefenseWeapon_mod3', function(event){
 	const playerclickedid = event.sourceAttribute.split('_')[2] || '';
 	getSectionIDs("repeating_melee", function (ids) {
 		ids.forEach(id => {
 			if(playerclickedid.toLowerCase() == id.toLowerCase()) {
-				getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_UsedWeapon","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_MeleeImpact","repeating_melee_MeleePenetrating","repeating_melee_MeleePummel","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"], function(v) {
+				getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_UsedWeapon","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_UsedDistract","repeating_melee_MeleeImpact","repeating_melee_UsedWrap","repeating_melee_UsedTrapBlade","repeating_melee_MeleePenetrating","repeating_melee_MeleePummel","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"], function(v) {
 					if(v.repeating_melee_UsedWeapon == 1)
 					{
 						setAttrs(
@@ -32145,6 +32226,9 @@ on('change:repeating_melee:MeleeWeapon_settings_hide change:repeating_melee:Mele
 							"Used_MeleePenetrating": v.repeating_melee_MeleePenetrating,
 							"Used_MeleePummel": v.repeating_melee_MeleePummel,
 							"Used_MeleeTiring": v.repeating_melee_MeleeTiring,
+							"Used_MeleeWrap": v.repeating_melee_UsedWrap,
+							"Used_MeleeTrapBlade": v.repeating_melee_UsedTrapBlade,
+							"Used_MeleeDistract": v.repeating_melee_UsedDistract,
 							"Used_MeleeTwoHanded": v.repeating_melee_UsedTwoHanded,	
 							"Used_MeleeShield": v.repeating_melee_UsedShield,
 							"Used_Melee_modtype1": v.repeating_melee_MeleeWeapon_modtype1,
@@ -32169,12 +32253,12 @@ on('change:repeating_melee:MeleeWeapon_settings_hide change:repeating_melee:Mele
 });	
 
 
-on('change:repeating_melee:MeleeWeapon_settings_hide change:repeating_melee:MeleeWeapon change:repeating_melee:MeleeWeaponSkill change:repeating_melee:MeleeBonus change:repeating_melee:MeleeStrengthBonus change:repeating_melee:MeleeDamageBonus change:repeating_melee:MeleeReach change:repeating_melee:MeleeQualities change:repeating_melee:MeleeDefensive change:repeating_melee:MeleeImpale change:repeating_melee:OpposedDmg change:repeating_melee:UsedDamaging change:repeating_melee:MeleeFast change:repeating_melee:MeleeSlow change:repeating_melee:MeleeHack change:repeating_melee:MeleePrecise change:repeating_melee:MeleePractical change:repeating_melee:MeleeImpact change:repeating_melee:MeleePenetrating change:repeating_melee:MeleePummel change:repeating_melee:MeleeTiring change:repeating_melee:UsedTwoHanded change:repeating_melee:UsedShield change:repeating_melee:MeleeWeapon_modtype1 change:repeating_melee:MeleeWeapon_mod1 change:repeating_melee:MeleeWeapon_modtype2 change:repeating_melee:MeleeWeapon_mod2 change:repeating_melee:MeleeWeapon_modtype3 change:repeating_melee:MeleeWeapon_mod3 change:repeating_melee:DefenseWeapon_modtype1 change:repeating_melee:DefenseWeapon_mod1 change:repeating_melee:DefenseWeapon_modtype2 change:repeating_melee:DefenseWeapon_mod2 change:repeating_melee:DefenseWeapon_modtype3 change:repeating_melee:DefenseWeapon_mod3', function(event){
+on('change:repeating_melee:MeleeWeapon_settings_hide change:repeating_melee:MeleeWeapon change:repeating_melee:MeleeWeaponSkill change:repeating_melee:MeleeBonus change:repeating_melee:MeleeStrengthBonus change:repeating_melee:MeleeDamageBonus change:repeating_melee:MeleeReach change:repeating_melee:MeleeQualities change:repeating_melee:MeleeDefensive change:repeating_melee:MeleeImpale change:repeating_melee:OpposedDmg change:repeating_melee:UsedDamaging change:repeating_melee:MeleeFast change:repeating_melee:MeleeSlow change:repeating_melee:MeleeHack change:repeating_melee:MeleePrecise change:repeating_melee:MeleePractical change:repeating_melee:UsedTrapBlade change:repeating_melee:UsedWrap change:repeating_melee:MeleeImpact change:repeating_melee:MeleePenetrating change:repeating_melee:MeleePummel change:repeating_melee:MeleeTiring change:repeating_melee:UsedDistract change:repeating_melee:UsedTwoHanded change:repeating_melee:UsedShield change:repeating_melee:MeleeWeapon_modtype1 change:repeating_melee:MeleeWeapon_mod1 change:repeating_melee:MeleeWeapon_modtype2 change:repeating_melee:MeleeWeapon_mod2 change:repeating_melee:MeleeWeapon_modtype3 change:repeating_melee:MeleeWeapon_mod3 change:repeating_melee:DefenseWeapon_modtype1 change:repeating_melee:DefenseWeapon_mod1 change:repeating_melee:DefenseWeapon_modtype2 change:repeating_melee:DefenseWeapon_mod2 change:repeating_melee:DefenseWeapon_modtype3 change:repeating_melee:DefenseWeapon_mod3', function(event){
 	const playerclickedid = event.sourceAttribute.split('_')[2] || '';
 	getSectionIDs("repeating_melee", function (ids) {
 		ids.forEach(id => {
 			if(playerclickedid.toLowerCase() == id.toLowerCase()) {
-				getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_UsedDefense","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_MeleeImpact","repeating_melee_MeleePenetrating","repeating_melee_MeleePummel","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"], function(v) {
+				getAttrs(["repeating_melee_MeleeWeapon","repeating_melee_MeleeWeaponSkill","repeating_melee_MeleeBonus","repeating_melee_MeleeStrengthBonus","repeating_melee_MeleeDamageBonus","repeating_melee_MeleeReach","repeating_melee_MeleeQualities","repeating_melee_MeleeDefensive","repeating_melee_MeleeImpale","repeating_melee_UsedDefense","repeating_melee_OpposedDmg","repeating_melee_UsedDamaging","repeating_melee_MeleeFast","repeating_melee_MeleeSlow","repeating_melee_MeleeHack","repeating_melee_MeleePrecise","repeating_melee_MeleePractical","repeating_melee_UsedDistract","repeating_melee_MeleeImpact","repeating_melee_UsedWrap","repeating_melee_UsedTrapBlade","repeating_melee_MeleePenetrating","repeating_melee_MeleePummel","repeating_melee_MeleeTiring","repeating_melee_UsedTwoHanded","repeating_melee_UsedShield","repeating_melee_MeleeWeapon_modtype1","repeating_melee_MeleeWeapon_mod1","repeating_melee_MeleeWeapon_modtype2","repeating_melee_MeleeWeapon_mod2","repeating_melee_MeleeWeapon_modtype3","repeating_melee_MeleeWeapon_mod3","repeating_melee_DefenseWeapon_modtype1","repeating_melee_DefenseWeapon_mod1","repeating_melee_DefenseWeapon_modtype2","repeating_melee_DefenseWeapon_mod2","repeating_melee_DefenseWeapon_modtype3","repeating_melee_DefenseWeapon_mod3"], function(v) {
 					if(v.repeating_melee_UsedDefense == 1)
 					{
 						setAttrs(
@@ -32199,6 +32283,9 @@ on('change:repeating_melee:MeleeWeapon_settings_hide change:repeating_melee:Mele
 							"Used_DefensePenetrating": v.repeating_melee_MeleePenetrating,
 							"Used_DefensePummel": v.repeating_melee_MeleePummel,
 							"Used_DefenseTiring": v.repeating_melee_MeleeTiring,
+							"Used_DefenseWrap": v.repeating_melee_UsedWrap,
+							"Used_DefenseTrapBlade": v.repeating_melee_UsedTrapBlade,
+							"Used_DefenseDistract": v.repeating_melee_UsedDistract,
 							"Used_DefenseShield": v.repeating_melee_UsedShield,
 							"Used_Defense_att_modtype1": v.repeating_melee_MeleeWeapon_modtype1,
 							"Used_Defense_att_mod1": v.repeating_melee_MeleeWeapon_mod1,
@@ -32259,6 +32346,7 @@ on("change:repeating_ranged:UsedRanged", function (event) {
 						"Used_RangedPrecise": '0',
 						"Used_RangedPractical": '0',
 						"Used_RangedPenetrating": '0',
+						"Used_RangedHack": '0',
 						"Used_RangedBlackpowder": '0',
 						"Used_RangedDamaging": '0',
 						"Used_RangedReload": '0',
@@ -32269,6 +32357,7 @@ on("change:repeating_ranged:UsedRanged", function (event) {
 						"Used_RangedRepeaterRating": '0',
 						"Used_RangedEntangle": '0',
 						"Used_RangedImprecise": '0',
+						"Used_RangedDangerous": '0',
 						"Used_Ranged_modtype1": '',
 						"Used_Ranged_mod1": '',
 						"Used_Ranged_modtype2": '',
@@ -32286,7 +32375,7 @@ on("change:repeating_ranged:UsedRanged", function (event) {
                     setAttrs(output, {silent: true});
                     // we use silent:true, so this change doesnt trigger the sheet worker again.
 
-   getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_UsedImprecise","repeating_ranged_RangedAccurate","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_UsedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedReload","repeating_ranged_RangedReloadRatingInput","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
+   getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_UsedImprecise","repeating_ranged_RangedAccurate","repeating_ranged_RangedPractical","repeating_melee_UsedImpact","repeating_ranged_UsedDangerous","repeating_ranged_UsedHack","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_UsedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedReload","repeating_ranged_RangedReloadRatingInput","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
    
    
   console.log("Ranged change");
@@ -32312,6 +32401,9 @@ on("change:repeating_ranged:UsedRanged", function (event) {
 				"Used_RangedImprecise": v.repeating_ranged_UsedImprecise,
 				"Used_RangedPractical": v.repeating_ranged_RangedPractical,
 				"Used_RangedPenetrating": v.repeating_ranged_RangedPenetrating,
+				"Used_RangedImpact": v.repeating_melee_UsedImpact,
+				"Used_RangedHack": v.repeating_ranged_UsedHack,
+				"Used_RangedDangerous": v.repeating_ranged_UsedDangerous,
 				"Used_RangedBlackpowder": v.repeating_ranged_UsedBlackpowder,
 				"Used_RangedDamaging": v.repeating_ranged_UsedDamaging,
 				"Used_RangedReload": v.repeating_ranged_RangedReload,
@@ -32336,13 +32428,13 @@ on("change:repeating_ranged:UsedRanged", function (event) {
 });		
 			
 		
-on('change:repeating_ranged:RangedWeapon_settings_hide change:repeating_ranged:RangedWeaponName change:repeating_ranged:RangedBalisticSkill change:repeating_ranged:RangedBonus change:repeating_ranged:RangedStrengthBonus change:repeating_ranged:RangedDamageBonus change:repeating_ranged:WeaponRange change:repeating_ranged:RangedAmmo change:repeating_ranged:RangedAmmoType change:repeating_ranged:RangedDamage change:repeating_ranged:RangedQualities change:repeating_ranged:RangedImpale change:repeating_ranged:RangedAccurate change:repeating_ranged:RangedPrecise change:repeating_ranged:UsedImprecise change:repeating_ranged:RangedPractical change:repeating_ranged:RangedBlast change:repeating_ranged:RangedBlastRating change:repeating_ranged:RangedRepeater change:repeating_ranged:RangedRepeaterRating change:repeating_ranged:UsedEntangle change:repeating_ranged:RangedPenetrating change:repeating_ranged:UsedBlackpowder change:repeating_ranged:UsedDamaging change:repeating_ranged:RangedReload change:repeating_ranged:RangedReload change:repeating_ranged:RangedReloadRatingInput change:repeating_ranged:RangedWeapon_modtype1 change:repeating_ranged:RangedWeapon_mod1 change:repeating_ranged:RangedWeapon_modtype2 change:repeating_ranged:RangedWeapon_mod2 change:repeating_ranged:RangedWeapon_modtype3 change:repeating_ranged:RangedWeapon_mod3', function(event){
+on('change:repeating_ranged:RangedWeapon_settings_hide change:repeating_ranged:RangedWeaponName change:repeating_ranged:RangedBalisticSkill change:repeating_ranged:RangedBonus change:repeating_ranged:RangedStrengthBonus change:repeating_ranged:RangedDamageBonus change:repeating_ranged:WeaponRange change:repeating_ranged:RangedAmmo change:repeating_ranged:RangedAmmoType change:repeating_ranged:RangedDamage change:repeating_ranged:RangedQualities change:repeating_ranged:RangedImpale change:repeating_ranged:RangedAccurate change:repeating_ranged:RangedPrecise change:repeating_ranged:UsedImpact change:repeating_ranged:UsedHack change:repeating_ranged:UsedDangerous change:repeating_ranged:UsedImprecise change:repeating_ranged:RangedPractical change:repeating_ranged:RangedBlast change:repeating_ranged:RangedBlastRating change:repeating_ranged:RangedRepeater change:repeating_ranged:RangedRepeaterRating change:repeating_ranged:UsedEntangle change:repeating_ranged:RangedPenetrating change:repeating_ranged:UsedBlackpowder change:repeating_ranged:UsedDamaging change:repeating_ranged:RangedReload change:repeating_ranged:RangedReload change:repeating_ranged:RangedReloadRatingInput change:repeating_ranged:RangedWeapon_modtype1 change:repeating_ranged:RangedWeapon_mod1 change:repeating_ranged:RangedWeapon_modtype2 change:repeating_ranged:RangedWeapon_mod2 change:repeating_ranged:RangedWeapon_modtype3 change:repeating_ranged:RangedWeapon_mod3', function(event){
 	if (event.sourceType === 'sheetworker') return;
 	const playerclickedid = event.sourceAttribute.split('_')[2] || '';
 	getSectionIDs("repeating_ranged", function (ids) {
 		ids.forEach(id => {
 			if(playerclickedid.toLowerCase() == id.toLowerCase()) {
-				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_UsedImprecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_UsedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
+				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_UsedImprecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_melee_UsedImpact","repeating_ranged_UsedDangerous","repeating_ranged_UsedHack","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_UsedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
 					if(v.repeating_ranged_UsedRanged == 1)
 					{
 						setAttrs(
@@ -32363,6 +32455,9 @@ on('change:repeating_ranged:RangedWeapon_settings_hide change:repeating_ranged:R
 							"Used_RangedImprecise": v.repeating_ranged_UsedImprecise,
 							"Used_RangedPractical": v.repeating_ranged_RangedPractical,
 							"Used_RangedPenetrating": v.repeating_ranged_RangedPenetrating,
+							"Used_RangedImpact": v.repeating_melee_UsedImpact,
+							"Used_RangedHack": v.repeating_ranged_UsedHack,
+							"Used_RangedDangerous": v.repeating_ranged_UsedDangerous,
 							"Used_RangedBlackpowder": v.repeating_ranged_UsedBlackpowder,
 							"Used_RangedDamaging": v.repeating_ranged_UsedDamaging,
 							"Used_RangedReload": v.repeating_ranged_RangedReload,
@@ -32392,7 +32487,7 @@ on('sheet:opened', function(event){
 	if (event.sourceType === 'sheetworker') return;
 	getSectionIDs("repeating_ranged", function (ids) {
 		ids.forEach(id => {
-				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_UsedImprecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_UsedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
+				getAttrs(["repeating_ranged_RangedWeaponName","repeating_ranged_RangedBalisticSkill","repeating_ranged_RangedBonus","repeating_ranged_RangedStrengthBonus","repeating_ranged_RangedDamageBonus","repeating_ranged_WeaponRange","repeating_ranged_RangedAmmo","repeating_ranged_RangedAmmoType","repeating_ranged_RangedDamage","repeating_ranged_RangedQualities","repeating_ranged_RangedImpale","repeating_ranged_RangedPrecise","repeating_ranged_UsedImprecise","repeating_ranged_RangedPractical","repeating_ranged_RangedPenetrating","repeating_melee_UsedImpact","repeating_ranged_UsedDangerous","repeating_ranged_UsedHack","repeating_ranged_UsedDamaging","repeating_ranged_RangedReload","repeating_ranged_UsedEntangle","repeating_ranged_RangedBlast","repeating_ranged_RangedBlastRating","repeating_ranged_RangedRepeater","repeating_ranged_RangedRepeaterRating","repeating_ranged_RangedAccurate","repeating_ranged_UsedBlackpowder","repeating_ranged_RangedReloadRatingInput","repeating_ranged_UsedRanged","repeating_ranged_RangedWeapon_modtype1","repeating_ranged_RangedWeapon_mod1","repeating_ranged_RangedWeapon_modtype2","repeating_ranged_RangedWeapon_mod2","repeating_ranged_RangedWeapon_modtype3","repeating_ranged_RangedWeapon_mod3"], function(v) {
 					if(v.repeating_ranged_UsedRanged == 1)
 					{
 						setAttrs(
@@ -32413,6 +32508,9 @@ on('sheet:opened', function(event){
 							"Used_RangedImprecise": v.repeating_ranged_UsedImprecise,
 							"Used_RangedPractical": v.repeating_ranged_RangedPractical,
 							"Used_RangedPenetrating": v.repeating_ranged_RangedPenetrating,
+							"Used_RangedImpact": v.repeating_melee_UsedImpact,
+							"Used_RangedHack": v.repeating_ranged_UsedHack,
+							"Used_RangedDangerous": v.repeating_ranged_UsedDangerous,
 							"Used_RangedBlackpowder": v.repeating_ranged_UsedBlackpowder,
 							"Used_RangedDamaging": v.repeating_ranged_UsedDamaging,
 							"Used_RangedReload": v.repeating_ranged_RangedReload,
@@ -34152,7 +34250,7 @@ on('sheet:opened change:initiative_houserule', function(event) {
 on('clicked:meleeattackmain', (eventInfo) => {
 	getAttrs(["initiative_houserule"], function(v) {	
 	
-   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_MeleePrecise}+@{Used_MeleePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkMain}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Opposed Attack Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{ATTACK}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Opposed Attack Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttackMain)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{fast=[[@{Used_MeleeFast}]]}} {{slow=[[@{Used_MeleeSlow}]]}} {{hack=[[@{Used_MeleeHack}]]}} {{precise=[[@{Used_MeleePrecise}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[@{Used_MeleeTiring}]]}} {{penetrating=[[@{Used_MeleePenetrating}]]}} {{pummel=[[@{Used_MeleePummel}]]}} {{practical=[[@{Used_MeleePractical}]]}}';
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_MeleePrecise}+@{Used_MeleePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkMain}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Opposed Attack Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{ATTACK}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Opposed Attack Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttackMain)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{fast=[[@{Used_MeleeFast}]]}} {{slow=[[@{Used_MeleeSlow}]]}} {{hack=[[@{Used_MeleeHack}]]}} {{precise=[[@{Used_MeleePrecise}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[@{Used_MeleeTiring}]]}} {{penetrating=[[@{Used_MeleePenetrating}]]}} {{pummel=[[@{Used_MeleePummel}]]}} {{practical=[[@{Used_MeleePractical}]]}} {{wrap=[[@{Used_MeleeWrap}]]}} {{distract=[[@{Used_MeleeDistract}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
    let rollBegins = '@{Whisper} &{template:wfrp4e}';
@@ -34205,7 +34303,7 @@ on('clicked:meleechargemain', (eventInfo) => {
 	    }, {silent: true});	
 	
 	
-   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_MeleePrecise}+@{Used_MeleePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkMain}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Charge Attack Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{CHARGE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Charge Attack Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}meleechargemain)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{fast=[[@{Used_MeleeFast}]]}} {{slow=[[@{Used_MeleeSlow}]]}} {{hack=[[@{Used_MeleeHack}]]}} {{precise=[[@{Used_MeleePrecise}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[0]]}} {{penetrating=[[@{Used_MeleePenetrating}]]}} {{pummel=[[@{Used_MeleePummel}]]}} {{practical=[[@{Used_MeleePractical}]]}} {{charge=true}} ';
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_MeleePrecise}+@{Used_MeleePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkMain}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Charge Attack Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{CHARGE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Charge Attack Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}meleechargemain)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{fast=[[@{Used_MeleeFast}]]}} {{slow=[[@{Used_MeleeSlow}]]}} {{hack=[[@{Used_MeleeHack}]]}} {{precise=[[@{Used_MeleePrecise}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[0]]}} {{penetrating=[[@{Used_MeleePenetrating}]]}} {{pummel=[[@{Used_MeleePummel}]]}} {{practical=[[@{Used_MeleePractical}]]}} {{charge=true}} {{wrap=[[@{Used_MeleeWrap}]]}} {{distract=[[@{Used_MeleeDistract}]]}} ';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
    let rollBegins = '@{Whisper} &{template:wfrp4e}';
@@ -34251,7 +34349,7 @@ on('clicked:meleechargemain', (eventInfo) => {
 on('clicked:meleeopposedmain', (eventInfo) => {
 	getAttrs(["initiative_houserule"], function(v) {	
 	
-   let roll = '{{test=[[@{roll_rule}]]}} {{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{DefensiveTotal}+@{Used_MeleePractical}+@{Talent_RiposteLvl}+@{Talent_ReversalLvl}+(@{Used_MeleeShield}*@{Talent_ShieldsmanLvl}) [SL TOTAL]]]}} {{sladd=[[0]]}} {{slbonusdef=[[@{slbonusDefMain}]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Opposed Defense Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{modvalue=[[?{Opposed Defense Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{attacktype=^{PARRY}}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{showdmg=[[@{Used_MeleeOpposedDmg}]]}} {{hitlocation=true}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{armorqualities=@{armorQuality}}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Melee_def_modtype1}]]}} {{mod1=@{Used_Melee_def_mod1}}} {{mod2type=[[@{Used_Melee_def_modtype2}]]}} {{mod2=@{Used_Melee_def_mod2}}} {{mod3type=[[@{Used_Melee_def_modtype3}]]}} {{mod3=@{Used_Melee_def_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeOpposedMain)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{RTriposte=@{RT-ripostedmgmain}}} {{hack=[[@{Used_MeleeHack}]]}} {{practical=[[@{Used_MeleePractical}]]}} {{shieldsman=[[@{Used_MeleeShield}*@{Talent_ShieldsmanLvl}]]}} {{defensive=[[@{DefensiveTotal}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[@{Used_MeleeTiring}]]}} {{penetrating=[[@{Used_MeleePenetrating}]]}} {{pummel=[[@{Used_MeleePummel}]]}} {{riposte=[[@{Talent_RiposteLvl}]]}} {{reversal=[[@{Talent_ReversalLvl}]]}}';
+   let roll = '{{test=[[@{roll_rule}]]}} {{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{DefensiveTotal}+@{Used_MeleePractical}+@{Talent_RiposteLvl}+@{Talent_ReversalLvl}+(@{Used_MeleeShield}*@{Talent_ShieldsmanLvl}) [SL TOTAL]]]}} {{sladd=[[0]]}} {{slbonusdef=[[@{slbonusDefMain}]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Opposed Defense Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{modvalue=[[?{Opposed Defense Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{attacktype=^{PARRY}}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{showdmg=[[@{Used_MeleeOpposedDmg}]]}} {{hitlocation=true}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{armorqualities=@{armorQuality}}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Melee_def_modtype1}]]}} {{mod1=@{Used_Melee_def_mod1}}} {{mod2type=[[@{Used_Melee_def_modtype2}]]}} {{mod2=@{Used_Melee_def_mod2}}} {{mod3type=[[@{Used_Melee_def_modtype3}]]}} {{mod3=@{Used_Melee_def_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeOpposedMain)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{RTriposte=@{RT-ripostedmgmain}}} {{hack=[[@{Used_MeleeHack}]]}} {{practical=[[@{Used_MeleePractical}]]}} {{shieldsman=[[@{Used_MeleeShield}*@{Talent_ShieldsmanLvl}]]}} {{defensive=[[@{DefensiveTotal}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[@{Used_MeleeTiring}]]}} {{penetrating=[[@{Used_MeleePenetrating}]]}} {{pummel=[[@{Used_MeleePummel}]]}} {{riposte=[[@{Talent_RiposteLvl}]]}} {{reversal=[[@{Talent_ReversalLvl}]]}} {{trapblade=[[@{Used_MeleeTrapBlade}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
    let rollBegins = '@{Whisper} &{template:wfrp4e}';
@@ -34342,7 +34440,7 @@ on('clicked:meleeattackoff', (eventInfo) => {
 			if (values.Talent_AmbidextrousLvl == 2) {ambipen = 0;}
 			if (values.Used_MeleeTwohanded == 1) {ambipen = 0;}
 
-   let roll = '{{test=[[@{roll_rule}]]}} {{sl=[[0]]}} {{slbonus=[[@{Used_DefensePrecise}+@{Used_DefensePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkOff}]]}} {{sladd=[[0]]}} {{modvalue=[[?{Opposed Attack Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{ATTACK}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[>ambi<]] [PEN] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Opposed Attack Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{offpen=[[>ambi<]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{reach=@{Used_DefenseReach}}} {{damaging=[[@{Used_DefenseDamaging}]]}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttackOff)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{fast=[[@{Used_DefenseFast}]]}} {{slow=[[@{Used_DefenseSlow}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{tiring=[[@{Used_DefenseTiring}]]}} {{penetrating=[[@{Used_DefensePenetrating}]]}} {{pummel=[[@{Used_DefensePummel}]]}} {{hack=[[@{Used_DefenseHack}]]}} {{precise=[[@{Used_DefensePrecise}]]}} {{impact=[[@{Used_DefenseImpact}]]}} {{practical=[[@{Used_DefensePractical}]]}}';
+   let roll = '{{test=[[@{roll_rule}]]}} {{sl=[[0]]}} {{slbonus=[[@{Used_DefensePrecise}+@{Used_DefensePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkOff}]]}} {{sladd=[[0]]}} {{modvalue=[[?{Opposed Attack Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{ATTACK}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[>ambi<]] [PEN] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Opposed Attack Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{offpen=[[>ambi<]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{reach=@{Used_DefenseReach}}} {{damaging=[[@{Used_DefenseDamaging}]]}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttackOff)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{fast=[[@{Used_DefenseFast}]]}} {{slow=[[@{Used_DefenseSlow}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{tiring=[[@{Used_DefenseTiring}]]}} {{penetrating=[[@{Used_DefensePenetrating}]]}} {{pummel=[[@{Used_DefensePummel}]]}} {{hack=[[@{Used_DefenseHack}]]}} {{precise=[[@{Used_DefensePrecise}]]}} {{impact=[[@{Used_DefenseImpact}]]}} {{practical=[[@{Used_DefensePractical}]]}} {{wrap=[[@{Used_DefenseWrap}]]}} {{distract=[[@{Used_DefenseDistract}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
    let rollBegins = '@{Whisper} &{template:wfrp4e} ';
@@ -34400,7 +34498,7 @@ on('clicked:meleechargeoff', (eventInfo) => {
 	    }, {silent: true});	
 	
 	
-   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_DefensePrecise}+@{Used_DefensePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkOff}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Charge Attack Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{CHARGE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Charge Attack Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Defense_att_modtype1}]]}} {{mod1=@{Used_Defense_att_mod1}}} {{mod2type=[[@{Used_Defense_att_modtype2}]]}} {{mod2=@{Used_Defense_att_mod2}}} {{mod3type=[[@{Used_Defense_att_modtype3}]]}} {{mod3=@{Used_Defense_att_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}meleechargeoff)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{fast=[[@{Used_DefenseFast}]]}} {{slow=[[@{Used_DefenseSlow}]]}} {{hack=[[@{Used_DefenseHack}]]}} {{precise=[[@{Used_MeleePrecise}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[0]]}} {{penetrating=[[@{Used_DefensePenetrating}]]}} {{pummel=[[@{Used_DefensePummel}]]}} {{practical=[[@{Used_DefensePractical}]]}} {{charge=true}} ';
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_DefensePrecise}+@{Used_DefensePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkOff}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Charge Attack Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{CHARGE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Charge Attack Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Defense_att_modtype1}]]}} {{mod1=@{Used_Defense_att_mod1}}} {{mod2type=[[@{Used_Defense_att_modtype2}]]}} {{mod2=@{Used_Defense_att_mod2}}} {{mod3type=[[@{Used_Defense_att_modtype3}]]}} {{mod3=@{Used_Defense_att_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}meleechargeoff)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{fast=[[@{Used_DefenseFast}]]}} {{slow=[[@{Used_DefenseSlow}]]}} {{hack=[[@{Used_DefenseHack}]]}} {{precise=[[@{Used_MeleePrecise}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[0]]}} {{penetrating=[[@{Used_DefensePenetrating}]]}} {{pummel=[[@{Used_DefensePummel}]]}} {{practical=[[@{Used_DefensePractical}]]}} {{charge=true}} {{wrap=[[@{Used_DefenseWrap}]]}} {{distract=[[@{Used_DefenseDistract}]]}} ';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
    let rollBegins = '@{Whisper} &{template:wfrp4e}';
@@ -34460,7 +34558,7 @@ on('clicked:meleeopposedoff', (eventInfo) => {
                console.log("Test Opp OFF");	
                console.log(offpen);		
 	
-   let roll = '{{test=[[@{roll_rule}]]}} {{sl=[[0]]}} {{slbonus=[[@{DefensiveTotal}+@{Used_DefensePractical}+@{Talent_RiposteLvl}+@{Talent_ReversalLvl}+(@{Used_DefenseShield}*@{Talent_ShieldsmanLvl})]]}} {{sladd=[[0]]}} {{slbonusdef=[[@{slbonusDefOff}]]}} {{modvalue=[[?{Opposed Defense Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[>offpen<]] [PEN] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Opposed Defense Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{reach=@{Used_DefenseReach}}} {{damaging=[[@{Used_DefenseDamaging}]]}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{offpen=[[>offpen<]]}} {{qualities=@{Used_DefenseQualities}}} {{showdmg=[[@{Used_DefenseOpposedDmg}]]}} {{hitlocation=true}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{armorqualities=@{armorQuality}}} {{attacktype=^{PARRY}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{RTriposte=@{RT-ripostedmgoff}}} {{reroll=@{RT-reroll}MeleeOpposedOff)}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{hack=[[@{Used_DefenseHack}]]}} {{shieldsman=[[@{Used_DefenseShield}*@{Talent_ShieldsmanLvl}]]}} {{practical=[[@{Used_DefensePractical}]]}} {{impact=[[@{Used_DefenseImpact}]]}} {{tiring=[[@{Used_DefenseTiring}]]}} {{penetrating=[[@{Used_DefensePenetrating}]]}} {{pummel=[[@{Used_DefensePummel}]]}} {{defensive=[[@{DefensiveTotal}]]}} {{riposte=[[@{Talent_RiposteLvl}]]}} {{reversal=[[@{Talent_ReversalLvl}]]}}';
+   let roll = '{{test=[[@{roll_rule}]]}} {{sl=[[0]]}} {{slbonus=[[@{DefensiveTotal}+@{Used_DefensePractical}+@{Talent_RiposteLvl}+@{Talent_ReversalLvl}+(@{Used_DefenseShield}*@{Talent_ShieldsmanLvl})]]}} {{sladd=[[0]]}} {{slbonusdef=[[@{slbonusDefOff}]]}} {{modvalue=[[?{Opposed Defense Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[>offpen<]] [PEN] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Opposed Defense Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{reach=@{Used_DefenseReach}}} {{damaging=[[@{Used_DefenseDamaging}]]}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{offpen=[[>offpen<]]}} {{qualities=@{Used_DefenseQualities}}} {{showdmg=[[@{Used_DefenseOpposedDmg}]]}} {{hitlocation=true}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{armorqualities=@{armorQuality}}} {{attacktype=^{PARRY}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{RTriposte=@{RT-ripostedmgoff}}} {{reroll=@{RT-reroll}MeleeOpposedOff)}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{hack=[[@{Used_DefenseHack}]]}} {{shieldsman=[[@{Used_DefenseShield}*@{Talent_ShieldsmanLvl}]]}} {{practical=[[@{Used_DefensePractical}]]}} {{impact=[[@{Used_DefenseImpact}]]}} {{tiring=[[@{Used_DefenseTiring}]]}} {{penetrating=[[@{Used_DefensePenetrating}]]}} {{pummel=[[@{Used_DefensePummel}]]}} {{defensive=[[@{DefensiveTotal}]]}} {{riposte=[[@{Talent_RiposteLvl}]]}} {{reversal=[[@{Talent_ReversalLvl}]]}} {{trapblade=[[@{Used_DefenseTrapBlade}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
    let rollBegins = '@{Whisper} &{template:wfrp4e}';
@@ -34538,7 +34636,7 @@ on('clicked:ripostedmgoff', (eventInfo) => {
 on('clicked:rangedatk', (eventInfo) => {
 	getAttrs(["initiative_houserule"], function(v) {	
 	
-   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_RangedPrecise}+@{Used_RangedPractical}-@{Used_RangedImprecise} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusRgd}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Ranged Attack Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[10*@{Used_RangedAccurate}]] [TALENTS] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_RangedDamaging}]]}} {{reach=@{Used_WeaponRange}}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}+@{Talent_AccurateShotLvl}]]}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAtk)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{precise=[[@{Used_RangedPrecise}]]}} {{imprecise=[[@{Used_RangedImprecise}]]}} {{blast=[[@{Used_RangedBlast}*@{Used_RangedBlastRating}]]}} {{repeater=[[@{Used_RangedRepeater}*@{Used_RangedRepeaterRating}]]}} {{entangle=[[@{Used_RangedEntangle}]]}} {{penetrating=[[@{Used_RangedPenetrating}]]}} {{tiring=[[0]]}} {{blackpowder=[[@{Used_RangedBlackpowder}]]}} {{practical=[[@{Used_RangedPractical}]]}} {{accurate=[[@{Used_RangedAccurate}*10]]}}';
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_RangedPrecise}+@{Used_RangedPractical}-@{Used_RangedImprecise} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusRgd}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Ranged Attack Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[10*@{Used_RangedAccurate}]] [TALENTS] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_RangedDamaging}]]}} {{reach=@{Used_WeaponRange}}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}+@{Talent_AccurateShotLvl}]]}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAtk)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{precise=[[@{Used_RangedPrecise}]]}} {{imprecise=[[@{Used_RangedImprecise}]]}} {{blast=[[@{Used_RangedBlast}*@{Used_RangedBlastRating}]]}} {{repeater=[[@{Used_RangedRepeater}*@{Used_RangedRepeaterRating}]]}} {{entangle=[[@{Used_RangedEntangle}]]}} {{penetrating=[[@{Used_RangedPenetrating}]]}} {{tiring=[[0]]}} {{blackpowder=[[@{Used_RangedBlackpowder}]]}} {{practical=[[@{Used_RangedPractical}]]}} {{accurate=[[@{Used_RangedAccurate}*10]]}} {{hack=[[@{Used_RangedHack}]]}} {{dangerous=[[@{Used_RangedDangerous}]]}} {{impact=[[@{Used_RangedImpact}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
    let rollBegins = '@{Whisper} &{template:wfrp4e}';
diff --git a/Warhammer 4e Character Sheet/translation.json b/Warhammer 4e Character Sheet/translation.json
index 51e86d2e50..07eccf3b43 100644
--- a/Warhammer 4e Character Sheet/translation.json	
+++ b/Warhammer 4e Character Sheet/translation.json	
@@ -1262,9 +1262,9 @@
 	"TARGET-MODIFIERS": "Target Modifiers",
 	"ACCURATE-SHOT": "Accurate Shot",
 	"FAST": "Fast",
-	"FAST-EFFECT": "Fast: Defender -10 Roll if not Fast",
+	"FAST-EFFECT": "Fast: Defender -10 Roll Mod if not Fast",
 	"SLOW": "Slow",
-	"SLOW-EFFECT": "Slow: Defender gains +1 SL Mod",
+	"SLOW-EFFECT": "Slow: Defender Opposed test +1 SL Mod",
 	"TIRING": "Tiring",
 	"HACK": "Hack",
 	"HACK-EFFECT": "Hack: On hit HitLoc Armor Dmg +1",
@@ -1281,7 +1281,9 @@
 	"BLAST-EFFECT": "Blast: Dmg hits all within",
 	"ACCURATE": "Accurate",
 	"DISTRACT": "Distract",
+	"DISTRACT-EFFECT": "Distract: Push back defender",
 	"WRAP": "Wrap",
+	"WRAP-EFFECT": "Wrap: Defender Opposed test -1 SL Mod",
 	"ENTANGLE": "Entangle",
 	"REPEATER": "Repeater",
 	"TRAP-BLADE": "Trap Blade",

From 79b86bee3e2b09353915dbc2592e2df6d46bb98b Mon Sep 17 00:00:00 2001
From: Djjus <59532170+Djjus@users.noreply.github.com>
Date: Wed, 15 Sep 2021 00:05:38 +0100
Subject: [PATCH 6/9] btn text adjust

---
 .../Warhammer 4e Character Sheet.css                        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css
index 82e15d8146..84e7a5e811 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css	
@@ -279,6 +279,12 @@ button[type=action] {
 	line-height: 100%;
 	text-shadow:  0 1px 1px rgba(0,0,0,1);
 }
+button[type=action].sheet-tab-conditions-button,
+button[type=action].sheet-cond-reset {
+	color: black;
+	text-shadow:  0 1px 1px white;
+}
+
 button[type=action].sheet-combat-actions-np,
 button[type=action].sheet-roll,
 button[type=roll] {

From 36600548623c8a3a7a962aa158a4ddaf5d8c8f83 Mon Sep 17 00:00:00 2001
From: Djjus <59532170+Djjus@users.noreply.github.com>
Date: Wed, 15 Sep 2021 00:50:36 +0100
Subject: [PATCH 7/9] spell trigger fixes

---
 .../Warhammer 4e Character Sheet.html                  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index 8d57d2c94b..7ac9fea885 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
@@ -34723,7 +34723,7 @@ on('clicked:rangedweaponrld', (eventInfo) => {
 on('clicked:repeating_spellbookpetty:spellcast clicked:repeating_spellbookpetty:spellcastdmg', (eventInfo) => {
 	getAttrs(["initiative_houserule"], function(v) {	
 	
-   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Talent_InstinctiveDictionLvl}+@{Talent_PerfectPitchLvl} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusCast}]]}} {{sladd=[[0]]}} {{modvalue=[[?{@{translation_modifier}|@{prefix2-_SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{prefix2-_spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{prefix2-_PettySpell_modtype1}]]}} {{mod1=@{prefix2-_PettySpell_mod1}}} {{mod2type=[[@{prefix2-_PettySpell_modtype2}]]}} {{mod2=@{prefix2-_PettySpell_mod2}}} {{mod3type=[[@{prefix2-_PettySpell_modtype3}]]}} {{mod3=@{prefix2-_PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=[1](~@{character_name}|prefix2-_spellcast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveandPitch}]]}}';
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Talent_InstinctiveDictionLvl}+@{Talent_PerfectPitchLvl} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusCast}]]}} {{sladd=[[0]]}} {{modvalue=[[?{@{translation_modifier}|@{prefix2-_SpellMod}}]]}} {{title=@{prefix2-_spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{prefix2-_spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{prefix2-_PettySpell_modtype1}]]}} {{mod1=@{prefix2-_PettySpell_mod1}}} {{mod2type=[[@{prefix2-_PettySpell_modtype2}]]}} {{mod2=@{prefix2-_PettySpell_mod2}}} {{mod3type=[[@{prefix2-_PettySpell_modtype3}]]}} {{mod3=@{prefix2-_PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=[1](~@{character_name}|prefix2-_spellcast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveandPitch}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var skillpre = trigger.split('_');
    var skill = skillpre[3];
@@ -34774,7 +34774,7 @@ on('clicked:repeating_spellbookpetty:spellcast clicked:repeating_spellbookpetty:
 on('clicked:repeating_spellbookarcane:spellcast clicked:repeating_spellbookarcane:spellcastdmg', (eventInfo) => {
 	getAttrs(["initiative_houserule"], function(v) {	
 	
-   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Talent_InstinctiveDictionLvl}+@{Talent_PerfectPitchLvl} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusCast}]]}} {{sladd=[[0]]}} {{modvalue=[[?{@{translation_modifier}|@{prefix2-_SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{prefix2-_spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{spellcastingnumber=[[@{prefix2-_spellcastingnumber}]]}} {{accuchanexlsl=[[@{prefix2-_spellchannelsl}]]}} {{mod1type=[[@{prefix2-_ArcaneSpell_modtype1}]]}} {{mod1=@{prefix2-_ArcaneSpell_mod1}}} {{mod2type=[[@{prefix2-_ArcaneSpell_modtype2}]]}} {{mod2=@{prefix2-_ArcaneSpell_mod2}}} {{mod3type=[[@{prefix2-_ArcaneSpell_modtype3}]]}} {{mod3=@{prefix2-_ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=[1](~@{character_name}|prefix2-_spellcast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveandPitch}]]}}';
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Talent_InstinctiveDictionLvl}+@{Talent_PerfectPitchLvl} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusCast}]]}} {{sladd=[[0]]}} {{modvalue=[[?{@{translation_modifier}|@{prefix2-_SpellMod}}]]}} {{title=@{prefix2-_spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{prefix2-_spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{spellcastingnumber=[[@{prefix2-_spellcastingnumber}]]}} {{accuchanexlsl=[[@{prefix2-_spellchannelsl}]]}} {{mod1type=[[@{prefix2-_ArcaneSpell_modtype1}]]}} {{mod1=@{prefix2-_ArcaneSpell_mod1}}} {{mod2type=[[@{prefix2-_ArcaneSpell_modtype2}]]}} {{mod2=@{prefix2-_ArcaneSpell_mod2}}} {{mod3type=[[@{prefix2-_ArcaneSpell_modtype3}]]}} {{mod3=@{prefix2-_ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=[1](~@{character_name}|prefix2-_spellcast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveandPitch}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var skillpre = trigger.split('_');
    var skill = skillpre[3];
@@ -34875,17 +34875,13 @@ on('clicked:repeating_spellbookarcane:extchannellingloreroll', (eventInfo) => {
 on('clicked:repeating_divineblessings:bless', (eventInfo) => {
 	getAttrs(["initiative_houserule"], function(v) {	
 	
-   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[ [SL TOTAL]]]}} {{sladd=[[0]]}} {{slbonusatk=[[0]]}} {{modvalue=[[?{@{translation_modifier}|@{prefix2-_BlessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{prefix2-_blessingrange}}} {{spelltarget=Targets: @{prefix2-_blessingtarget}}} {{spellduration=Duration: @{prefix2-_blessingduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[{@{PrayChar}+@{PrayAdv}+@{PrayMisc}}]] [SKILL] + ?{@{translation_modifier}|@{prefix2-_BlessMod}} [MOD] ]]}} {{spelldescription=@{prefix2-_blessingdesc}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[7]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{mod1type=[[@{prefix2-_BlessingSpell_modtype1}]]}} {{mod1=@{prefix2-_BlessingSpell_mod1}}} {{mod2type=[[@{prefix2-_BlessingSpell_modtype2}]]}} {{mod2=@{prefix2-_BlessingSpell_mod2}}} {{mod3type=[[@{prefix2-_BlessingSpell_modtype3}]]}} {{mod3=@{prefix2-_BlessingSpell_mod3}}} {{NPC=[[0]]}} {{RTwrath=@{RT-wrath}}} {{reroll=[1](~@{character_name}|bless)}}';
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[0 [SL TOTAL]]]}} {{sladd=[[0]]}} {{slbonusatk=[[0]]}} {{modvalue=[[?{@{translation_modifier}|@{prefix2-_BlessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{prefix2-_spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{prefix2-_blessingrange}}} {{spelltarget=Targets: @{prefix2-_blessingtarget}}} {{spellduration=Duration: @{prefix2-_blessingduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[{@{PrayChar}+@{PrayAdv}+@{PrayMisc}}]] [SKILL] + ?{@{translation_modifier}|@{prefix2-_BlessMod}} [MOD] ]]}} {{spelldescription=@{prefix2-_blessingdesc}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[7]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{mod1type=[[@{prefix2-_BlessingSpell_modtype1}]]}} {{mod1=@{prefix2-_BlessingSpell_mod1}}} {{mod2type=[[@{prefix2-_BlessingSpell_modtype2}]]}} {{mod2=@{prefix2-_BlessingSpell_mod2}}} {{mod3type=[[@{prefix2-_BlessingSpell_modtype3}]]}} {{mod3=@{prefix2-_BlessingSpell_mod3}}} {{NPC=[[0]]}} {{RTwrath=@{RT-wrath}}} {{reroll=[1](~@{character_name}|bless)}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = eventInfo.triggerName.slice(8, -6);
    
    let rollBegins = '@{Whisper} &{template:wfrp4e}';
    let rollPart = roll.replaceAll('prefix2-', `${prefix}`);
    
-               console.log("Test Skill");	
-               console.log(trigger);		
-               console.log(prefix);		
-   
 				
         startRoll(rollBegins + rollPart, (results) => {
             const target = results.results.target.result

From 117fa839828e6145da2a040b927eba23b6478b9d Mon Sep 17 00:00:00 2001
From: Djjus <59532170+Djjus@users.noreply.github.com>
Date: Wed, 15 Sep 2021 00:57:24 +0100
Subject: [PATCH 8/9] further spell trg fixes

---
 Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index 7ac9fea885..e656dae107 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
@@ -34723,7 +34723,7 @@ on('clicked:rangedweaponrld', (eventInfo) => {
 on('clicked:repeating_spellbookpetty:spellcast clicked:repeating_spellbookpetty:spellcastdmg', (eventInfo) => {
 	getAttrs(["initiative_houserule"], function(v) {	
 	
-   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Talent_InstinctiveDictionLvl}+@{Talent_PerfectPitchLvl} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusCast}]]}} {{sladd=[[0]]}} {{modvalue=[[?{@{translation_modifier}|@{prefix2-_SpellMod}}]]}} {{title=@{prefix2-_spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{prefix2-_spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{prefix2-_PettySpell_modtype1}]]}} {{mod1=@{prefix2-_PettySpell_mod1}}} {{mod2type=[[@{prefix2-_PettySpell_modtype2}]]}} {{mod2=@{prefix2-_PettySpell_mod2}}} {{mod3type=[[@{prefix2-_PettySpell_modtype3}]]}} {{mod3=@{prefix2-_PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=[1](~@{character_name}|prefix2-_spellcast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveandPitch}]]}}';
+   let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Talent_InstinctiveDictionLvl}+@{Talent_PerfectPitchLvl} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusCast}]]}} {{sladd=[[0]]}} {{modvalue=[[?{@{translation_modifier}|@{prefix2-_SpellMod}}]]}} {{title=@{prefix2-_spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{prefix2-_spellrange}}} {{spelltarget=Targets: @{prefix2-_spelltarget}}} {{spellduration=Duration: @{prefix2-_spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{prefix2-_spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{prefix2-_PettySpell_modtype1}]]}} {{mod1=@{prefix2-_PettySpell_mod1}}} {{mod2type=[[@{prefix2-_PettySpell_modtype2}]]}} {{mod2=@{prefix2-_PettySpell_mod2}}} {{mod3type=[[@{prefix2-_PettySpell_modtype3}]]}} {{mod3=@{prefix2-_PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=[1](~@{character_name}|prefix2-_spellcast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveandPitch}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var skillpre = trigger.split('_');
    var skill = skillpre[3];

From 3c14fcf73226e0f7a5cd33b34313a487f4382c3e Mon Sep 17 00:00:00 2001
From: Djjus <59532170+Djjus@users.noreply.github.com>
Date: Wed, 15 Sep 2021 01:37:37 +0100
Subject: [PATCH 9/9] revert rt  name to maintain chat

---
 .../Warhammer 4e Character Sheet.css          | 1152 ++++++++---------
 .../Warhammer 4e Character Sheet.html         |  778 +++++------
 2 files changed, 965 insertions(+), 965 deletions(-)

diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css
index 84e7a5e811..7312d4825b 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css	
@@ -1,5 +1,5 @@
 /* === BODY === */
-*, .sheet-rolltemplate-wfrp4e * {
+*, .sheet-rolltemplate-whfrp2e * {
 	box-sizing: border-box;
 }
 @font-face {
@@ -688,7 +688,7 @@ display:flex;
 
 /* === LAYOUT === */
 .sheet-float-right,
-.sheet-rolltemplate-wfrp4e .sheet-float-right {
+.sheet-rolltemplate-whfrp2e .sheet-float-right {
 	float: right;
 }
 .sheet-inline {
@@ -697,7 +697,7 @@ display:flex;
 .sheet-inline-block {
 	display: inline-block;
 }
-.sheet-rolltemplate-wfrp4e .sheet-relative,
+.sheet-rolltemplate-whfrp2e .sheet-relative,
 .sheet-relative {
 	position: relative;
 }
@@ -905,18 +905,18 @@ display:flex;
 
 /* === TOOLTIPS === */
 .sheet-tooltip-position-wrapper,
-.sheet-rolltemplate-wfrp4e .sheet-tooltip-position-wrapper {
+.sheet-rolltemplate-whfrp2e .sheet-tooltip-position-wrapper {
 	position: absolute;
 	top: 1px;
 	right: 1px;
 	z-index: 99;
 }
 .sheet-tooltip,
-.sheet-rolltemplate-wfrp4e .sheet-tooltip {
+.sheet-rolltemplate-whfrp2e .sheet-tooltip {
 	position: relative;
 }
 .sheet-tooltip-toggle-text,
-.sheet-rolltemplate-wfrp4e .sheet-tooltip-toggle-text {
+.sheet-rolltemplate-whfrp2e .sheet-tooltip-toggle-text {
 	border-radius: 50%;
 	line-height: 100%;
 	font-size: 77%;
@@ -928,7 +928,7 @@ display:flex;
 	font-weight: bold;
 }
 .sheet-tooltip [class*="sheet-tooltip-content"],
-.sheet-rolltemplate-wfrp4e .sheet-tooltip [class*="sheet-tooltip-content"] {
+.sheet-rolltemplate-whfrp2e .sheet-tooltip [class*="sheet-tooltip-content"] {
 	z-index: 99;
 	position: absolute;
 	color: #FFFFFF;
@@ -943,23 +943,23 @@ display:flex;
 	text-align: left;
 }
 .sheet-tooltip .sheet-tooltip-small,
-.sheet-rolltemplate-wfrp4e .sheet-tooltip .sheet-tooltip-small {
+.sheet-rolltemplate-whfrp2e .sheet-tooltip .sheet-tooltip-small {
 	width: 80px;
 }
 .sheet-tooltip .sheet-tooltip-content-left,
-.sheet-rolltemplate-wfrp4e .sheet-tooltip .sheet-tooltip-content-left {
+.sheet-rolltemplate-whfrp2e .sheet-tooltip .sheet-tooltip-content-left {
 	right: 100%;
 	margin-right: 12px;
 	border-top-left-radius: 4px;
 }
 .sheet-tooltip .sheet-tooltip-content-right,
-.sheet-rolltemplate-wfrp4e .sheet-tooltip .sheet-tooltip-content-right {
+.sheet-rolltemplate-whfrp2e .sheet-tooltip .sheet-tooltip-content-right {
 	left: 100%;
 	margin-left: 12px;
 	border-top-right-radius: 4px;
 }
 .sheet-tooltip [class*="sheet-tooltip-content"]:after,
-.sheet-rolltemplate-wfrp4e .sheet-tooltip [class*="sheet-tooltip-content"]:after {
+.sheet-rolltemplate-whfrp2e .sheet-tooltip [class*="sheet-tooltip-content"]:after {
 	content: '';
 	position: absolute;
 	top: 9px;
@@ -968,19 +968,19 @@ display:flex;
 	border-bottom: 8px solid transparent;
 }
 .sheet-tooltip .sheet-tooltip-content-left:after,
-.sheet-rolltemplate-wfrp4e .sheet-tooltip .sheet-tooltip-content-left:after {
+.sheet-rolltemplate-whfrp2e .sheet-tooltip .sheet-tooltip-content-left:after {
 	right: -8px;
 	border-left: 8px solid #000000;
 }
 .sheet-tooltip .sheet-tooltip-content-right:after,
-.sheet-rolltemplate-wfrp4e .sheet-tooltip .sheet-tooltip-content-right:after {
+.sheet-rolltemplate-whfrp2e .sheet-tooltip .sheet-tooltip-content-right:after {
 	left: -8px;
 	border-right: 8px solid #000000;
 }
 .sheet-tooltip:hover [class*="sheet-tooltip-content"],
 .sheet-tooltip:focus [class*="sheet-tooltip-content"],
-.sheet-rolltemplate-wfrp4e .sheet-tooltip:hover [class*="sheet-tooltip-content"],
-.sheet-rolltemplate-wfrp4e .sheet-tooltip:focus [class*="sheet-tooltip-content"] {
+.sheet-rolltemplate-whfrp2e .sheet-tooltip:hover [class*="sheet-tooltip-content"],
+.sheet-rolltemplate-whfrp2e .sheet-tooltip:focus [class*="sheet-tooltip-content"] {
 	visibility: visible;
 	z-index: 999;
 }
@@ -1901,7 +1901,7 @@ input {
 }
 
 .sheet-small-label,
-.sheet-rolltemplate-wfrp4e .sheet-small-label {
+.sheet-rolltemplate-whfrp2e .sheet-small-label {
 	font-size: 10px !important;
 	line-height: 100%;
 	padding-top: 2px;
@@ -1910,7 +1910,7 @@ input {
 }
 
 .sheet-small-label-white,
-.sheet-rolltemplate-wfrp4e .sheet-small-label-white {
+.sheet-rolltemplate-whfrp2e .sheet-small-label-white {
 	font-size: 11px !important;
     font-family: 'WH font';
 	font-weight: bold;
@@ -1944,7 +1944,7 @@ input {
 
 
 .sheet-last-updated,
-.sheet-rolltemplate-wfrp4e .sheet-last-updated {
+.sheet-rolltemplate-whfrp2e .sheet-last-updated {
 	font-size: 85%!important;
 	font-style: italic;
 	font-weight: bold;
@@ -1952,7 +1952,7 @@ input {
 }
 
 .sheet-hd-row,
-.sheet-rolltemplate-wfrp4e .sheet-hd-row {
+.sheet-rolltemplate-whfrp2e .sheet-hd-row {
 	font-size: 62% !important;
 	line-height: 100% !important;
 }
@@ -1960,45 +1960,45 @@ input {
 
 /* === FONTS === */
 .sheet-pictos,
-.sheet-rolltemplate-wfrp4e .sheet-pictos {
+.sheet-rolltemplate-whfrp2e .sheet-pictos {
 	font-family: "Pictos";
 	font-size: 14px;
 }
 .sheet-pictos-custom,
-.sheet-rolltemplate-wfrp4e .sheet-pictos-custom {
+.sheet-rolltemplate-whfrp2e .sheet-pictos-custom {
 	font-family: "Pictos Custom";
 	font-size: 14px;
 }
 .sheet-pictos-three,
-.sheet-rolltemplate-wfrp4e .sheet-pictos-three {
+.sheet-rolltemplate-whfrp2e .sheet-pictos-three {
 	font-family: "Pictos Three";
 	font-size: 14px;
 }
 .sheet-concentration-icon,
-.sheet-rolltemplate-wfrp4e .sheet-concentration-icon {
+.sheet-rolltemplate-whfrp2e .sheet-concentration-icon {
 	font-size: 14px;
 }
 .sheet-ritual-icon,
-.sheet-rolltemplate-wfrp4e .sheet-ritual-icon {
+.sheet-rolltemplate-whfrp2e .sheet-ritual-icon {
 	font-size: 16px;
 }
 .sheet-d6-font,
-.sheet-rolltemplate-wfrp4e .sheet-d6-font {
+.sheet-rolltemplate-whfrp2e .sheet-d6-font {
 	font-family: "dicefontd6";
 	font-size: 14px;
 }
 .sheet-d8-font,
-.sheet-rolltemplate-wfrp4e .sheet-d8-font {
+.sheet-rolltemplate-whfrp2e .sheet-d8-font {
 	font-family: "dicefontd8";
 	font-size: 14px;
 }
 .sheet-d10-font,
-.sheet-rolltemplate-wfrp4e .sheet-d10-font {
+.sheet-rolltemplate-whfrp2e .sheet-d10-font {
 	font-family: "dicefontd10";
 	font-size: 14px;
 }
 .sheet-d20-font,
-.sheet-rolltemplate-wfrp4e .sheet-d20-font {
+.sheet-rolltemplate-whfrp2e .sheet-d20-font {
 	font-family: "dicefontd20";
 	font-size: 14px;
 }
@@ -2006,43 +2006,43 @@ input {
 
 /* === BORDERS === */
 .sheet-border-right,
-.sheet-rolltemplate-wfrp4e .sheet-border-right {
+.sheet-rolltemplate-whfrp2e .sheet-border-right {
 	border-right: 1px solid #b8b8b8;
 }
 .sheet-border-left,
-.sheet-rolltemplate-wfrp4e .sheet-border-left {
+.sheet-rolltemplate-whfrp2e .sheet-border-left {
 	border-left: 1px solid #b8b8b8;
 }
 .sheet-border-right2,
-.sheet-rolltemplate-wfrp4e .sheet-border-right2 {
+.sheet-rolltemplate-whfrp2e .sheet-border-right2 {
 	border-right: 2px solid #000;
 }
 .sheet-border-left2,
-.sheet-rolltemplate-wfrp4e .sheet-border-left2 {
+.sheet-rolltemplate-whfrp2e .sheet-border-left2 {
 	border-left: 2px solid #000;
 }
 .sheet-border-top,
-.sheet-rolltemplate-wfrp4e .sheet-border-top {
+.sheet-rolltemplate-whfrp2e .sheet-border-top {
 	border-top: 1px solid #000;
 }
 .sheet-border-bottom,
-.sheet-rolltemplate-wfrp4e .sheet-border-bottom {
+.sheet-rolltemplate-whfrp2e .sheet-border-bottom {
 	border-bottom: 1px solid #000;
 }
 .sheet-border-right-dotted,
-.sheet-rolltemplate-wfrp4e .sheet-border-right-dotted {
+.sheet-rolltemplate-whfrp2e .sheet-border-right-dotted {
 	border-right: 1px dotted #000;
 }
 .sheet-border-left-dotted,
-.sheet-rolltemplate-wfrp4e .sheet-border-left-dotted {
+.sheet-rolltemplate-whfrp2e .sheet-border-left-dotted {
 	border-left: 1px dotted #000;
 }
 .sheet-border-top-dotted,
-.sheet-rolltemplate-wfrp4e .sheet-border-top-dotted {
+.sheet-rolltemplate-whfrp2e .sheet-border-top-dotted {
 	border-top: 1px dotted #000;
 }
 .sheet-border-bottom-dotted,
-.sheet-rolltemplate-wfrp4e .sheet-border-bottom-dotted {
+.sheet-rolltemplate-whfrp2e .sheet-border-bottom-dotted {
 	border-bottom: 1px dotted #000;
 }
 
@@ -2231,7 +2231,7 @@ button[type=roll].sheet-talent-show::before {
 	content: none;
 }
 hr,
-.sheet-rolltemplate-wfrp4e hr {
+.sheet-rolltemplate-whfrp2e hr {
 	border: 0;
 	height: 1px;
 	background-image: -webkit-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,75.75), rgba(0,0,0,0));
@@ -2242,17 +2242,17 @@ hr,
 }
 
 span.sheet-spacer,
-.sheet-rolltemplate-wfrp4e span.sheet-spacer {
+.sheet-rolltemplate-whfrp2e span.sheet-spacer {
 	display: block;
 	margin-top: 5px;
 }
 .sheet-spacer-l,
-.sheet-rolltemplate-wfrp4e span.sheet-spacer-l {
+.sheet-rolltemplate-whfrp2e span.sheet-spacer-l {
 	display: block;
 	margin-top: 10px;
 }
 .sheet-spacer-xl,
-.sheet-rolltemplate-wfrp4e span.sheet-spacer-xl  {
+.sheet-rolltemplate-whfrp2e span.sheet-spacer-xl  {
 	display: block;
 	margin-top: 20px;
 }
@@ -2269,22 +2269,22 @@ span.sheet-spacer,
 	margin-bottom: 5px;
 }
 .sheet-vert-top,
-.sheet-rolltemplate-wfrp4e .sheet-vert-top {
+.sheet-rolltemplate-whfrp2e .sheet-vert-top {
 	vertical-align: top !important;
 }
 .sheet-vert-middle,
-.sheet-rolltemplate-wfrp4e .sheet-vert-middle {
+.sheet-rolltemplate-whfrp2e .sheet-vert-middle {
 	vertical-align: middle !important;
 }
 .sheet-text-middle {
 	text-align: middle !important;
 }
 .sheet-vert-bottom,
-.sheet-rolltemplate-wfrp4e .sheet-vert-bottom {
+.sheet-rolltemplate-whfrp2e .sheet-vert-bottom {
 	vertical-align: bottom !important;
 }
 .sheet-center,
-.sheet-rolltemplate-wfrp4e .sheet-center {
+.sheet-rolltemplate-whfrp2e .sheet-center {
 	text-align: center;
     font-family: 'WH font';
 }
@@ -2458,7 +2458,7 @@ input[disabled].sheet-passive-skill-score {
 
 /* === ROLLTEMPLATE === */
 [class^="sheet-col"],
-.sheet-rolltemplate-wfrp4e [class^="sheet-col"] {
+.sheet-rolltemplate-whfrp2e [class^="sheet-col"] {
 	display: inline-block;
 	*display: inline; /* IE < 8: fake inline-block */
 	zoom: 1;
@@ -2467,12 +2467,12 @@ input[disabled].sheet-passive-skill-score {
 
 	text-rendering: auto;
 }
-.sheet-rolltemplate-wfrp4e_char table {
+.sheet-rolltemplate-whfrp2e_char table {
 	width: 100%;
 	padding: 2px;
 	background:url(http://i.imgur.com/BLb0XMU.jpg) top left repeat;
 }
-.sheet-rolltemplate-wfrp4e_char th {
+.sheet-rolltemplate-whfrp2e_char th {
     color: rgb(233, 223, 151);
     background-color: rgb(63, 32, 33);
     padding-left: 5px;
@@ -2482,23 +2482,23 @@ input[disabled].sheet-passive-skill-score {
     font-family: "Arial", Helvetica, sans-serif;
     text-transform: uppercase;
 }
-.sheet-rolltemplate-wfrp4e_char .sheet-arrow-right {
+.sheet-rolltemplate-whfrp2e_char .sheet-arrow-right {
     border-top: 3px solid transparent;
     border-bottom: 3px solid transparent;
     border-left: 180px solid rgb(126, 45, 64);
 }
-.sheet-rolltemplate-wfrp4e_char .sheet-tcat {
+.sheet-rolltemplate-whfrp2e_char .sheet-tcat {
     font-weight: bold;
 }
-.sheet-rolltemplate-wfrp4e_char td {
+.sheet-rolltemplate-whfrp2e_char td {
     padding-left: 5px;
     font-size: 0.9em;
 }
-.sheet-rolltemplate-wfrp4e_char .inlinerollresult  {
+.sheet-rolltemplate-whfrp2e_char .inlinerollresult  {
     background-color: transparent;
     border: none;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-no-yellow-bg .inlinerollresult {
+.sheet-rolltemplate-whfrp2e .sheet-rt-card .sheet-main-content .sheet-row .sheet-no-yellow-bg .inlinerollresult {
     background-color: transparent;
 	font-style: normal;
 	font-size: 12px;
@@ -2508,7 +2508,7 @@ input[disabled].sheet-passive-skill-score {
 	-moz-text-decoration-color: #D79340;
 	text-decoration-color: #D79340;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-no-yellow-bg2 .inlinerollresult {
+.sheet-rolltemplate-whfrp2e .sheet-rt-card .sheet-main-content .sheet-row .sheet-no-yellow-bg2 .inlinerollresult {
     background-color: transparent;
 	font-style: normal;
 	font-size: 14px;
@@ -2516,7 +2516,7 @@ input[disabled].sheet-passive-skill-score {
 	border: 0px;
 	text-indent: 2px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-no-yellow-bg-no-bold .inlinerollresult {
+.sheet-rolltemplate-whfrp2e .sheet-rt-card .sheet-main-content .sheet-row .sheet-no-yellow-bg-no-bold .inlinerollresult {
     background-color: transparent;
 	font-style: normal;
 	font-size: 12px;
@@ -2526,29 +2526,29 @@ input[disabled].sheet-passive-skill-score {
 	-moz-text-decoration-color: #D79340;
 	text-decoration-color: #D79340;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-no-yellow-bg-no-bold .sheet-rt-test .inlinerollresult {
+.sheet-rolltemplate-whfrp2e .sheet-rt-card .sheet-main-content .sheet-row .sheet-no-yellow-bg-no-bold .sheet-rt-test .inlinerollresult {
 	padding-left: 4px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-rt-no-border .inlinerollresult {
+.sheet-rolltemplate-whfrp2e .sheet-rt-card .sheet-main-content .sheet-row .sheet-rt-no-border .inlinerollresult {
     border: none;
 }
-.sheet-rolltemplate-wfrp4e_char .inlinerollresult.fullcrit {
+.sheet-rolltemplate-whfrp2e_char .inlinerollresult.fullcrit {
     color: #3FB315;
     border: none;
 }
-.sheet-rolltemplate-wfrp4e_char .inlinerollresult.fullfail {
+.sheet-rolltemplate-whfrp2e_char .inlinerollresult.fullfail {
     color: #B31515;
     border: none;
 }
-.sheet-rolltemplate-wfrp4e_char .inlinerollresult.importantroll {
+.sheet-rolltemplate-whfrp2e_char .inlinerollresult.importantroll {
 	color: #4A57ED;
     border: none;
 }
-.sheet-rolltemplate-wfrp4e {
+.sheet-rolltemplate-whfrp2e {
 	margin-left: -4px;
 	margin-right: -2px
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-card {
+.sheet-rolltemplate-whfrp2e .sheet-rt-card {
 	margin-right: 10px;
 	background-color:#FFFFFF;
 	font-size: 11px;
@@ -2560,7 +2560,7 @@ input[disabled].sheet-passive-skill-score {
 	
 	box-sizing: border-box;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-adv {
+.sheet-rolltemplate-whfrp2e .sheet-rt-adv {
 	color:#a69750;
 	font-style:italic;
 	font-size: 1.1em;
@@ -2569,7 +2569,7 @@ input[disabled].sheet-passive-skill-score {
 	text-align: left;
 	padding-left: 35px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-slmod {
+.sheet-rolltemplate-whfrp2e .sheet-rt-slmod {
 	color:#858585;
 	font-style:normal;
 	font-size: 1.1em;
@@ -2578,7 +2578,7 @@ input[disabled].sheet-passive-skill-score {
 	text-align: left;
 	padding-left: 40px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-fatigued {
+.sheet-rolltemplate-whfrp2e .sheet-rt-fatigued {
 	color:#858585;
 	font-style:italic;
 	font-size: 1.1em;
@@ -2587,7 +2587,7 @@ input[disabled].sheet-passive-skill-score {
 	text-align: left;
 	padding-left: 35px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-blinded {
+.sheet-rolltemplate-whfrp2e .sheet-rt-blinded {
 	color:#858585;
 	font-style:italic;
 	font-size: 1.1em;
@@ -2596,7 +2596,7 @@ input[disabled].sheet-passive-skill-score {
 	text-align: left;
 	padding-left: 35px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-broken {
+.sheet-rolltemplate-whfrp2e .sheet-rt-broken {
 	color:#858585;
 	font-style:italic;
 	font-size: 1.1em;
@@ -2605,7 +2605,7 @@ input[disabled].sheet-passive-skill-score {
 	text-align: left;
 	padding-left: 35px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-deafened {
+.sheet-rolltemplate-whfrp2e .sheet-rt-deafened {
 	color:#858585;
 	font-style:italic;
 	font-size: 1.1em;
@@ -2614,7 +2614,7 @@ input[disabled].sheet-passive-skill-score {
 	text-align: left;
 	padding-left: 35px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-entangled {
+.sheet-rolltemplate-whfrp2e .sheet-rt-entangled {
 	color:#858585;
 	font-style:italic;
 	font-size: 1.1em;
@@ -2623,7 +2623,7 @@ input[disabled].sheet-passive-skill-score {
 	text-align: left;
 	padding-left: 35px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-poisoned {
+.sheet-rolltemplate-whfrp2e .sheet-rt-poisoned {
 	color:#75a17e;
 	font-style:italic;
 	font-size: 1.1em;
@@ -2632,7 +2632,7 @@ input[disabled].sheet-passive-skill-score {
 	text-align: left;
 	padding-left: 35px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-prone {
+.sheet-rolltemplate-whfrp2e .sheet-rt-prone {
 	color:#858585;
 	font-style:italic;
 	font-size: 1.1em;
@@ -2641,7 +2641,7 @@ input[disabled].sheet-passive-skill-score {
 	text-align: left;
 	padding-left: 35px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-armorpen {
+.sheet-rolltemplate-whfrp2e .sheet-rt-armorpen {
 	color:#858585;
 	font-style:italic;
 	text-indent: -67px;
@@ -2649,21 +2649,21 @@ input[disabled].sheet-passive-skill-score {
 	font-weight: bold;
 	font-family: Arial, Helvetica, sans-serif;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-critical {
+.sheet-rolltemplate-whfrp2e .sheet-rt-critical {
   text-align: center;
   position: relative;
   color:green;
   font-style:italic;
   font-size: 1.1em;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-fumble {
+.sheet-rolltemplate-whfrp2e .sheet-rt-fumble {
   text-align: center;
   position: relative;
   color:red;
   font-style:italic;
   font-size: 1.1em;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-wrath {
+.sheet-rolltemplate-whfrp2e .sheet-rt-wrath {
   position: relative;
   color:red;
   font-style:italic;
@@ -2671,7 +2671,7 @@ input[disabled].sheet-passive-skill-score {
   font-size: 1.1em;
 }
 
-.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-white a[href^="~"] {
+.sheet-rolltemplate-whfrp2e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-white a[href^="~"] {
 	font-size: 12px !important;
 	padding-top: 1px !important;
 	padding-bottom: 1px !important;
@@ -2686,7 +2686,7 @@ input[disabled].sheet-passive-skill-score {
 	font-style: normal;
 }
 
-.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-miscast a[href^="~"] {
+.sheet-rolltemplate-whfrp2e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-miscast a[href^="~"] {
 	font-size: 15px !important;
 	padding-top: 1px !important;
 	padding-bottom: 1px !important;
@@ -2702,7 +2702,7 @@ input[disabled].sheet-passive-skill-score {
 	font-style: normal;
 }
 
-.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-ripostedmg a[href^="~"] {
+.sheet-rolltemplate-whfrp2e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-ripostedmg a[href^="~"] {
 	font-size: 11px !important;
 	padding-top: 1px !important;
 	padding-bottom: 1px !important;
@@ -2718,15 +2718,15 @@ input[disabled].sheet-passive-skill-score {
 	font-style: normal;
 }
 
-.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-ripostedmg:hover a[href^="~"],
-.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-white:hover a[href^="~"],
-.sheet-rolltemplate-wfrp4e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-miscast:hover a[href^="~"] {
+.sheet-rolltemplate-whfrp2e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-ripostedmg:hover a[href^="~"],
+.sheet-rolltemplate-whfrp2e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-white:hover a[href^="~"],
+.sheet-rolltemplate-whfrp2e .sheet-rt-card .sheet-main-content .sheet-row .sheet-chat-button-miscast:hover a[href^="~"] {
 	opacity: 1;
 
 }
 
 /* Generic header */
-.sheet-rolltemplate-wfrp4e .sheet-rt-header {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header {
 	text-align: center;
 	position: relative;
 	color: #fff;
@@ -2737,103 +2737,103 @@ input[disabled].sheet-passive-skill-score {
 	
 	box-shadow: 0 2px 0 rgba(0,0,0,.3);
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-header .inlinerollresult {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header .inlinerollresult {
 	background: transparent;
 	border: none;
 	padding: 0;
 	font-weight: normal;
 	font-size: 1em;
 }
-.sheet-rolltemplate-wfrp4e .inlinerollresult {
+.sheet-rolltemplate-whfrp2e .inlinerollresult {
 	padding: 0 2px
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-header:before,
-.sheet-rolltemplate-wfrp4e .sheet-rt-header:after {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header:before,
+.sheet-rolltemplate-whfrp2e .sheet-rt-header:after {
 	content: '';
 	position: absolute;
 	border-style: solid;
 	border-color: transparent;
 	bottom: -10px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-header:before {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header:before {
 	border-width: 0 10px 10px 0;
 	border-right-color: #222;
 	left: 0;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-header:after {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header:after {
 	border-width: 0 0 10px 10px;
 	border-left-color: #222;
 	right: 0;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-title {
+.sheet-rolltemplate-whfrp2e .sheet-rt-title {
 	font-size: 1.5em;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-subheader {
+.sheet-rolltemplate-whfrp2e .sheet-rt-subheader {
 	line-height: 120%;
 }
 
 /* Melee header*/
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-attack,
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-weapon {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-attack,
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-weapon {
 	background-color: #902000;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-attack:before,
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-weapon:before {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-attack:before,
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-weapon:before {
 	border-right-color: #902000;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-attack:after,
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-weapon:after {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-attack:after,
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-weapon:after {
 	border-left-color: #902000;
 }
 
 /* Skill test header*/
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-action {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-action {
 	background-color: #906000;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-action:before {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-action:before {
 	border-right-color: #906000;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-action:before {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-action:before {
 	border-left-color: #906000;
 }
 /* Heal test header*/
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-heal {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-heal {
 	background-color: #347891;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-heal:before {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-heal:before {
 	border-right-color: #347891;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-heal:before {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-heal:before {
 	border-left-color: #347891;
 }
 /* Spell header */
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-spell {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-spell {
 	background-color: #505050;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-spell:before {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-spell:before {
 	border-right-color: #505050;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-spell:after {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-spell:after {
 	border-left-color: #505050;
 }
 
 /* Characteristic test header */
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-ability {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-ability {
 	background-color: #603000;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-ability:before {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-ability:before {
 	border-right-color: #603000;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-header.sheet-ability:after {
+.sheet-rolltemplate-whfrp2e .sheet-rt-header.sheet-ability:after {
 	border-left-color: #603000;
 }
 
-.sheet-rolltemplate-wfrp4e .sheet-row:nth-child(even) {
+.sheet-rolltemplate-whfrp2e .sheet-row:nth-child(even) {
 	background-color: #EEECEA;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-key,
-.sheet-rolltemplate-wfrp4e .sheet-rt-key-wide,
-.sheet-rolltemplate-wfrp4e .sheet-rt-effects {
+.sheet-rolltemplate-whfrp2e .sheet-rt-key,
+.sheet-rolltemplate-whfrp2e .sheet-rt-key-wide,
+.sheet-rolltemplate-whfrp2e .sheet-rt-effects {
     display:inline-block;
 	font-weight: bold;
 	font-family: Arial, Helvetica, sans-serif;
@@ -2841,25 +2841,25 @@ input[disabled].sheet-passive-skill-score {
 	-moz-text-decoration-color: #D79340;
 	text-decoration-color: #D79340;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-key,
-.sheet-rolltemplate-wfrp4e .sheet-rt-key-wide {
+.sheet-rolltemplate-whfrp2e .sheet-rt-key,
+.sheet-rolltemplate-whfrp2e .sheet-rt-key-wide {
 	font-size: 12px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-effects {
+.sheet-rolltemplate-whfrp2e .sheet-rt-effects {
 	font-size: 11px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-key {
+.sheet-rolltemplate-whfrp2e .sheet-rt-key {
 	max-width: 120px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-value {
+.sheet-rolltemplate-whfrp2e .sheet-rt-value {
     display:inline-block;
 	box-sizing: border-box;
 	padding-left: 3px
 }
-.sheet-rolltemplate-wfrp4e .sheet-main-content .sheet-row:not(:first-child) {
+.sheet-rolltemplate-whfrp2e .sheet-main-content .sheet-row:not(:first-child) {
 	margin-top: 2px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-main-content hr.sheet-roll {
+.sheet-rolltemplate-whfrp2e .sheet-main-content hr.sheet-roll {
 	width: 80%;
 	margin-left: auto;
 	margin-right: auto;
@@ -2868,7 +2868,7 @@ input[disabled].sheet-passive-skill-score {
 	background-color: #D7A540;
 	height: 1px;
 }
-.sheet-rolltemplate-wfrp4e .sheet-rt-emote {
+.sheet-rolltemplate-whfrp2e .sheet-rt-emote {
 	font-style: italic;
 	font-size: 11px;
 	font-family: Arial;
@@ -2883,1649 +2883,1649 @@ input[disabled].sheet-passive-skill-score {
 
 /* === GRID (DO NOT EDIT BELOW THIS LINE OR RISK BREAKING FORMATTING) === */
 .sheet-row,
-.sheet-rolltemplate-wfrp4e .sheet-row {
+.sheet-rolltemplate-whfrp2e .sheet-row {
 	letter-spacing: -0.31em; /* Webkit: collapse white-space between units */
 	*letter-spacing: normal; /* reset IE < 8 */
 	*word-spacing: -0.43em; /* IE < 8: collapse white-space between units */
 	text-rendering: optimizespeed; /* Webkit: fixes text-rendering: optimizeLegibility */
 }
 .sheet-opera-only :-o-prefocus, .sheet-row,
-.sheet-rolltemplate-wfrp4e .sheet-opera-only :-o-prefocus, .sheet-rolltemplate-wfrp4e .sheet-row {
+.sheet-rolltemplate-whfrp2e .sheet-opera-only :-o-prefocus, .sheet-rolltemplate-whfrp2e .sheet-row {
 	word-spacing: -0.43em;
 }
 
 .sheet-col-auto,
-.sheet-rolltemplate-wfrp4e .sheet-col-auto {
+.sheet-rolltemplate-whfrp2e .sheet-col-auto {
 	width: auto;
 	display: block;
 }
 
 .sheet-col-1,
-.sheet-rolltemplate-wfrp4e .sheet-col-1 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1 {
 	width: 100%;
 	display: block;
 }
 
 .sheet-col-1-2,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-2 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-2 {
 	width: 50%;
 }
 .sheet-offset-1-2,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-2 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-2 {
 	margin-left: 50%;
 }
 
 .sheet-col-1-3,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-3 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-3 {
 	width: 33.33333%;
 }
 .sheet-offset-1-3,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-3 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-3 {
 	margin-left: 33.33333%;
 }
 .sheet-col-2-3,
-.sheet-rolltemplate-wfrp4e .sheet-col-2-3 {
+.sheet-rolltemplate-whfrp2e .sheet-col-2-3 {
 	width: 66.66667%;
 }
 .sheet-offset-2-3,
-.sheet-rolltemplate-wfrp4e .sheet-offset-2-3 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-2-3 {
 	margin-left: 66.66667%;
 }
 
 .sheet-col-1-4,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-4 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-4 {
 	width: 25%;
 }
 .sheet-offset-1-4,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-4 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-4 {
 	margin-left: 25%;
 }
 .sheet-col-3-4,
-.sheet-rolltemplate-wfrp4e .sheet-col-3-4 {
+.sheet-rolltemplate-whfrp2e .sheet-col-3-4 {
 	width: 75%;
 }
 .sheet-offset-3-4,
-.sheet-rolltemplate-wfrp4e .sheet-offset-3-4 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-3-4 {
 	margin-left: 75%;
 }
 .sheet-col-1-5,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-5 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-5 {
 	width: 20%;
 }
 .sheet-col-1-5r,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-5r {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-5r {
 	width: 15%;
 }
 .sheet-offset-1-5,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-5 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-5 {
 	margin-left: 20%;
 }
 .sheet-col-2-5,
-.sheet-rolltemplate-wfrp4e .sheet-col-2-5 {
+.sheet-rolltemplate-whfrp2e .sheet-col-2-5 {
 	width: 40%;
 }
 .sheet-offset-2-5,
-.sheet-rolltemplate-wfrp4e .sheet-offset-2-5 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-2-5 {
 	margin-left: 40%;
 }
 .sheet-col-3-5,
-.sheet-rolltemplate-wfrp4e .sheet-col-3-5 {
+.sheet-rolltemplate-whfrp2e .sheet-col-3-5 {
 	width: 60%;
 }
 .sheet-offset-3-5,
-.sheet-rolltemplate-wfrp4e .sheet-offset-3-5 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-3-5 {
 	margin-left: 60%;
 }
 .sheet-col-4-5,
-.sheet-rolltemplate-wfrp4e .sheet-col-4-5 {
+.sheet-rolltemplate-whfrp2e .sheet-col-4-5 {
 	width: 80%;
 }
 .sheet-offset-4-5,
-.sheet-rolltemplate-wfrp4e .sheet-offset-4-5 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-4-5 {
 	margin-left: 80%;
 }
 
 .sheet-col-1-6,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-6 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-6 {
 	width: 16.66667%;
 }
 .sheet-offset-1-6,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-6 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-6 {
 	margin-left: 16.66667%;
 }
 .sheet-col-5-6,
-.sheet-rolltemplate-wfrp4e .sheet-col-5-6 {
+.sheet-rolltemplate-whfrp2e .sheet-col-5-6 {
 	width: 83.33333%;
 }
 .sheet-offset-5-6,
-.sheet-rolltemplate-wfrp4e .sheet-offset-5-6 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-5-6 {
 	margin-left: 83.33333%;
 }
 
 .sheet-col-1-7,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-7 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-7 {
 	width: 14.28571%;
 }
 .sheet-offset-1-7,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-7 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-7 {
 	margin-left: 14.28571%;
 }
 .sheet-col-2-7,
-.sheet-rolltemplate-wfrp4e .sheet-col-2-7 {
+.sheet-rolltemplate-whfrp2e .sheet-col-2-7 {
 	width: 28.57143%;
 }
 .sheet-offset-2-7,
-.sheet-rolltemplate-wfrp4e .sheet-offset-2-7 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-2-7 {
 	margin-left: 28.57143%;
 }
 .sheet-col-3-7,
-.sheet-rolltemplate-wfrp4e .sheet-col-3-7 {
+.sheet-rolltemplate-whfrp2e .sheet-col-3-7 {
 	width: 42.85714%;
 }
 .sheet-offset-3-7,
-.sheet-rolltemplate-wfrp4e .sheet-offset-3-7 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-3-7 {
 	margin-left: 42.85714%;
 }
 .sheet-col-4-7,
-.sheet-rolltemplate-wfrp4e .sheet-col-4-7 {
+.sheet-rolltemplate-whfrp2e .sheet-col-4-7 {
 	width: 57.14286%;
 }
 .sheet-offset-4-7,
-.sheet-rolltemplate-wfrp4e .sheet-offset-4-7 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-4-7 {
 	margin-left: 57.14286%;
 }
 .sheet-col-5-7,
-.sheet-rolltemplate-wfrp4e .sheet-col-5-7 {
+.sheet-rolltemplate-whfrp2e .sheet-col-5-7 {
 	width: 71.42857%;
 }
 .sheet-offset-5-7,
-.sheet-rolltemplate-wfrp4e .sheet-offset-5-7 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-5-7 {
 	margin-left: 71.42857%;
 }
 .sheet-col-6-7,
-.sheet-rolltemplate-wfrp4e .sheet-col-6-7 {
+.sheet-rolltemplate-whfrp2e .sheet-col-6-7 {
 	width: 85.71429%;
 }
 .sheet-offset-6-7,
-.sheet-rolltemplate-wfrp4e .sheet-offset-6-7 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-6-7 {
 	margin-left: 85.71429%;
 }
 
 .sheet-col-1-8,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-8 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-8 {
 	width: 12.5%;
 }
 .sheet-offset-1-8,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-8 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-8 {
 	margin-left: 12.5%;
 }
 .sheet-col-3-8,
-.sheet-rolltemplate-wfrp4e .sheet-col-3-8 {
+.sheet-rolltemplate-whfrp2e .sheet-col-3-8 {
 	width: 37.5%;
 }
 .sheet-offset-3-8,
-.sheet-rolltemplate-wfrp4e .sheet-offset-3-8 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-3-8 {
 	margin-left: 37.5%;
 }
 .sheet-col-5-8,
-.sheet-rolltemplate-wfrp4e .sheet-col-5-8 {
+.sheet-rolltemplate-whfrp2e .sheet-col-5-8 {
 	width: 62.5%;
 }
 .sheet-offset-5-8,
-.sheet-rolltemplate-wfrp4e .sheet-offset-5-8 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-5-8 {
 	margin-left: 62.5%;
 }
 .sheet-col-7-8,
-.sheet-rolltemplate-wfrp4e .sheet-col-7-8 {
+.sheet-rolltemplate-whfrp2e .sheet-col-7-8 {
 	width: 87.5%;
 }
 .sheet-offset-7-8,
-.sheet-rolltemplate-wfrp4e .sheet-offset-7-8 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-7-8 {
 	margin-left: 87.5%;
 }
 .sheet-col-1-9,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-9 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-9 {
 	width: 11.11111%;
 }
 .sheet-col-1-9c,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-9c {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-9c {
 	width: 11.14286%;
 }
 .sheet-offset-1-9,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-9 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-9 {
 	margin-left: 11.11111%;
 }
 .sheet-col-2-9,
-.sheet-rolltemplate-wfrp4e .sheet-col-2-9 {
+.sheet-rolltemplate-whfrp2e .sheet-col-2-9 {
 	width: 22.22222%;
 }
 .sheet-offset-2-9,
-.sheet-rolltemplate-wfrp4e .sheet-offset-2-9 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-2-9 {
 	margin-left: 22.22222%;
 }
 .sheet-col-4-9,
-.sheet-rolltemplate-wfrp4e .sheet-col-4-9 {
+.sheet-rolltemplate-whfrp2e .sheet-col-4-9 {
 	width: 44.44444%;
 }
 .sheet-offset-4-9,
-.sheet-rolltemplate-wfrp4e .sheet-offset-4-9 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-4-9 {
 	margin-left: 44.44444%;
 }
 .sheet-col-4-10,
-.sheet-rolltemplate-wfrp4e .sheet-col-4-10 {
+.sheet-rolltemplate-whfrp2e .sheet-col-4-10 {
 	width: 40%;
 }
 .sheet-offset-4-10,
-.sheet-rolltemplate-wfrp4e .sheet-offset-4-10 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-4-10 {
 	margin-left: 40%;
 }
 .sheet-col-5-9,
-.sheet-rolltemplate-wfrp4e .sheet-col-5-9 {
+.sheet-rolltemplate-whfrp2e .sheet-col-5-9 {
 	width: 55.55556%;
 }
 .sheet-offset-5-9,
-.sheet-rolltemplate-wfrp4e .sheet-offset-5-9 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-5-9 {
 	margin-left: 55.55556%;
 }
 .sheet-col-6-9,
-.sheet-rolltemplate-wfrp4e .sheet-col-6-9 {
+.sheet-rolltemplate-whfrp2e .sheet-col-6-9 {
 	width: 66.66667%;
 }
 .sheet-offset-6-9,
-.sheet-rolltemplate-wfrp4e .sheet-offset-6-9 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-6-9 {
 	margin-left: 66.66667%;
 }
 .sheet-col-7-9,
-.sheet-rolltemplate-wfrp4e .sheet-col-7-9 {
+.sheet-rolltemplate-whfrp2e .sheet-col-7-9 {
 	width: 77.77778%;
 }
 .sheet-offset-7-9,
-.sheet-rolltemplate-wfrp4e .sheet-offset-7-9 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-7-9 {
 	margin-left: 77.77778%;
 }
 .sheet-col-8-9,
-.sheet-rolltemplate-wfrp4e .sheet-col-8-9 {
+.sheet-rolltemplate-whfrp2e .sheet-col-8-9 {
 	width: 88.88889%;
 }
 .sheet-offset-8-9,
-.sheet-rolltemplate-wfrp4e .sheet-offset-8-9 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-8-9 {
 	margin-left: 88.88889%;
 }
 
 .sheet-col-1-10,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-10 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-10 {
 	width: 9%;
 }
 .sheet-offset-1-10,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-10 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-10 {
 	margin-left: 10%;
 }
 .sheet-col-1-10t,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-10 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-10 {
 	width: 10%;
 }
 .sheet-col-3-10,
-.sheet-rolltemplate-wfrp4e .sheet-col-3-10 {
+.sheet-rolltemplate-whfrp2e .sheet-col-3-10 {
 	width: 30%;
 }
 .sheet-offset-3-10,
-.sheet-rolltemplate-wfrp4e .sheet-offset-3-10 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-3-10 {
 	margin-left: 30%;
 }
 .sheet-col-3-10t,
-.sheet-rolltemplate-wfrp4e .sheet-col-3-10 {
+.sheet-rolltemplate-whfrp2e .sheet-col-3-10 {
 	width: 30%;
 }
 .sheet-col-4-10,
-.sheet-rolltemplate-wfrp4e .sheet-col-4-10 {
+.sheet-rolltemplate-whfrp2e .sheet-col-4-10 {
 	width: 40%;
 }
 .sheet-offset-4-10,
-.sheet-rolltemplate-wfrp4e .sheet-offset-4-10 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-4-10 {
 	margin-left: 40%;
 }
 .sheet-col-7-10,
-.sheet-rolltemplate-wfrp4e .sheet-col-7-10 {
+.sheet-rolltemplate-whfrp2e .sheet-col-7-10 {
 	width: 70%;
 }
 .sheet-offset-7-10,
-.sheet-rolltemplate-wfrp4e .sheet-offset-7-10 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-7-10 {
 	margin-left: 70%;
 }
 .sheet-col-9-10,
-.sheet-rolltemplate-wfrp4e .sheet-col-9-10 {
+.sheet-rolltemplate-whfrp2e .sheet-col-9-10 {
 	width: 90%;
 }
 .sheet-offset-9-10,
-.sheet-rolltemplate-wfrp4e .sheet-offset-9-10 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-9-10 {
 	margin-left: 90%;
 }
 
 .sheet-col-1-11,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-11 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-11 {
 	width: 9.09091%;
 }
 .sheet-offset-1-11,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-11 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-11 {
 	margin-left: 9.09091%;
 }
 .sheet-col-2-11,
-.sheet-rolltemplate-wfrp4e .sheet-col-2-11 {
+.sheet-rolltemplate-whfrp2e .sheet-col-2-11 {
 	width: 18.18182%;
 }
 .sheet-offset-2-11,
-.sheet-rolltemplate-wfrp4e .sheet-offset-2-11 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-2-11 {
 	margin-left: 18.18182%;
 }
 .sheet-col-3-11,
-.sheet-rolltemplate-wfrp4e .sheet-col-3-11 {
+.sheet-rolltemplate-whfrp2e .sheet-col-3-11 {
 	width: 27.27273%;
 }
 .sheet-offset-3-11,
-.sheet-rolltemplate-wfrp4e .sheet-offset-3-11 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-3-11 {
 	margin-left: 27.27273%;
 }
 .sheet-col-4-11,
-.sheet-rolltemplate-wfrp4e .sheet-col-4-11 {
+.sheet-rolltemplate-whfrp2e .sheet-col-4-11 {
 	width: 36.36364%;
 }
 .sheet-offset-4-11,
-.sheet-rolltemplate-wfrp4e .sheet-offset-4-11 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-4-11 {
 	margin-left: 36.36364%;
 }
 .sheet-col-5-11,
-.sheet-rolltemplate-wfrp4e .sheet-col-5-11 {
+.sheet-rolltemplate-whfrp2e .sheet-col-5-11 {
 	width: 45.45455%;
 }
 .sheet-offset-5-11,
-.sheet-rolltemplate-wfrp4e .sheet-offset-5-11 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-5-11 {
 	margin-left: 45.45455%;
 }
 .sheet-col-6-11,
-.sheet-rolltemplate-wfrp4e .sheet-col-6-11 {
+.sheet-rolltemplate-whfrp2e .sheet-col-6-11 {
 	width: 54.54545%;
 }
 .sheet-offset-6-11,
-.sheet-rolltemplate-wfrp4e .sheet-offset-6-11 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-6-11 {
 	margin-left: 54.54545%;
 }
 .sheet-col-7-11,
-.sheet-rolltemplate-wfrp4e .sheet-col-7-11 {
+.sheet-rolltemplate-whfrp2e .sheet-col-7-11 {
 	width: 63.63636%;
 }
 .sheet-offset-7-11,
-.sheet-rolltemplate-wfrp4e .sheet-offset-7-11 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-7-11 {
 	margin-left: 63.63636%;
 }
 .sheet-col-8-11,
-.sheet-rolltemplate-wfrp4e .sheet-col-8-11 {
+.sheet-rolltemplate-whfrp2e .sheet-col-8-11 {
 	width: 72.72727%;
 }
 .sheet-offset-8-11,
-.sheet-rolltemplate-wfrp4e .sheet-offset-8-11 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-8-11 {
 	margin-left: 72.72727%;
 }
 .sheet-col-9-11,
-.sheet-rolltemplate-wfrp4e .sheet-col-9-11 {
+.sheet-rolltemplate-whfrp2e .sheet-col-9-11 {
 	width: 81.81818%;
 }
 .sheet-offset-9-11,
-.sheet-rolltemplate-wfrp4e .sheet-offset-9-11 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-9-11 {
 	margin-left: 81.81818%;
 }
 .sheet-col-10-11,
-.sheet-rolltemplate-wfrp4e .sheet-col-10-11 {
+.sheet-rolltemplate-whfrp2e .sheet-col-10-11 {
 	width: 90.90909%;
 }
 .sheet-offset-10-11,
-.sheet-rolltemplate-wfrp4e .sheet-offset-10-11 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-10-11 {
 	margin-left: 90.90909%;
 }
 
 .sheet-col-1-12,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-12 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-12 {
 	width: 8.33333%;
 }
 .sheet-offset-1-12,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-12 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-12 {
 	margin-left: 8.33333%;
 }
 .sheet-col-5-12,
-.sheet-rolltemplate-wfrp4e .sheet-col-5-12 {
+.sheet-rolltemplate-whfrp2e .sheet-col-5-12 {
 	width: 41.66667%;
 }
 .sheet-offset-5-12,
-.sheet-rolltemplate-wfrp4e .sheet-offset-5-12 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-5-12 {
 	margin-left: 41.66667%;
 }
 .sheet-col-7-12,
-.sheet-rolltemplate-wfrp4e .sheet-col-7-12 {
+.sheet-rolltemplate-whfrp2e .sheet-col-7-12 {
 	width: 58.33333%;
 }
 .sheet-offset-7-12,
-.sheet-rolltemplate-wfrp4e .sheet-offset-7-12 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-7-12 {
 	margin-left: 58.33333%;
 }
 .sheet-col-11-12,
-.sheet-rolltemplate-wfrp4e .sheet-col-11-12 {
+.sheet-rolltemplate-whfrp2e .sheet-col-11-12 {
 	width: 91.66667%;
 }
 .sheet-offset-11-12,
-.sheet-rolltemplate-wfrp4e .sheet-offset-11-12 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-11-12 {
 	margin-left: 91.66667%;
 }
 
 .sheet-col-1-13,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-13 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-13 {
 	width: 7.69231%;
 }
 .sheet-offset-1-13,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-13 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-13 {
 	margin-left: 7.69231%;
 }
 .sheet-col-2-13,
-.sheet-rolltemplate-wfrp4e .sheet-col-2-13 {
+.sheet-rolltemplate-whfrp2e .sheet-col-2-13 {
 	width: 15.38462%;
 }
 .sheet-offset-2-13,
-.sheet-rolltemplate-wfrp4e .sheet-offset-2-13 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-2-13 {
 	margin-left: 15.38462%;
 }
 .sheet-col-3-13,
-.sheet-rolltemplate-wfrp4e .sheet-col-3-13 {
+.sheet-rolltemplate-whfrp2e .sheet-col-3-13 {
 	width: 23.07692%;
 }
 .sheet-offset-3-13,
-.sheet-rolltemplate-wfrp4e .sheet-offset-3-13 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-3-13 {
 	margin-left: 23.07692%;
 }
 .sheet-col-4-13,
-.sheet-rolltemplate-wfrp4e .sheet-col-4-13 {
+.sheet-rolltemplate-whfrp2e .sheet-col-4-13 {
 	width: 30.76923%;
 }
 .sheet-offset-4-13,
-.sheet-rolltemplate-wfrp4e .sheet-offset-4-13 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-4-13 {
 	margin-left: 30.76923%;
 }
 .sheet-col-5-13,
-.sheet-rolltemplate-wfrp4e .sheet-col-5-13 {
+.sheet-rolltemplate-whfrp2e .sheet-col-5-13 {
 	width: 38.46154%;
 }
 .sheet-offset-5-13,
-.sheet-rolltemplate-wfrp4e .sheet-offset-5-13 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-5-13 {
 	margin-left: 38.46154%;
 }
 .sheet-col-6-13,
-.sheet-rolltemplate-wfrp4e .sheet-col-6-13 {
+.sheet-rolltemplate-whfrp2e .sheet-col-6-13 {
 	width: 46.15385%;
 }
 .sheet-offset-6-13,
-.sheet-rolltemplate-wfrp4e .sheet-offset-6-13 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-6-13 {
 	margin-left: 46.15385%;
 }
 .sheet-col-7-13,
-.sheet-rolltemplate-wfrp4e .sheet-col-7-13 {
+.sheet-rolltemplate-whfrp2e .sheet-col-7-13 {
 	width: 53.84615%;
 }
 .sheet-offset-7-13,
-.sheet-rolltemplate-wfrp4e .sheet-offset-7-13 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-7-13 {
 	margin-left: 53.84615%;
 }
 .sheet-col-8-13,
-.sheet-rolltemplate-wfrp4e .sheet-col-8-13 {
+.sheet-rolltemplate-whfrp2e .sheet-col-8-13 {
 	width: 61.53846%;
 }
 .sheet-offset-8-13,
-.sheet-rolltemplate-wfrp4e .sheet-offset-8-13 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-8-13 {
 	margin-left: 61.53846%;
 }
 .sheet-col-9-13,
-.sheet-rolltemplate-wfrp4e .sheet-col-9-13 {
+.sheet-rolltemplate-whfrp2e .sheet-col-9-13 {
 	width: 69.23077%;
 }
 .sheet-offset-9-13,
-.sheet-rolltemplate-wfrp4e .sheet-offset-9-13 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-9-13 {
 	margin-left: 69.23077%;
 }
 .sheet-col-10-13,
-.sheet-rolltemplate-wfrp4e .sheet-col-10-13 {
+.sheet-rolltemplate-whfrp2e .sheet-col-10-13 {
 	width: 76.92308%;
 }
 .sheet-offset-10-13,
-.sheet-rolltemplate-wfrp4e .sheet-offset-10-13 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-10-13 {
 	margin-left: 76.92308%;
 }
 .sheet-col-11-13,
-.sheet-rolltemplate-wfrp4e .sheet-col-11-13 {
+.sheet-rolltemplate-whfrp2e .sheet-col-11-13 {
 	width: 84.61538%;
 }
 .sheet-offset-11-13,
-.sheet-rolltemplate-wfrp4e .sheet-offset-11-13 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-11-13 {
 	margin-left: 84.61538%;
 }
 .sheet-col-12-13,
-.sheet-rolltemplate-wfrp4e .sheet-col-12-13 {
+.sheet-rolltemplate-whfrp2e .sheet-col-12-13 {
 	width: 92.30769%;
 }
 .sheet-offset-12-13,
-.sheet-rolltemplate-wfrp4e .sheet-offset-12-13 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-12-13 {
 	margin-left: 92.30769%;
 }
 
 .sheet-col-1-14,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-14 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-14 {
 	width: 7.14286%;
 }
 .sheet-offset-1-14,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-14 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-14 {
 	margin-left: 7.14286%;
 }
 .sheet-col-3-14,
-.sheet-rolltemplate-wfrp4e .sheet-col-3-14 {
+.sheet-rolltemplate-whfrp2e .sheet-col-3-14 {
 	width: 21.42857%;
 }
 .sheet-offset-3-14,
-.sheet-rolltemplate-wfrp4e .sheet-offset-3-14 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-3-14 {
 	margin-left: 21.42857%;
 }
 .sheet-col-5-14,
-.sheet-rolltemplate-wfrp4e .sheet-col-5-14 {
+.sheet-rolltemplate-whfrp2e .sheet-col-5-14 {
 	width: 35.71429%;
 }
 .sheet-offset-5-14,
-.sheet-rolltemplate-wfrp4e .sheet-offset-5-14 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-5-14 {
 	margin-left: 35.71429%;
 }
 .sheet-col-9-14,
-.sheet-rolltemplate-wfrp4e .sheet-col-9-14 {
+.sheet-rolltemplate-whfrp2e .sheet-col-9-14 {
 	width: 64.28571%;
 }
 .sheet-offset-9-14,
-.sheet-rolltemplate-wfrp4e .sheet-offset-9-14 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-9-14 {
 	margin-left: 64.28571%;
 }
 .sheet-col-11-14,
-.sheet-rolltemplate-wfrp4e .sheet-col-11-14 {
+.sheet-rolltemplate-whfrp2e .sheet-col-11-14 {
 	width: 78.57143%;
 }
 .sheet-offset-11-14,
-.sheet-rolltemplate-wfrp4e .sheet-offset-11-14 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-11-14 {
 	margin-left: 78.57143%;
 }
 .sheet-col-13-14,
-.sheet-rolltemplate-wfrp4e .sheet-col-13-14 {
+.sheet-rolltemplate-whfrp2e .sheet-col-13-14 {
 	width: 92.85714%;
 }
 .sheet-offset-13-14,
-.sheet-rolltemplate-wfrp4e .sheet-offset-13-14 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-13-14 {
 	margin-left: 92.85714%;
 }
 
 .sheet-col-1-15,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-15 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-15 {
 	width: 6.66667%;
 }
 .sheet-offset-1-15,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-15 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-15 {
 	margin-left: 6.66667%;
 }
 .sheet-col-2-15,
-.sheet-rolltemplate-wfrp4e .sheet-col-2-15 {
+.sheet-rolltemplate-whfrp2e .sheet-col-2-15 {
 	width: 13.33333%;
 }
 .sheet-offset-2-15,
-.sheet-rolltemplate-wfrp4e .sheet-offset-2-15 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-2-15 {
   margin-left: 13.33333%;
 }
 .sheet-col-4-15,
-.sheet-rolltemplate-wfrp4e .sheet-col-4-15 {
+.sheet-rolltemplate-whfrp2e .sheet-col-4-15 {
 	width: 26.66667%;
 }
 .sheet-offset-4-15,
-.sheet-rolltemplate-wfrp4e .sheet-offset-4-15 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-4-15 {
 	margin-left: 26.66667%;
 }
 .sheet-col-6-15,
-.sheet-rolltemplate-wfrp4e .sheet-col-6-15 {
+.sheet-rolltemplate-whfrp2e .sheet-col-6-15 {
 	width: 40%;
 }
 .sheet-offset-6-15,
-.sheet-rolltemplate-wfrp4e .sheet-offset-6-15 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-6-15 {
 	margin-left: 40%;
 }
 .sheet-col-7-15,
-.sheet-rolltemplate-wfrp4e .sheet-col-7-15 {
+.sheet-rolltemplate-whfrp2e .sheet-col-7-15 {
 	width: 46.66667%;
 }
 .sheet-offset-7-15,
-.sheet-rolltemplate-wfrp4e .sheet-offset-7-15 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-7-15 {
 	margin-left: 46.66667%;
 }
 .sheet-col-8-15,
-.sheet-rolltemplate-wfrp4e .sheet-col-8-15 {
+.sheet-rolltemplate-whfrp2e .sheet-col-8-15 {
 	width: 53.33333%;
 }
 .sheet-offset-8-15,
-.sheet-rolltemplate-wfrp4e .sheet-offset-8-15 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-8-15 {
 	margin-left: 53.33333%;
 }
 .sheet-col-9-15,
-.sheet-rolltemplate-wfrp4e .sheet-col-9-15 {
+.sheet-rolltemplate-whfrp2e .sheet-col-9-15 {
 	width: 60%;
 }.sheet-offset-9-15,
-.sheet-rolltemplate-wfrp4e .sheet-offset-9-15 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-9-15 {
 	margin-left: 60%;
 }
 .sheet-col-10-15,
-.sheet-rolltemplate-wfrp4e .sheet-col-10-15 {
+.sheet-rolltemplate-whfrp2e .sheet-col-10-15 {
 	width: 66.66667%;
 }
 .sheet-offset-10-15,
-.sheet-rolltemplate-wfrp4e .sheet-offset-10-15 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-10-15 {
 	margin-left: 66.66667%;
 }
 .sheet-col-11-15,
-.sheet-rolltemplate-wfrp4e .sheet-col-11-15 {
+.sheet-rolltemplate-whfrp2e .sheet-col-11-15 {
 	width: 73.33333%;
 }
 .sheet-offset-11-15,
-.sheet-rolltemplate-wfrp4e .sheet-offset-11-15 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-11-15 {
 	margin-left: 73.33333%;
 }
 .sheet-col-12-15,
-.sheet-rolltemplate-wfrp4e .sheet-col-12-15 {
+.sheet-rolltemplate-whfrp2e .sheet-col-12-15 {
 	width: 80%;
 }
 .sheet-offset-12-15,
-.sheet-rolltemplate-wfrp4e .sheet-offset-12-15 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-12-15 {
 	margin-left: 80%;
 }
 .sheet-col-13-15,
-.sheet-rolltemplate-wfrp4e .sheet-col-13-15 {
+.sheet-rolltemplate-whfrp2e .sheet-col-13-15 {
 	width: 86.66667%;
 }
 .sheet-offset-13-15,
-.sheet-rolltemplate-wfrp4e .sheet-offset-13-15 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-13-15 {
 	margin-left: 86.66667%;
 }
 .sheet-col-14-15,
-.sheet-rolltemplate-wfrp4e .sheet-col-14-15 {
+.sheet-rolltemplate-whfrp2e .sheet-col-14-15 {
 	width: 93.33333%;
 }
 .sheet-offset-14-15,
-.sheet-rolltemplate-wfrp4e .sheet-offset-14-15 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-14-15 {
 	margin-left: 93.33333%;
 }
 
 .sheet-col-1-16,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-16 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-16 {
 	width: 6.25%;
 }
 .sheet-offset-1-16,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-16 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-16 {
 	margin-left: 6.25%;
 }
 .sheet-col-3-16,
-.sheet-rolltemplate-wfrp4e .sheet-col-3-16 {
+.sheet-rolltemplate-whfrp2e .sheet-col-3-16 {
 	width: 18.75%;
 }
 .sheet-offset-3-16,
-.sheet-rolltemplate-wfrp4e .sheet-offset-3-16 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-3-16 {
 	margin-left: 18.75%;
 }
 .sheet-col-5-16,
-.sheet-rolltemplate-wfrp4e .sheet-col-5-16 {
+.sheet-rolltemplate-whfrp2e .sheet-col-5-16 {
 	width: 31.25%;
 }
 .sheet-offset-5-16,
-.sheet-rolltemplate-wfrp4e .sheet-offset-5-16 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-5-16 {
 	margin-left: 31.25%;
 }
 .sheet-col-7-16,
-.sheet-rolltemplate-wfrp4e .sheet-col-7-16 {
+.sheet-rolltemplate-whfrp2e .sheet-col-7-16 {
 	width: 43.75%;
 }
 .sheet-offset-7-16,
-.sheet-rolltemplate-wfrp4e .sheet-offset-7-16 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-7-16 {
 	margin-left: 43.75%;
 }
 .sheet-col-9-16,
-.sheet-rolltemplate-wfrp4e .sheet-col-9-16 {
+.sheet-rolltemplate-whfrp2e .sheet-col-9-16 {
 	width: 56.25%;
 }
 .sheet-offset-9-16,
-.sheet-rolltemplate-wfrp4e .sheet-offset-9-16 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-9-16 {
 	margin-left: 56.25%;
 }
 .sheet-col-11-16,
-.sheet-rolltemplate-wfrp4e .sheet-col-11-16 {
+.sheet-rolltemplate-whfrp2e .sheet-col-11-16 {
 	width: 68.75%;
 }
 .sheet-offset-11-16,
-.sheet-rolltemplate-wfrp4e .sheet-offset-11-16 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-11-16 {
 	margin-left: 68.75%;
 }
 .sheet-col-13-16,
-.sheet-rolltemplate-wfrp4e .sheet-col-13-16 {
+.sheet-rolltemplate-whfrp2e .sheet-col-13-16 {
 	width: 81.25%;
 }
 .sheet-offset-13-16,
-.sheet-rolltemplate-wfrp4e .sheet-offset-13-16 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-13-16 {
 	margin-left: 81.25%;
 }
 .sheet-col-15-16,
-.sheet-rolltemplate-wfrp4e .sheet-col-15-16 {
+.sheet-rolltemplate-whfrp2e .sheet-col-15-16 {
 	width: 93.75%;
 }
 .sheet-offset-15-16,
-.sheet-rolltemplate-wfrp4e .sheet-offset-15-16 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-15-16 {
 	margin-left: 93.75%;
 }
 
 .sheet-col-1-17,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-17 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-17 {
 	width: 5.88235%;
 }
 .sheet-offset-1-17,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-17 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-17 {
 	margin-left: 5.88235%;
 }
 .sheet-col-2-17,
-.sheet-rolltemplate-wfrp4e .sheet-col-2-17 {
+.sheet-rolltemplate-whfrp2e .sheet-col-2-17 {
 	width: 11.76471%;
 }
 .sheet-offset-2-17,
-.sheet-rolltemplate-wfrp4e .sheet-offset-2-17 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-2-17 {
 	margin-left: 11.76471%;
 }
 .sheet-col-3-17,
-.sheet-rolltemplate-wfrp4e .sheet-col-3-17 {
+.sheet-rolltemplate-whfrp2e .sheet-col-3-17 {
 	width: 17.64706%;
 }
 .sheet-offset-3-17,
-.sheet-rolltemplate-wfrp4e .sheet-offset-3-17 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-3-17 {
 	margin-left: 17.64706%;
 }
 .sheet-col-4-17,
-.sheet-rolltemplate-wfrp4e .sheet-col-4-17 {
+.sheet-rolltemplate-whfrp2e .sheet-col-4-17 {
 	width: 23.52941%;
 }
 .sheet-offset-4-17,
-.sheet-rolltemplate-wfrp4e .sheet-offset-4-17 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-4-17 {
 	margin-left: 23.52941%;
 }
 .sheet-col-5-17,
-.sheet-rolltemplate-wfrp4e .sheet-col-5-17 {
+.sheet-rolltemplate-whfrp2e .sheet-col-5-17 {
 	width: 29.41176%;
 }
 .sheet-offset-5-17,
-.sheet-rolltemplate-wfrp4e .sheet-offset-5-17 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-5-17 {
 	margin-left: 29.41176%;
 }
 .sheet-col-6-17,
-.sheet-rolltemplate-wfrp4e .sheet-col-6-17 {
+.sheet-rolltemplate-whfrp2e .sheet-col-6-17 {
 	width: 35.29412%;
 }
 .sheet-offset-6-17,
-.sheet-rolltemplate-wfrp4e .sheet-offset-6-17 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-6-17 {
 	margin-left: 35.29412%;
 }
 .sheet-col-7-17,
-.sheet-rolltemplate-wfrp4e .sheet-col-7-17 {
+.sheet-rolltemplate-whfrp2e .sheet-col-7-17 {
 	width: 41.17647%;
 }
 .sheet-offset-7-17,
-.sheet-rolltemplate-wfrp4e .sheet-offset-7-17 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-7-17 {
 	margin-left: 41.17647%;
 }
 .sheet-col-8-17,
-.sheet-rolltemplate-wfrp4e .sheet-col-8-17 {
+.sheet-rolltemplate-whfrp2e .sheet-col-8-17 {
 	width: 47.05882%;
 }
 .sheet-offset-8-17,
-.sheet-rolltemplate-wfrp4e .sheet-offset-8-17 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-8-17 {
 	margin-left: 47.05882%;
 }
 .sheet-col-9-17,
-.sheet-rolltemplate-wfrp4e .sheet-col-9-17 {
+.sheet-rolltemplate-whfrp2e .sheet-col-9-17 {
 	width: 52.94118%;
 }
 .sheet-offset-9-17,
-.sheet-rolltemplate-wfrp4e .sheet-offset-9-17 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-9-17 {
 	margin-left: 52.94118%;
 }
 .sheet-col-10-17,
-.sheet-rolltemplate-wfrp4e .sheet-col-10-17 {
+.sheet-rolltemplate-whfrp2e .sheet-col-10-17 {
 	width: 58.82353%;
 }
 .sheet-offset-10-17,
-.sheet-rolltemplate-wfrp4e .sheet-offset-10-17 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-10-17 {
 	margin-left: 58.82353%;
 }
 .sheet-col-11-17,
-.sheet-rolltemplate-wfrp4e .sheet-col-11-17 {
+.sheet-rolltemplate-whfrp2e .sheet-col-11-17 {
 	width: 64.70588%;
 }
 .sheet-offset-11-17,
-.sheet-rolltemplate-wfrp4e .sheet-offset-11-17 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-11-17 {
 	margin-left: 64.70588%;
 }
 .sheet-col-12-17,
-.sheet-rolltemplate-wfrp4e .sheet-col-12-17 {
+.sheet-rolltemplate-whfrp2e .sheet-col-12-17 {
 	width: 70.58824%;
 }
 .sheet-offset-12-17,
-.sheet-rolltemplate-wfrp4e .sheet-offset-12-17 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-12-17 {
 	margin-left: 70.58824%;
 }
 .sheet-col-13-17,
-.sheet-rolltemplate-wfrp4e .sheet-col-13-17 {
+.sheet-rolltemplate-whfrp2e .sheet-col-13-17 {
 	width: 76.47059%;
 }
 .sheet-offset-13-17,
-.sheet-rolltemplate-wfrp4e .sheet-offset-13-17 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-13-17 {
 	margin-left: 76.47059%;
 }
 .sheet-col-14-17,
-.sheet-rolltemplate-wfrp4e .sheet-col-14-17 {
+.sheet-rolltemplate-whfrp2e .sheet-col-14-17 {
 	width: 82.35294%;
 }
 .sheet-offset-14-17,
-.sheet-rolltemplate-wfrp4e .sheet-offset-14-17 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-14-17 {
 	margin-left: 82.35294%;
 }
 .sheet-col-15-17,
-.sheet-rolltemplate-wfrp4e .sheet-col-15-17 {
+.sheet-rolltemplate-whfrp2e .sheet-col-15-17 {
 	width: 88.23529%;
 }
 .sheet-offset-15-17,
-.sheet-rolltemplate-wfrp4e .sheet-offset-15-17 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-15-17 {
 	margin-left: 88.23529%;
 }
 .sheet-col-16-17,
-.sheet-rolltemplate-wfrp4e .sheet-col-16-17 {
+.sheet-rolltemplate-whfrp2e .sheet-col-16-17 {
 	width: 94.11765%;
 }
 .sheet-offset-16-17,
-.sheet-rolltemplate-wfrp4e .sheet-offset-16-17 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-16-17 {
 	margin-left: 94.11765%;
 }
 
 .sheet-col-1-18,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-18 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-18 {
   width: 5.55556%;
 }
 .sheet-offset-1-18,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-18 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-18 {
   margin-left: 5.55556%;
 }
 
 .sheet-col-5-18,
-.sheet-rolltemplate-wfrp4e .sheet-col-5-18 {
+.sheet-rolltemplate-whfrp2e .sheet-col-5-18 {
 	width: 27.77778%;
 }
 .sheet-offset-5-18,
-.sheet-rolltemplate-wfrp4e .sheet-offset-5-18 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-5-18 {
 	margin-left: 27.77778%;
 }
 .sheet-col-7-18,
-.sheet-rolltemplate-wfrp4e .sheet-col-7-18 {
+.sheet-rolltemplate-whfrp2e .sheet-col-7-18 {
 	width: 38.88889%;
 }
 .sheet-offset-7-18,
-.sheet-rolltemplate-wfrp4e .sheet-offset-7-18 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-7-18 {
 	margin-left: 38.88889%;
 }
 .sheet-col-11-18,
-.sheet-rolltemplate-wfrp4e .sheet-col-11-18 {
+.sheet-rolltemplate-whfrp2e .sheet-col-11-18 {
 	width: 61.11111%;
 }
 .sheet-offset-11-18,
-.sheet-rolltemplate-wfrp4e .sheet-offset-11-18 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-11-18 {
 	margin-left: 61.11111%;
 }
 .sheet-col-13-18,
-.sheet-rolltemplate-wfrp4e .sheet-col-13-18 {
+.sheet-rolltemplate-whfrp2e .sheet-col-13-18 {
 	width: 72.22222%;
 }
 .sheet-offset-13-18,
-.sheet-rolltemplate-wfrp4e .sheet-offset-13-18 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-13-18 {
 	margin-left: 72.22222%;
 }
 .sheet-col-15-18,
-.sheet-rolltemplate-wfrp4e .sheet-col-15-18 {
+.sheet-rolltemplate-whfrp2e .sheet-col-15-18 {
 	width: 83.33333%;
 }
 .sheet-offset-15-18,
-.sheet-rolltemplate-wfrp4e .sheet-offset-15-18 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-15-18 {
 	margin-left: 83.33333%;
 }
 .sheet-col-17-18,
-.sheet-rolltemplate-wfrp4e .sheet-col-17-18 {
+.sheet-rolltemplate-whfrp2e .sheet-col-17-18 {
 	width: 94.44444%;
 }
 .sheet-offset-17-18,
-.sheet-rolltemplate-wfrp4e .sheet-offset-17-18 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-17-18 {
 	margin-left: 94.44444%;
 }	
 
 .sheet-col-1-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-19 {
 	width: 5.26316%;
 }
 .sheet-offset-1-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-19 {
 	margin-left: 5.26316%;
 }
 .sheet-col-2-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-2-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-2-19 {
 	width: 10.52632%;
 }
 .sheet-offset-2-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-2-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-2-19 {
 	margin-left: 10.52632%;
 }
 .sheet-col-3-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-3-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-3-19 {
 	width: 15.78947%;
 }
 .sheet-offset-3-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-3-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-3-19 {
 	margin-left: 15.78947%;
 }
 .sheet-col-4-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-4-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-4-19 {
 	width: 21.05263%;
 }
 .sheet-offset-4-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-4-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-4-19 {
 	margin-left: 21.05263%;
 }
 .sheet-col-5-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-5-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-5-19 {
 	width: 26.31579%;
 }
 .sheet-offset-5-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-5-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-5-19 {
 	margin-left: 26.31579%;
 }
 .sheet-col-6-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-6-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-6-19 {
 	width: 31.57895%;
 }
 .sheet-offset-6-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-6-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-6-19 {
 	margin-left: 31.57895%;
 }
 .sheet-col-7-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-7-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-7-19 {
 	width: 36.84211%;
 }
 .sheet-offset-7-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-7-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-7-19 {
 	margin-left: 36.84211%;
 }
 .sheet-col-8-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-8-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-8-19 {
 	width: 42.10526%;
 }
 .sheet-offset-8-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-8-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-8-19 {
 	margin-left: 42.10526%;
 }
 .sheet-col-9-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-9-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-9-19 {
 	width: 47.36842%;
 }
 .sheet-offset-9-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-9-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-9-19 {
 	margin-left: 47.36842%;
 }
 .sheet-col-10-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-10-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-10-19 {
 	width: 52.63158%;
 }
 .sheet-offset-10-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-10-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-10-19 {
 	margin-left: 52.63158%;
 }
 .sheet-col-11-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-11-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-11-19 {
 	width: 57.89474%;
 }
 .sheet-offset-11-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-11-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-11-19 {
 	margin-left: 57.89474%;
 }
 .sheet-col-12-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-12-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-12-19 {
 	width: 63.15789%;
 }
 .sheet-offset-12-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-12-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-12-19 {
 	margin-left: 63.15789%;
 }
 .sheet-col-13-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-13-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-13-19 {
 	width: 68.42105%;
 }
 .sheet-offset-13-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-13-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-13-19 {
 	margin-left: 68.42105%;
 }
 .sheet-col-14-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-14-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-14-19 {
 	width: 73.68421%;
 }
 .sheet-offset-14-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-14-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-14-19 {
 	margin-left: 73.68421%;
 }
 .sheet-col-15-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-15-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-15-19 {
 	width: 78.94737%;
 }
 .sheet-offset-15-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-15-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-15-19 {
 	margin-left: 78.94737%;
 }
 .sheet-col-16-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-16-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-16-19 {
 	width: 84.21053%;
 }
 .sheet-offset-16-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-16-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-16-19 {
 	margin-left: 84.21053%;
 }
 .sheet-col-17-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-17-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-17-19 {
 	width: 89.47368%;
 }
 .sheet-offset-17-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-17-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-17-19 {
 	margin-left: 89.47368%;
 }
 .sheet-col-18-19,
-.sheet-rolltemplate-wfrp4e .sheet-col-18-19 {
+.sheet-rolltemplate-whfrp2e .sheet-col-18-19 {
 	width: 94.73684%;
 }
 .sheet-offset-18-19,
-.sheet-rolltemplate-wfrp4e .sheet-offset-18-19 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-18-19 {
 	margin-left: 94.73684%;
 }
 
 .sheet-col-1-20,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-20 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-20 {
 	width: 5%;
 }
 .sheet-offset-1-20,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-20 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-20 {
 	margin-left: 5%;
 }
 .sheet-col-3-20,
-.sheet-rolltemplate-wfrp4e .sheet-col-3-20 {
+.sheet-rolltemplate-whfrp2e .sheet-col-3-20 {
 	width: 15%;
 }
 .sheet-offset-3-20,
-.sheet-rolltemplate-wfrp4e .sheet-offset-3-20 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-3-20 {
 	margin-left: 15%;
 }
 .sheet-col-7-20,
-.sheet-rolltemplate-wfrp4e .sheet-col-7-20 {
+.sheet-rolltemplate-whfrp2e .sheet-col-7-20 {
 	width: 35%;
 }
 .sheet-offset-7-20,
-.sheet-rolltemplate-wfrp4e .sheet-offset-7-20 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-7-20 {
 	margin-left: 35%;
 }
 .sheet-col-9-20,
-.sheet-rolltemplate-wfrp4e .sheet-col-9-20 {
+.sheet-rolltemplate-whfrp2e .sheet-col-9-20 {
 	width: 45%;
 }
 .sheet-offset-9-20,
-.sheet-rolltemplate-wfrp4e .sheet-offset-9-20 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-9-20 {
 	margin-left: 45%;
 }
 .sheet-col-11-20,
-.sheet-rolltemplate-wfrp4e .sheet-col-11-20 {
+.sheet-rolltemplate-whfrp2e .sheet-col-11-20 {
 	width: 55%;
 }
 .sheet-offset-11-20,
-.sheet-rolltemplate-wfrp4e .sheet-offset-11-20 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-11-20 {
 	margin-left: 55%;
 }
 .sheet-col-13-20,
-.sheet-rolltemplate-wfrp4e .sheet-col-13-20 {
+.sheet-rolltemplate-whfrp2e .sheet-col-13-20 {
 	width: 65%;
 }
 .sheet-offset-13-20,
-.sheet-rolltemplate-wfrp4e .sheet-offset-13-20 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-13-20 {
 	margin-left: 65%;
 }
 .sheet-col-15-20,
-.sheet-rolltemplate-wfrp4e .sheet-col-15-20 {
+.sheet-rolltemplate-whfrp2e .sheet-col-15-20 {
 	width: 75%;
 }
 .sheet-offset-15-20,
-.sheet-rolltemplate-wfrp4e .sheet-offset-15-20 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-15-20 {
 	margin-left: 75%;
 }
 .sheet-col-17-20,
-.sheet-rolltemplate-wfrp4e .sheet-col-17-20 {
+.sheet-rolltemplate-whfrp2e .sheet-col-17-20 {
 	width: 85%;
 }
 .sheet-offset-17-20,
-.sheet-rolltemplate-wfrp4e .sheet-offset-17-20 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-17-20 {
 	margin-left: 85%;
 }
 .sheet-col-19-20,
-.sheet-rolltemplate-wfrp4e .sheet-col-19-20 {
+.sheet-rolltemplate-whfrp2e .sheet-col-19-20 {
 	width: 95%;
 }
 .sheet-offset-19-20,
-.sheet-rolltemplate-wfrp4e .sheet-offset-19-20 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-19-20 {
 	margin-left: 95%;
 }
 
 .sheet-col-1-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-21 {
 	width: 4.7619%;
 }
 .sheet-offset-1-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-21 {
 	margin-left: 4.7619%;
 }
 .sheet-col-2-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-2-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-2-21 {
 	width: 9.52381%;
 }
 .sheet-offset-2-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-2-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-2-21 {
 	margin-left: 9.52381%;
 }
 .sheet-col-4-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-4-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-4-21 {
 	width: 19.04762%;
 }
 .sheet-offset-4-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-4-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-4-21 {
 	margin-left: 19.04762%;
 }
 .sheet-col-5-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-5-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-5-21 {
 	width: 23.80952%;
 }
 .sheet-offset-5-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-5-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-5-21 {
 	margin-left: 23.80952%;
 }
 .sheet-col-6-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-6-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-6-21 {
 	width: 28.57143%;
 }
 .sheet-offset-6-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-6-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-6-21 {
 	margin-left: 28.57143%;
 }
 .sheet-col-8-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-8-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-8-21 {
 	width: 38.09524%;
 }
 .sheet-offset-8-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-8-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-8-21 {
 	margin-left: 38.09524%;
 }
 .sheet-col-9-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-9-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-9-21 {
 	width: 42.85714%;
 }
 .sheet-offset-9-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-9-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-9-21 {
   margin-left: 42.85714%;
 }
 .sheet-col-10-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-10-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-10-21 {
 	width: 47.61905%;
 }
 .sheet-offset-10-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-10-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-10-21 {
 	margin-left: 47.61905%;
 }
 .sheet-col-11-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-11-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-11-21 {
 	width: 52.38095%;
 }
 .sheet-offset-11-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-11-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-11-21 {
 	margin-left: 52.38095%;
 }
 .sheet-col-12-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-12-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-12-21 {
 	width: 57.14286%;
 }
 .sheet-offset-12-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-12-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-12-21 {
 	margin-left: 57.14286%;
 }
 .sheet-col-13-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-13-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-13-21 {
 	width: 61.90476%;
 }
 .sheet-offset-13-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-13-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-13-21 {
 	margin-left: 61.90476%;
 }
 .sheet-col-14-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-14-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-14-21 {
 	width: 66.66667%;
 }
 .sheet-offset-14-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-14-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-14-21 {
 	margin-left: 66.66667%;
 }
 .sheet-col-15-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-15-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-15-21 {
 	width: 71.42857%;
 }
 .sheet-offset-15-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-15-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-15-21 {
 	margin-left: 71.42857%;
 }
 .sheet-col-16-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-16-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-16-21 {
 	width: 76.19048%;
 }
 .sheet-offset-16-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-16-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-16-21 {
 	margin-left: 76.19048%;
 }
 .sheet-col-17-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-17-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-17-21 {
 	width: 80.95238%;
 }
 .sheet-offset-17-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-17-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-17-21 {
 	margin-left: 80.95238%;
 }
 .sheet-col-18-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-18-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-18-21 {
 	width: 85.71429%;
 }
 .sheet-offset-18-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-18-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-18-21 {
 	margin-left: 85.71429%;
 }
 .sheet-col-19-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-19-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-19-21 {
 	width: 90.47619%;
 }
 .sheet-offset-19-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-19-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-19-21 {
 	margin-left: 90.47619%;
 }
 .sheet-col-20-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-20-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-20-21 {
 	width: 95.2381%;
 }
 .sheet-offset-20-21,
-.sheet-rolltemplate-wfrp4e .sheet-offset-20-21 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-20-21 {
 	margin-left: 95.2381%;
 }
 
 .sheet-col-1-22,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-22 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-22 {
 	width: 4.54545%;
 }
 .sheet-offset-1-22,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-22 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-22 {
 	margin-left: 4.54545%;
 }
 .sheet-col-3-22,
-.sheet-rolltemplate-wfrp4e .sheet-col-3-22 {
+.sheet-rolltemplate-whfrp2e .sheet-col-3-22 {
 	width: 13.63636%;
 }
 .sheet-offset-3-22,
-.sheet-rolltemplate-wfrp4e .sheet-offset-3-22 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-3-22 {
 	margin-left: 13.63636%;
 }
 .sheet-col-5-22,
-.sheet-rolltemplate-wfrp4e .sheet-col-5-22 {
+.sheet-rolltemplate-whfrp2e .sheet-col-5-22 {
 	width: 22.72727%;
 }
 .sheet-offset-5-22,
-.sheet-rolltemplate-wfrp4e .sheet-offset-5-22 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-5-22 {
 	margin-left: 22.72727%;
 }
 .sheet-col-7-22,
-.sheet-rolltemplate-wfrp4e .sheet-col-7-22 {
+.sheet-rolltemplate-whfrp2e .sheet-col-7-22 {
 	width: 31.81818%;
 }
 .sheet-offset-7-22,
-.sheet-rolltemplate-wfrp4e .sheet-offset-7-22 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-7-22 {
 	margin-left: 31.81818%;
 }
 .sheet-col-9-22,
-.sheet-rolltemplate-wfrp4e .sheet-col-9-22 {
+.sheet-rolltemplate-whfrp2e .sheet-col-9-22 {
 	width: 40.90909%;
 }
 .sheet-offset-9-22,
-.sheet-rolltemplate-wfrp4e .sheet-offset-9-22 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-9-22 {
 	margin-left: 40.90909%;
 }
 .sheet-col-13-22,
-.sheet-rolltemplate-wfrp4e .sheet-col-13-22 {
+.sheet-rolltemplate-whfrp2e .sheet-col-13-22 {
 	width: 59.09091%;
 }
 .sheet-offset-13-22,
-.sheet-rolltemplate-wfrp4e .sheet-offset-13-22 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-13-22 {
 	margin-left: 59.09091%;
 }
 
 .sheet-col-15-22,
-.sheet-rolltemplate-wfrp4e .sheet-col-15-22 {
+.sheet-rolltemplate-whfrp2e .sheet-col-15-22 {
 	width: 68.18182%;
 }
 .sheet-offset-15-22,
-.sheet-rolltemplate-wfrp4e .sheet-offset-15-22 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-15-22 {
 	margin-left: 68.18182%;
 }
 .sheet-col-17-22,
-.sheet-rolltemplate-wfrp4e .sheet-col-17-22 {
+.sheet-rolltemplate-whfrp2e .sheet-col-17-22 {
 	width: 77.27273%;
 }
 .sheet-offset-17-22,
-.sheet-rolltemplate-wfrp4e .sheet-offset-17-22 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-17-22 {
 	margin-left: 77.27273%;
 }
 .sheet-col-19-22,
-.sheet-rolltemplate-wfrp4e .sheet-col-19-22 {
+.sheet-rolltemplate-whfrp2e .sheet-col-19-22 {
 	width: 86.36364%;
 }
 .sheet-offset-19-22,
-.sheet-rolltemplate-wfrp4e .sheet-offset-19-22 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-19-22 {
 	margin-left: 86.36364%;
 }
 .sheet-col-21-22,
-.sheet-rolltemplate-wfrp4e .sheet-col-21-22 {
+.sheet-rolltemplate-whfrp2e .sheet-col-21-22 {
 	width: 95.45455%;
 }
 .sheet-offset-21-22,
-.sheet-rolltemplate-wfrp4e .sheet-offset-21-22 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-21-22 {
 	margin-left: 95.45455%;
 }
 
 .sheet-col-1-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-23 {
 	width: 4.34783%;
 }
 .sheet-offset-1-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-23 {
 	margin-left: 4.34783%;
 }
 .sheet-col-2-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-2-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-2-23 {
 	width: 8.69565%;
 }
 .sheet-offset-2-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-2-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-2-23 {
 	margin-left: 8.69565%;
 }
 .sheet-col-3-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-3-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-3-23 {
 	width: 13.04348%;
 }
 .sheet-offset-3-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-3-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-3-23 {
 	margin-left: 13.04348%;
 }
 .sheet-col-4-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-4-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-4-23 {
 	width: 17.3913%;
 }
 .sheet-offset-4-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-4-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-4-23 {
 	margin-left: 17.3913%;
 }
 .sheet-col-5-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-5-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-5-23 {
 	width: 21.73913%;
 }
 .sheet-offset-5-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-5-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-5-23 {
 	margin-left: 21.73913%;
 }
 .sheet-col-6-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-6-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-6-23 {
 	width: 26.08696%;
 }
 .sheet-offset-6-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-6-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-6-23 {
 	margin-left: 26.08696%;
 }
 .sheet-col-7-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-7-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-7-23 {
 	width: 30.43478%;
 }
 .sheet-offset-7-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-7-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-7-23 {
 	margin-left: 30.43478%;
 }
 .sheet-col-8-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-8-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-8-23 {
 	width: 34.78261%;
 }
 .sheet-offset-8-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-8-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-8-23 {
 	margin-left: 34.78261%;
 }
 .sheet-col-9-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-9-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-9-23 {
 	width: 39.13043%;
 }
 .sheet-offset-9-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-9-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-9-23 {
 	margin-left: 39.13043%;
 }
 .sheet-col-10-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-10-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-10-23 {
 	width: 43.47826%;
 }
 .sheet-offset-10-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-10-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-10-23 {
 	margin-left: 43.47826%;
 }
 .sheet-col-11-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-11-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-11-23 {
 	width: 47.82609%;
 }
 .sheet-offset-11-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-11-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-11-23 {
 	margin-left: 47.82609%;
 }
 .sheet-col-12-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-12-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-12-23 {
 	width: 52.17391%;
 }
 .sheet-offset-12-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-12-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-12-23 {
 	margin-left: 52.17391%;
 }
 .sheet-col-13-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-13-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-13-23 {
 	width: 56.52174%;
 }
 .sheet-offset-13-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-13-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-13-23 {
 	margin-left: 56.52174%;
 }
 .sheet-col-14-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-14-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-14-23 {
 	width: 60.86957%;
 }
 .sheet-offset-14-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-14-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-14-23 {
 	margin-left: 60.86957%;
 }
 .sheet-col-15-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-15-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-15-23 {
 	width: 65.21739%;
 }
 .sheet-offset-15-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-15-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-15-23 {
 	margin-left: 65.21739%;
 }
 .sheet-col-16-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-16-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-16-23 {
 	width: 69.56522%;
 }
 .sheet-offset-16-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-16-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-16-23 {
 	margin-left: 69.56522%;
 }
 .sheet-col-17-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-17-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-17-23 {
 	width: 73.91304%;
 }
 .sheet-offset-17-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-17-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-17-23 {
 	margin-left: 73.91304%;
 }
 .sheet-col-18-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-18-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-18-23 {
 	width: 78.26087%;
 }
 .sheet-offset-18-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-18-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-18-23 {
 	margin-left: 78.26087%;
 }
 .sheet-col-19-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-19-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-19-23 {
 	width: 82.6087%;
 }
 .sheet-offset-19-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-19-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-19-23 {
 	margin-left: 82.6087%;
 }
 .sheet-col-20-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-20-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-20-23 {
 	width: 86.95652%;
 }
 .sheet-offset-20-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-20-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-20-23 {
 	margin-left: 86.95652%;
 }
 .sheet-col-21-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-21-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-21-23 {
 	width: 91.30435%;
 }
 .sheet-offset-21-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-21-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-21-23 {
 	margin-left: 91.30435%;
 }
 .sheet-col-22-23,
-.sheet-rolltemplate-wfrp4e .sheet-col-22-23 {
+.sheet-rolltemplate-whfrp2e .sheet-col-22-23 {
 	width: 95.65217%;
 }
 .sheet-offset-22-23,
-.sheet-rolltemplate-wfrp4e .sheet-offset-22-23 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-22-23 {
 	margin-left: 95.65217%;
 }
 
 .sheet-col-1-24,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-24 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-24 {
 	width: 4.16667%;
 }
 .sheet-offset-1-24,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-24 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-24 {
 	margin-left: 4.16667%;
 }
 .sheet-col-5-24,
-.sheet-rolltemplate-wfrp4e .sheet-col-5-24 {
+.sheet-rolltemplate-whfrp2e .sheet-col-5-24 {
 	width: 20.83333%;
 }
 .sheet-offset-5-24,
-.sheet-rolltemplate-wfrp4e .sheet-offset-5-24 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-5-24 {
 	margin-left: 20.83333%;
 }
 .sheet-col-7-24,
-.sheet-rolltemplate-wfrp4e .sheet-col-7-24 {
+.sheet-rolltemplate-whfrp2e .sheet-col-7-24 {
 	width: 29.16667%;
 }
 .sheet-offset-7-24,
-.sheet-rolltemplate-wfrp4e .sheet-offset-7-24 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-7-24 {
 	margin-left: 29.16667%;
 }
 .sheet-col-9-24,
-.sheet-rolltemplate-wfrp4e .sheet-col-9-24 {
+.sheet-rolltemplate-whfrp2e .sheet-col-9-24 {
 	width: 37.5%;
 }
 .sheet-offset-9-24,
-.sheet-rolltemplate-wfrp4e .sheet-offset-9-24 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-9-24 {
 	margin-left: 37.5%;
 }
 .sheet-col-11-24,
-.sheet-rolltemplate-wfrp4e .sheet-col-11-24 {
+.sheet-rolltemplate-whfrp2e .sheet-col-11-24 {
 	width: 45.83333%;
 }
 .sheet-offset-11-24,
-.sheet-rolltemplate-wfrp4e .sheet-offset-11-24 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-11-24 {
 	margin-left: 45.83333%;
 }
 .sheet-col-13-24,
-.sheet-rolltemplate-wfrp4e .sheet-col-13-24 {
+.sheet-rolltemplate-whfrp2e .sheet-col-13-24 {
 	width: 54.16667%;
 }
 .sheet-offset-13-24,
-.sheet-rolltemplate-wfrp4e .sheet-offset-13-24 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-13-24 {
 	margin-left: 54.16667%;
 }
 .sheet-col-15-24,
-.sheet-rolltemplate-wfrp4e .sheet-col-15-24 {
+.sheet-rolltemplate-whfrp2e .sheet-col-15-24 {
 	width: 62.5%;
 }
 .sheet-offset-15-24,
-.sheet-rolltemplate-wfrp4e .sheet-offset-15-24 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-15-24 {
 	margin-left: 62.5%;
 }
 .sheet-col-17-24,
-.sheet-rolltemplate-wfrp4e .sheet-col-17-24 {
+.sheet-rolltemplate-whfrp2e .sheet-col-17-24 {
 	width: 70.83333%;
 }
 .sheet-offset-17-24,
-.sheet-rolltemplate-wfrp4e .sheet-offset-17-24 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-17-24 {
 	margin-left: 70.83333%;
 }
 .sheet-col-19-24,
-.sheet-rolltemplate-wfrp4e .sheet-col-19-24 {
+.sheet-rolltemplate-whfrp2e .sheet-col-19-24 {
 	width: 79.16667%;
 }
 .sheet-offset-19-24,
-.sheet-rolltemplate-wfrp4e .sheet-offset-19-24 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-19-24 {
 	margin-left: 79.16667%;
 }
 .sheet-col-21-24,
-.sheet-rolltemplate-wfrp4e .sheet-col-21-24 {
+.sheet-rolltemplate-whfrp2e .sheet-col-21-24 {
 	width: 87.5%;
 }
 .sheet-offset-21-24,
-.sheet-rolltemplate-wfrp4e .sheet-offset-21-24 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-21-24 {
 	margin-left: 87.5%;
 }
 .sheet-col-23-24,
-.sheet-rolltemplate-wfrp4e .sheet-col-23-24 {
+.sheet-rolltemplate-whfrp2e .sheet-col-23-24 {
 	width: 95.83333%;
 }
 .sheet-offset-23-24,
-.sheet-rolltemplate-wfrp4e .sheet-offset-23-24 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-23-24 {
 	margin-left: 95.83333%;
 }
 
 .sheet-col-1-25,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-25 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-25 {
 	width: 4%;
 }
 .sheet-offset-1-25,
-.sheet-rolltemplate-wfrp4e .sheet-offset-1-25 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-1-25 {
 	margin-left: 4%;
 }
 .sheet-col-2-25,
@@ -4689,7 +4689,7 @@ input[disabled].sheet-passive-skill-score {
 	margin-left: 96%;
 }
 .sheet-col-1-28,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-28 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-28 {
 	width: 3.57143%;
 }
 
@@ -4974,208 +4974,208 @@ input[disabled].sheet-passive-skill-score {
 }
 
 .sheet-col-045,
-.sheet-rolltemplate-wfrp4e .sheet-col-045 {
+.sheet-rolltemplate-whfrp2e .sheet-col-045 {
 	width: 4.5%;
 }
 .sheet-col-085,
-.sheet-rolltemplate-wfrp4e .sheet-col-085 {
+.sheet-rolltemplate-whfrp2e .sheet-col-085 {
 	width: 8.5%;
 }
 .sheet-col-095,
-.sheet-rolltemplate-wfrp4e .sheet-col-095 {
+.sheet-rolltemplate-whfrp2e .sheet-col-095 {
 	width: 9.5%;
 }
 .sheet-col-105,
-.sheet-rolltemplate-wfrp4e .sheet-col-105 {
+.sheet-rolltemplate-whfrp2e .sheet-col-105 {
 	width: 10.5%;
 }
 .sheet-col-535,
-.sheet-rolltemplate-wfrp4e .sheet-col-535 {
+.sheet-rolltemplate-whfrp2e .sheet-col-535 {
 	width: 53.5%;
 }
 .sheet-col-1-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-100 {
 	width: 1%;
 }
 .sheet-col-3-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-3-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-3-100 {
 	width: 3%;
 }
 .sheet-col-4-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-4-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-4-100 {
 	width: 4%;
 }
 .sheet-col-6-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-6-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-6-100 {
 	width: 6%;
 }
 .sheet-col-7-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-7-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-7-100 {
 	width: 7%;
 }
 .sheet-col-8-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-8-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-8-100 {
 	width: 8%;
 }
 .sheet-col-9-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-9-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-9-100 {
 	width: 9%;
 }
 .sheet-col-11-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-11-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-11-100 {
 	width: 11%;
 }
 .sheet-col-12-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-12-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-12-100 {
 	width: 12%;
 }
 .sheet-col-13-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-13-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-13-100 {
 	width: 13%;
 }
 .sheet-col-14-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-14-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-14-100 {
 	width: 14%;
 }
 .sheet-col-16-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-16-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-16-100 {
 	width: 16%;
 }
 .sheet-col-17-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-17-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-17-100 {
 	width: 17%;
 }
 .sheet-col-18-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-18-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-18-100 {
 	width: 18%;
 }
 .sheet-col-19-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-19-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-19-100 {
 	width: 19%;
 }
 .sheet-col-21-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-21-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-21-100 {
 	width: 21%;
 }
 .sheet-col-23-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-23-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-23-100 {
 	width: 23%;
 }
 .sheet-col-24-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-24-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-24-100 {
 	width: 24%;
 }
 .sheet-col-26-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-26-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-26-100 {
 	width: 26%;
 }
 .sheet-col-27-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-27-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-27-100 {
 	width: 27%;
 }
 .sheet-col-28-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-28-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-28-100 {
 	width: 28%;
 }
 .sheet-col-29-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-29-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-29-100 {
 	width: 29%;
 }
 .sheet-col-31-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-31-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-31-100 {
 	width: 31%;
 }
 .sheet-col-32-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-32-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-32-100 {
 	width: 32%;
 }
 .sheet-col-35-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-35-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-35-100 {
 	width: 35%;
 }
 .sheet-col-36-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-36-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-36-100 {
 	width: 36%;
 }
 .sheet-col-37-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-37-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-37-100 {
 	width: 37%;
 }
 .sheet-col-1-150,
-.sheet-rolltemplate-wfrp4e .sheet-col-1-150 {
+.sheet-rolltemplate-whfrp2e .sheet-col-1-150 {
 	width: 1.5%;
 }
 .sheet-col-63-200,
-.sheet-rolltemplate-wfrp4e .sheet-col-63-200 {
+.sheet-rolltemplate-whfrp2e .sheet-col-63-200 {
 	width: 31.5%;
 }
 .sheet-col-103-200,
-.sheet-rolltemplate-wfrp4e .sheet-col-103-200 {
+.sheet-rolltemplate-whfrp2e .sheet-col-103-200 {
 	width: 51.5%;
 }
 .sheet-col-25-39,
-.sheet-rolltemplate-wfrp4e .sheet-col-25-49 {
+.sheet-rolltemplate-whfrp2e .sheet-col-25-49 {
 	width: 39%;
 }
 .sheet-col-25-49,
-.sheet-rolltemplate-wfrp4e .sheet-col-25-49 {
+.sheet-rolltemplate-whfrp2e .sheet-col-25-49 {
 	width: 49%;
 }
 .sheet-offset-25-49,
-.sheet-rolltemplate-wfrp4e .sheet-offset-25-49 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-25-49 {
 	margin-left: 49%;
 }
 .sheet-col-25-1,
-.sheet-rolltemplate-wfrp4e .sheet-col-25-1 {
+.sheet-rolltemplate-whfrp2e .sheet-col-25-1 {
 	width: 1.5%;
 }
 .sheet-col-25-2,
-.sheet-rolltemplate-wfrp4e .sheet-col-25-2 {
+.sheet-rolltemplate-whfrp2e .sheet-col-25-2 {
 	width: 2% 2%;
 }
 .sheet-col-25-3,
-.sheet-rolltemplate-wfrp4e .sheet-col-25-3 {
+.sheet-rolltemplate-whfrp2e .sheet-col-25-3 {
 	width: 2.5%;
 }
 .sheet-offset-25-2,
-.sheet-rolltemplate-wfrp4e .sheet-offset-25-2 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-25-2 {
 	margin-left: 2%;
 }
 .sheet-col-25-21,
-.sheet-rolltemplate-wfrp4e .sheet-col-25-21 {
+.sheet-rolltemplate-whfrp2e .sheet-col-25-21 {
 	width: 52.5%;
 }
 .sheet-col-25-78,
-.sheet-rolltemplate-wfrp4e .sheet-col-25-78 {
+.sheet-rolltemplate-whfrp2e .sheet-col-25-78 {
 	width: 78%;
 }
 .sheet-offset-25-78,
-.sheet-rolltemplate-wfrp4e .sheet-offset-25-78 {
+.sheet-rolltemplate-whfrp2e .sheet-offset-25-78 {
 	margin-left: 78%;
 }
 .sheet-col-100-100,
-.sheet-rolltemplate-wfrp4e .sheet-col-100-100 {
+.sheet-rolltemplate-whfrp2e .sheet-col-100-100 {
 	width: 100%;
 }
 .sheet-col-rowspan,
-.sheet-rolltemplate-wfrp4e .sheet-col-535 {
+.sheet-rolltemplate-whfrp2e .sheet-col-535 {
 	top: 0;
 	bottom: 0;
 	height: 100%;
 }
 
 .sheet-row-r,
-.sheet-rolltemplate-wfrp4e .sheet-row-r {
+.sheet-rolltemplate-whfrp2e .sheet-row-r {
 	letter-spacing: -0.31em;
 	*letter-spacing: normal;
 	word-spacing: -0.43em;
 }
 .sheet-opera-only :-o-prefocus,  .sheet-row-r,
-.sheet-rolltemplate-wfrp4e .sheet-opera-only :-o-prefocus, .sheet-rolltemplate-wfrp4e .sheet-row-r {
+.sheet-rolltemplate-whfrp2e .sheet-opera-only :-o-prefocus, .sheet-rolltemplate-whfrp2e .sheet-row-r {
 	word-spacing: -0.43em;
 }
 .sheet-row-r img,
-.sheet-rolltemplate-wfrp4e .sheet-row-r img {
+.sheet-rolltemplate-whfrp2e .sheet-row-r img {
 	max-width: 100%;
 }
 
diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index e656dae107..3353ed4848 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
@@ -475,76 +475,76 @@
 			<div class="sheet-col-1-9 sheet-center">
 				<input type="checkbox" name="attr_initiative_houserule" class="sheet-hidden sheet-hider" value="0" checked="checked" />
 				<div class="sheet-center sheet-block-a">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Initiative" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ @{Initiative} [INIT] +?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}} {{SLmod=[[?{SL Modifier|0}]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Initiative" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ @{Initiative} [INIT] +?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}} {{SLmod=[[?{SL Modifier|0}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_initiative_houserule" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-center sheet-block-a">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Initiative2" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[1d10 [d10] +(@{Initiative} [INIT] +?{@{translation_modifier}|0})&{tracker}]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Initiative2" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[1d10 [d10] +(@{Initiative} [INIT] +?{@{translation_modifier}|0})&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_initiative_houserule" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-center sheet-block-a">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Initiative3" value="@{Whisper} &{template:wfrp4e}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[[[1d10]] [d10] +[[floor((@{Agility})/10)]] [AGIB] +[[floor((@{Initiative}+?{@{translation_modifier}|0})/10)]] [INITB] &{tracker}]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Initiative3" value="@{Whisper} &{template:whfrp2e}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[[[1d10]] [d10] +[[floor((@{Agility})/10)]] [AGIB] +[[floor((@{Initiative}+?{@{translation_modifier}|0})/10)]] [INITB] &{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
-				<input type="hidden" name="attr_Initiative_cm" value="@{Whisper} &{template:wfrp4e}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[[[1d10]] [d10] +[[floor((@{Agility})/10)]] [AGIB] +[[floor((@{Initiative}+?{@{translation_modifier}|0})/10)]] [INITB] &{tracker}]]}}" />
+				<input type="hidden" name="attr_Initiative_cm" value="@{Whisper} &{template:whfrp2e}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[[[1d10]] [d10] +[[floor((@{Agility})/10)]] [AGIB] +[[floor((@{Initiative}+?{@{translation_modifier}|0})/10)]] [INITB] &{tracker}]]}}" />
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-center">
-							<button type="roll" class="sheet-combat-actions-np" name="roll_CriticalTest" value="@{Whisper} &amp&{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=Critical Roll}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{modvalue=[[?{Crit Roll Modifier|0}]]}}">
+							<button type="roll" class="sheet-combat-actions-np" name="roll_CriticalTest" value="@{Whisper} &amp&{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=Critical Roll}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{modvalue=[[?{Crit Roll Modifier|0}]]}}">
 						<span data-i18n="CRITICAL-HIT">Critical Hit</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_FumbleTest" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{FUMBLE}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_FumbleTest" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{FUMBLE}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}">
 						<span data-i18n="OOPS">Oops</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_AmputationTest" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AMPUTATION}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{amputationroll=true}} {{test=[[@{roll_rule}]]}} {{target=[[ [[@{condgen_move}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_AmputationTest" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AMPUTATION}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{amputationroll=true}} {{test=[[@{roll_rule}]]}} {{target=[[ [[@{condgen_move}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}}">
 						<span data-i18n="AMPUTATION">Amputation</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Endurance" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[0]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}} {{reroll=@{RT-reroll}Endurance)}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Endurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[0]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}} {{reroll=@{RT-reroll}Endurance)}}">
 						<span data-i18n="ENDURANCE">Endurance</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Intuition" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}} {{reroll=@{RT-reroll}Intuition)}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Intuition" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}} {{reroll=@{RT-reroll}Intuition)}}">
 						<span style="white-space: pre;" data-i18n="INTUITION">Intuition</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Perception" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]] [PEN]  + [[@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{armorpen=[[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}} {{reroll=@{RT-reroll}Perception)}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Perception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]] [PEN]  + [[@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{armorpen=[[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}} {{reroll=@{RT-reroll}Perception)}}">
 						<span data-i18n="PERCEPTION">Perception</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Cool" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{COOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CoolChar}+@{CoolAdv}+@{CoolMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Cool_modtype1}]]}} {{mod1=@{Cool_mod1}}} {{mod2type=[[@{Cool_modtype2}]]}} {{mod2=@{Cool_mod2}}} {{mod3type=[[@{Cool_modtype3}]]}} {{mod3=@{Cool_mod3}}} {{reroll=@{RT-reroll}Cool)}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Cool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{COOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CoolChar}+@{CoolAdv}+@{CoolMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Cool_modtype1}]]}} {{mod1=@{Cool_mod1}}} {{mod2type=[[@{Cool_modtype2}]]}} {{mod2=@{Cool_mod2}}} {{mod3type=[[@{Cool_modtype3}]]}} {{mod3=@{Cool_mod3}}} {{reroll=@{RT-reroll}Cool)}}">
 						<span data-i18n="COOL">Cool</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Dodge" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{DODGE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{DodgeChar}+@{DodgeAdv}+@{DodgeMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Dodge_modtype1}]]}} {{mod1=@{Dodge_mod1}}} {{mod2type=[[@{Dodge_modtype2}]]}} {{mod2=@{Dodge_mod2}}} {{mod3type=[[@{Dodge_modtype3}]]}} {{mod3=@{Dodge_mod3}}} {{reroll=@{RT-reroll}Dodge)}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Dodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{DODGE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{DodgeChar}+@{DodgeAdv}+@{DodgeMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Dodge_modtype1}]]}} {{mod1=@{Dodge_mod1}}} {{mod2type=[[@{Dodge_modtype2}]]}} {{mod2=@{Dodge_mod2}}} {{mod3type=[[@{Dodge_modtype3}]]}} {{mod3=@{Dodge_mod3}}} {{reroll=@{RT-reroll}Dodge)}}">
 						<span data-i18n="DODGE">Dodge</span>
 					</button>
 				</div>
@@ -557,76 +557,76 @@
 			<div class="sheet-col-1-9 sheet-center">
 				<input type="checkbox" name="attr_initiative_houserule" class="sheet-hidden sheet-hider" value="0" checked="checked" />
 				<div class="sheet-center sheet-block-a">
-					<button type="action" class="sheet-combat-actions-np" name="act_Initiative_houserule0" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ @{Initiative} [INIT] +?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}} {{SLmod=[[?{SL Modifier|0}]]}}">
+					<button type="action" class="sheet-combat-actions-np" name="act_Initiative_houserule0" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ @{Initiative} [INIT] +?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}} {{SLmod=[[?{SL Modifier|0}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_initiative_houserule" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-center sheet-block-a">
-					<button type="action" class="sheet-combat-actions-np" name="act_Initiative_houserule1" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[1d10 [d10] +(@{Initiative} [INIT] +?{@{translation_modifier}|0})&{tracker}]]}}">
+					<button type="action" class="sheet-combat-actions-np" name="act_Initiative_houserule1" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[1d10 [d10] +(@{Initiative} [INIT] +?{@{translation_modifier}|0})&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_initiative_houserule" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-center sheet-block-a">
-					<button type="action" class="sheet-combat-actions-np" name="act_Initiative_houserule2" value="@{Whisper} &{template:wfrp4e}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[[[1d10]] [d10] +[[floor((@{Agility})/10)]] [AGIB] +[[floor((@{Initiative}+?{@{translation_modifier}|0})/10)]] [INITB] &{tracker}]]}}">
+					<button type="action" class="sheet-combat-actions-np" name="act_Initiative_houserule2" value="@{Whisper} &{template:whfrp2e}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[[[1d10]] [d10] +[[floor((@{Agility})/10)]] [AGIB] +[[floor((@{Initiative}+?{@{translation_modifier}|0})/10)]] [INITB] &{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
-				<input type="hidden" name="attr_Initiative_cm" value="@{Whisper} &{template:wfrp4e}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[[[1d10]] [d10] +[[floor((@{Agility})/10)]] [AGIB] +[[floor((@{Initiative}+?{@{translation_modifier}|0})/10)]] [INITB] &{tracker}]]}}" />
+				<input type="hidden" name="attr_Initiative_cm" value="@{Whisper} &{template:whfrp2e}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[[[1d10]] [d10] +[[floor((@{Agility})/10)]] [AGIB] +[[floor((@{Initiative}+?{@{translation_modifier}|0})/10)]] [INITB] &{tracker}]]}}" />
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-center">
-							<button type="action" class="sheet-combat-actions-np" name="act_CriticalTest" value="@{Whisper} &amp&{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=Critical Roll}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{modvalue=[[?{Crit Roll Modifier|0}]]}}">
+							<button type="action" class="sheet-combat-actions-np" name="act_CriticalTest" value="@{Whisper} &amp&{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=Critical Roll}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{modvalue=[[?{Crit Roll Modifier|0}]]}}">
 						<span data-i18n="CRITICAL-HIT">Critical Hit</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-center">
-					<button type="action" class="sheet-combat-actions-np" name="act_FumbleTest" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{FUMBLE}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}">
+					<button type="action" class="sheet-combat-actions-np" name="act_FumbleTest" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{FUMBLE}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}">
 						<span data-i18n="OOPS">Oops</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="action" class="sheet-combat-actions-np" name="act_AmputationTest" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AMPUTATION}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{amputationroll=true}} {{test=[[@{roll_rule}]]}} {{target=[[ [[@{condgen_move}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}}">
+					<button type="action" class="sheet-combat-actions-np" name="act_AmputationTest" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AMPUTATION}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{amputationroll=true}} {{test=[[@{roll_rule}]]}} {{target=[[ [[@{condgen_move}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}}">
 						<span data-i18n="AMPUTATION">Amputation</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="action" class="sheet-combat-actions-np" name="act_Endurance" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[0]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}} {{reroll=@{RT-reroll}Endurance)}}">
+					<button type="action" class="sheet-combat-actions-np" name="act_Endurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[0]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}} {{reroll=@{RT-reroll}Endurance)}}">
 						<span data-i18n="ENDURANCE">Endurance</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="action" class="sheet-combat-actions-np" name="act_Intuition" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}} {{reroll=@{RT-reroll}Intuition)}}">
+					<button type="action" class="sheet-combat-actions-np" name="act_Intuition" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}} {{reroll=@{RT-reroll}Intuition)}}">
 						<span style="white-space: pre;" data-i18n="INTUITION">Intuition</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="action" class="sheet-combat-actions-np" name="act_Perception" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]] [PEN]  + [[@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{armorpen=[[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}} {{reroll=@{RT-reroll}Perception)}}">
+					<button type="action" class="sheet-combat-actions-np" name="act_Perception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]] [PEN]  + [[@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{armorpen=[[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}} {{reroll=@{RT-reroll}Perception)}}">
 						<span data-i18n="PERCEPTION">Perception</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="action" class="sheet-combat-actions-np" name="act_Cool" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{COOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CoolChar}+@{CoolAdv}+@{CoolMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Cool_modtype1}]]}} {{mod1=@{Cool_mod1}}} {{mod2type=[[@{Cool_modtype2}]]}} {{mod2=@{Cool_mod2}}} {{mod3type=[[@{Cool_modtype3}]]}} {{mod3=@{Cool_mod3}}} {{reroll=@{RT-reroll}Cool)}}">
+					<button type="action" class="sheet-combat-actions-np" name="act_Cool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{COOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CoolChar}+@{CoolAdv}+@{CoolMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Cool_modtype1}]]}} {{mod1=@{Cool_mod1}}} {{mod2type=[[@{Cool_modtype2}]]}} {{mod2=@{Cool_mod2}}} {{mod3type=[[@{Cool_modtype3}]]}} {{mod3=@{Cool_mod3}}} {{reroll=@{RT-reroll}Cool)}}">
 						<span data-i18n="COOL">Cool</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="action" class="sheet-combat-actions-np" name="act_Dodge" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{DODGE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{DodgeChar}+@{DodgeAdv}+@{DodgeMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Dodge_modtype1}]]}} {{mod1=@{Dodge_mod1}}} {{mod2type=[[@{Dodge_modtype2}]]}} {{mod2=@{Dodge_mod2}}} {{mod3type=[[@{Dodge_modtype3}]]}} {{mod3=@{Dodge_mod3}}} {{reroll=@{RT-reroll}Dodge)}}">
+					<button type="action" class="sheet-combat-actions-np" name="act_Dodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{DODGE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{DodgeChar}+@{DodgeAdv}+@{DodgeMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Dodge_modtype1}]]}} {{mod1=@{Dodge_mod1}}} {{mod2type=[[@{Dodge_modtype2}]]}} {{mod2=@{Dodge_mod2}}} {{mod3type=[[@{Dodge_modtype3}]]}} {{mod3=@{Dodge_mod3}}} {{reroll=@{RT-reroll}Dodge)}}">
 						<span data-i18n="DODGE">Dodge</span>
 					</button>
 				</div>
@@ -698,17 +698,17 @@
 			<div class="sheet-col-1-5 sheet-center sheet-nowrap" style="float: left;">
 				<div class="sheet-col-1-2 sheet-right" style="width: 85%; float: left;">
 					<select class="sheet-combat-select" name="attr_CharacterAction" style="height: 24px; text-align-last: center;">					
-						<option value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{AthleticsChar}+@{AthleticsAdv}+@{AthleticsMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}Athletics)}}"  data-i18n="ATHLETICS" selected="selected">Athletics</option>	
+						<option value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{AthleticsChar}+@{AthleticsAdv}+@{AthleticsMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}Athletics)}}"  data-i18n="ATHLETICS" selected="selected">Athletics</option>	
 						
-						<option value="@{Whisper} &{template:wfrp4e} {{modvalue=[[20]]}} {{climbing=true}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=Climbing Roll}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]]+@{Climb}+20]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}}  {{movement=[[@{Movementmod})]]}} {{mod1type=[[@{Climb_modtype1}]]}} {{mod1=@{Climb_mod1}}} {{mod2type=[[@{Climb_modtype2}]]}} {{mod2=@{Climb_mod2}}} {{mod3type=[[@{Climb_modtype3}]]}} {{mod3=@{Climb_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}" data-i18n="CLIMBING">Climbing</option>
+						<option value="@{Whisper} &{template:whfrp2e} {{modvalue=[[20]]}} {{climbing=true}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=Climbing Roll}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]]+@{Climb}+20]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}}  {{movement=[[@{Movementmod})]]}} {{mod1type=[[@{Climb_modtype1}]]}} {{mod1=@{Climb_mod1}}} {{mod2type=[[@{Climb_modtype2}]]}} {{mod2=@{Climb_mod2}}} {{mod3type=[[@{Climb_modtype3}]]}} {{mod3=@{Climb_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}" data-i18n="CLIMBING">Climbing</option>
 						
-						<option value="@{Whisper} &{template:wfrp4e} {{falling=true}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=Falling Roll}} {{character_name=@{character_name}}} {{yards=[[?{How many yards have you fallen down?|3}]]}} {{damage=[[1d10+(?{How many yards have you fallen down?|3}*3)-( [[(((([[?{Did you fall on purpose ?|Yes, ?{Roll a Average (+20) Athletics Test&#44 was the result a success (SL +0 or more)?&amp;#124;Yes&amp;#44; 1+3*?{Enter your Athletics Test SL result&amp;amp;#124;0&amp;amp;#125; &amp;#124;No&amp;#44; 0&amp;#125; &#124;No&#44; 0&amp;#125;&#125; |No, 0}]]) + 0) + abs(([[?{Did you fall on purpose ?|Yes, ?{Roll a Average (+20) Athletics Test&#44 was the result a success (SL +0 or more)?&amp;#124;Yes&amp;#44; 1+3*?{Enter your Athletics Test SL result&amp;amp;#124;0&amp;amp;#125; &amp;#124;No&amp;#44; 0&amp;#125; &#124;No&#44; 0&amp;#125;&#125; |No, 0}]]) - 0))/2)]])-@{ToughnessBonus}]]}} {{slyards=[[?{Did you fall on purpose ?|Yes, ?{Roll a Average (+20) Athletics Test&#44 was the result a success (SL +0 or more)?&amp;#124;Yes&amp;#44; 1+3*?{Enter your Athletics Test SL result&amp;amp;#124;0&amp;amp;#125; &amp;#124;No&amp;#44; 0&amp;#125; &#124;No&#44; 0&amp;#125;&#125; |No, 0}]]}} {{reroll=@{RT-reroll}CharacterAction)}}"  data-i18n="FALLING">Falling</option>
+						<option value="@{Whisper} &{template:whfrp2e} {{falling=true}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=Falling Roll}} {{character_name=@{character_name}}} {{yards=[[?{How many yards have you fallen down?|3}]]}} {{damage=[[1d10+(?{How many yards have you fallen down?|3}*3)-( [[(((([[?{Did you fall on purpose ?|Yes, ?{Roll a Average (+20) Athletics Test&#44 was the result a success (SL +0 or more)?&amp;#124;Yes&amp;#44; 1+3*?{Enter your Athletics Test SL result&amp;amp;#124;0&amp;amp;#125; &amp;#124;No&amp;#44; 0&amp;#125; &#124;No&#44; 0&amp;#125;&#125; |No, 0}]]) + 0) + abs(([[?{Did you fall on purpose ?|Yes, ?{Roll a Average (+20) Athletics Test&#44 was the result a success (SL +0 or more)?&amp;#124;Yes&amp;#44; 1+3*?{Enter your Athletics Test SL result&amp;amp;#124;0&amp;amp;#125; &amp;#124;No&amp;#44; 0&amp;#125; &#124;No&#44; 0&amp;#125;&#125; |No, 0}]]) - 0))/2)]])-@{ToughnessBonus}]]}} {{slyards=[[?{Did you fall on purpose ?|Yes, ?{Roll a Average (+20) Athletics Test&#44 was the result a success (SL +0 or more)?&amp;#124;Yes&amp;#44; 1+3*?{Enter your Athletics Test SL result&amp;amp;#124;0&amp;amp;#125; &amp;#124;No&amp;#44; 0&amp;#125; &#124;No&#44; 0&amp;#125;&#125; |No, 0}]]}} {{reroll=@{RT-reroll}CharacterAction)}}"  data-i18n="FALLING">Falling</option>
 
-						<option value="@{Whisper} &amp;{template:wfrp4e} {{leaping=true}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=Leaping Roll}} {{character_name=@{character_name}}} {{movement=[[@{Movementmod}]]}} {{SLmod=[[?{If you have a run up of at least your Movement in yards Roll a Average (+20) Athletics Test. if not Roll Challenging (+0) Athletics Test, then enter the SL Result|0}]]}} {{reroll=@{RT-reroll}CharacterAction)}}" data-i18n="LEAPING">Leaping</option>
+						<option value="@{Whisper} &amp;{template:whfrp2e} {{leaping=true}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=Leaping Roll}} {{character_name=@{character_name}}} {{movement=[[@{Movementmod}]]}} {{SLmod=[[?{If you have a run up of at least your Movement in yards Roll a Average (+20) Athletics Test. if not Roll Challenging (+0) Athletics Test, then enter the SL Result|0}]]}} {{reroll=@{RT-reroll}CharacterAction)}}" data-i18n="LEAPING">Leaping</option>
 											
-						<option value="@{Whisper} &{template:wfrp4e} {{pursuit=true}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{title=Pursuit}} {{pursuitopt=[[?{Choose|Pursuer Roll, 1|Pursued Roll, 2}]]}} {{character_name=@{character_name}}} {{pursuitdist=[[?{Enter the current Distance between the pursuing parties (1-9)|4}]]}} {{target=[[[[@{condgen_see}*-1]] [COND] + @{Athletics} [SKILL] + ?{Athletics roll Modifier|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}"  data-i18n="PURSUIT">Pursuit</option>
+						<option value="@{Whisper} &{template:whfrp2e} {{pursuit=true}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{title=Pursuit}} {{pursuitopt=[[?{Choose|Pursuer Roll, 1|Pursued Roll, 2}]]}} {{character_name=@{character_name}}} {{pursuitdist=[[?{Enter the current Distance between the pursuing parties (1-9)|4}]]}} {{target=[[[[@{condgen_see}*-1]] [COND] + @{Athletics} [SKILL] + ?{Athletics roll Modifier|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}"  data-i18n="PURSUIT">Pursuit</option>
 						
-						<option value="@{Whisper} &amp;{template:wfrp4e} {{modvalue=[[20]]}} {{sprinting=true}} {{cond=[[@{condgen_see_move}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{title=^{ATHLETICS}}} {{skill=^{SPRINT-ROLL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{Athletics} [SKILL] + 20 [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{movement=[[@{Run}*2)]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}" data-i18n="SPRINTING">Sprinting</option>
+						<option value="@{Whisper} &amp;{template:whfrp2e} {{modvalue=[[20]]}} {{sprinting=true}} {{cond=[[@{condgen_see_move}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{title=^{ATHLETICS}}} {{skill=^{SPRINT-ROLL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{Athletics} [SKILL] + 20 [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{movement=[[@{Run}*2)]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}" data-i18n="SPRINTING">Sprinting</option>
 					</select>
 				</div>	
 				<div class="sheet-col-1-2 sheet-center" style="width: 15%;">
@@ -760,7 +760,7 @@
 				</div>
 
 				<div class="sheet-col-1-2 sheet-center inline-block" style="width: 15%;">
-					<button type="roll" class="sheet-combat-actions" name="roll_MeleeAttack"  value="@{Whisper} &{template:wfrp4e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Opposed Attack Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{character_name=@{character_name}}} {{attacktype=^{MELEE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Opposed Attack Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=$[[0]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
+					<button type="roll" class="sheet-combat-actions" name="roll_MeleeAttack"  value="@{Whisper} &{template:whfrp2e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Opposed Attack Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{character_name=@{character_name}}} {{attacktype=^{MELEE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Opposed Attack Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=$[[0]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
 						<span></span>
 					</button>
 				</div>
@@ -773,7 +773,7 @@
 					</button>
 				</div>
 				<div class="sheet-col-1-2 sheet-center" style="width: 15%;">
-					<button type="roll" class="sheet-combat-actions" name="roll_MeleeOpposed" value="@{Whisper} &{template:wfrp4e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Opposed Defense Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{attacktype=^{OPPOSED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Opposed Defense Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{Used_DefenseDefensive}]]}} {{test=$[[0]]}} {{reach=@{Used_DefenseReach}}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{showdmg=[[@{Used_DefenseOpposedDmg}]]}} {{hitlocation=true}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{armorqualities=@{armorQuality}}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeOpposed)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
+					<button type="roll" class="sheet-combat-actions" name="roll_MeleeOpposed" value="@{Whisper} &{template:whfrp2e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Opposed Defense Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{attacktype=^{OPPOSED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Opposed Defense Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{Used_DefenseDefensive}]]}} {{test=$[[0]]}} {{reach=@{Used_DefenseReach}}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{showdmg=[[@{Used_DefenseOpposedDmg}]]}} {{hitlocation=true}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{armorqualities=@{armorQuality}}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeOpposed)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
 						<span></span>
 					</button>
 				</div>
@@ -800,7 +800,7 @@
 					</button>
 				</div>
 				<div class="sheet-col-1-2 sheet-center" style="width: 15%;">
-					<button type="roll" class="sheet-combat-actions" name="roll_RangedAttack" value="@{Whisper} &{template:wfrp4e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Ranged Attack Roll Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Roll Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=$[[0]]}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{range=@{Used_WeaponRange}}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
+					<button type="roll" class="sheet-combat-actions" name="roll_RangedAttack" value="@{Whisper} &{template:whfrp2e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Ranged Attack Roll Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Roll Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=$[[0]]}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{range=@{Used_WeaponRange}}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
 						<span></span>
 					</button>
 				</div>
@@ -933,27 +933,27 @@
 				</div>						
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack2" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack2" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="3" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed2" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed2" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="3" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed3" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=1}} {{SLmod{{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed3" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=1}} {{SLmod{{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 
 					</div>		
@@ -997,19 +997,19 @@
 
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="0" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &amp&{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[(@{InitiativeStat})]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &amp&{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[(@{InitiativeStat})]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+@{InitiativeStat}&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+@{InitiativeStat}&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="2" checked="checked" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+floor((@{AgilityStat})/10)+floor((@{InitiativeStat})/10)&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+floor((@{AgilityStat})/10)+floor((@{InitiativeStat})/10)&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>				
@@ -1021,11 +1021,11 @@
 
 				<input type="checkbox" name="attr_NPCUsedRanged" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged" style="margin-left: 77px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged" style="margin-left: 77px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
 				</div>		
 				<input type="checkbox" name="attr_NPCUsedRanged" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged2" style="margin-left: 77px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged2" style="margin-left: 77px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
 				</div>	
 
 	
@@ -1233,35 +1233,35 @@
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillStat}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Weapon_Skill)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillStat}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Weapon_Skill)}}"></button>
 						</div>
 						<input class="sheet-hidden" type="textarea" name="attr_Weapon_SkillB" value="[l](~@{character_name}|CriticalTest)" />
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}}  {{title=^{BALLISTIC-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{BallisticSkillStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Ballistic_Skill)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}}  {{title=^{BALLISTIC-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{BallisticSkillStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Ballistic_Skill)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}{{title=^{STRENGTH}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{StrengthStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Strength)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}{{title=^{STRENGTH}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{StrengthStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Strength)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1)*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Toughness)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1)*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Toughness)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Initiative)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Initiative)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Agility)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Agility)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{blindeded=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{DexterityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Dexterity)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{blindeded=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{DexterityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Dexterity)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{IntelligenceStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Intelligence)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{IntelligenceStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Intelligence)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{WILL-POWER}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Will_Power)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{WILL-POWER}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Will_Power)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{FellowshipStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Fellowship)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{FellowshipStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Fellowship)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 						</div>
@@ -1327,46 +1327,46 @@
 							
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="0" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCAthletics" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCAthletics)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCAthletics" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCAthletics)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="1" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll-flex" name="roll_NPCCool" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{COOL}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCCool)}}"></button>
+							<button type="roll" class="sheet-roll-flex" name="roll_NPCCool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{COOL}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCCool)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="2" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_CriticalTest" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{title=Critical Roll}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{reroll=@{NPC-rep}CriticalTest)}}">
+							<button type="roll" class="sheet-roll" name="roll_CriticalTest" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{title=Critical Roll}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{reroll=@{NPC-rep}CriticalTest)}}">
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="3" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCDodge" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{DODGE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reroll=@{NPC-rep}NPCDodge)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCDodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{DODGE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reroll=@{NPC-rep}NPCDodge)}}"></button>
 						</div>					
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="4" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCEndurance" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCEndurance)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCEndurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCEndurance)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="5" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCPerception" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{PERCEPTION}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCPerception)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCPerception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{PERCEPTION}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCPerception)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="6" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_FumbleTest" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousStat}]]}} {{title=^{FUMBLE}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}"></span>
+							<button type="roll" class="sheet-roll" name="roll_FumbleTest" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousStat}]]}} {{title=^{FUMBLE}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}"></span>
 					</button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="7" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">						
-							<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:wfrp4e} {{title=^{MINOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
+							<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:whfrp2e} {{title=^{MINOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
 					</button>
 				</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="8" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">				
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:wfrp4e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:whfrp2e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
 					</button>
 				</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="9" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:wfrp4e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:whfrp2e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll=[[1d100]]}}">
 					</button>
 				</div>		
 
@@ -1420,7 +1420,7 @@
 								<input class="sheet-center" type="number" name="attr_npc-skill" value="@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}" disabled="true" />
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_NPC-skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_NPC-skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill)}}"></button>
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
 
@@ -1452,7 +1452,7 @@
 								<input class="sheet-center" type="number" name="attr_npc-skill2" value="@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}" disabled="true" />				
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_NPC-skill2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname2}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} } {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill2)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_NPC-skill2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname2}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} } {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill2)}}"></button>
 							</div>
 														
 							</div>	
@@ -1570,10 +1570,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="1" selected />
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 
 						</div>
@@ -1638,10 +1638,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="2"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -1705,10 +1705,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="3"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -1765,7 +1765,7 @@
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -1822,7 +1822,7 @@
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -1922,13 +1922,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -1974,13 +1974,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[  [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-praydamage2}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[  [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-praydamage2}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -2026,13 +2026,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -2079,13 +2079,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast2)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg2" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-spell-button-group sheet-right">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage2}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage2}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg2)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -2133,13 +2133,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-spell-button-group sheet-right">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage3}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg3)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage3}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg3)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -2191,7 +2191,7 @@
 							</div>	
 							
 							<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll-flex" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
 							</div>
 						</div>
 		</div>	
@@ -2267,27 +2267,27 @@
 				</div>						
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack2" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack2" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="3" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed2" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed2" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="3" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed3" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed3" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 
 					</div>		
@@ -2331,19 +2331,19 @@
 
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="0" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &amp&{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[(@{InitiativeStat})]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &amp&{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[(@{InitiativeStat})]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+@{InitiativeStat}&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+@{InitiativeStat}&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="2" checked="checked" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+floor((@{AgilityStat})/10)+floor((@{InitiativeStat})/10)&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+floor((@{AgilityStat})/10)+floor((@{InitiativeStat})/10)&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>				
@@ -2355,11 +2355,11 @@
 
 				<input type="checkbox" name="attr_NPCUsedRanged" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged" style="margin-left: 77px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged" style="margin-left: 77px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
 				</div>		
 				<input type="checkbox" name="attr_NPCUsedRanged" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged2" style="margin-left: 77px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged2" style="margin-left: 77px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
 				</div>	
 
 	
@@ -2567,35 +2567,35 @@
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillStat}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Weapon_Skill)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillStat}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Weapon_Skill)}}"></button>
 						</div>
 						<input class="sheet-hidden" type="textarea" name="attr_Weapon_SkillB" value="[l](~@{character_name}|CriticalTest)" />
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}}  {{title=^{BALLISTIC-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{BallisticSkillStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Ballistic_Skill)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}}  {{title=^{BALLISTIC-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{BallisticSkillStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Ballistic_Skill)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}{{title=^{STRENGTH}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{StrengthStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Strength)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}{{title=^{STRENGTH}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{StrengthStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Strength)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1)*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Toughness)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1)*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Toughness)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Initiative)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Initiative)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Agility)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Agility)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{blindeded=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{DexterityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Dexterity)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{blindeded=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{DexterityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Dexterity)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{IntelligenceStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Intelligence)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{IntelligenceStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Intelligence)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{WILL-POWER}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Will_Power)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{WILL-POWER}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Will_Power)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{FellowshipStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Fellowship)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{FellowshipStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Fellowship)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 						</div>
@@ -2661,19 +2661,19 @@
 							
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="0" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCAthletics" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCAthletics)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCAthletics" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCAthletics)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="1" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCCool" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{COOL}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCCool)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCCool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{COOL}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCCool)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="2" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_CriticalTest" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{title=Critical Roll}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{reroll=@{NPC-rep}CriticalTest)}}">
+							<button type="roll" class="sheet-roll" name="roll_CriticalTest" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{title=Critical Roll}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{reroll=@{NPC-rep}CriticalTest)}}">
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="3" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll-flex" name="roll_NPCDodge" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{DODGE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reroll=@{NPC-rep}NPCDodge)}}"></button>
+							<button type="roll" class="sheet-roll-flex" name="roll_NPCDodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{DODGE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reroll=@{NPC-rep}NPCDodge)}}"></button>
 						</div>					
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="4" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -2681,26 +2681,26 @@
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="5" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCPerception" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{PERCEPTION}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCPerception)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCPerception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{PERCEPTION}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCPerception)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="6" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_FumbleTest" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousStat}]]}} {{title=^{FUMBLE}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}"></span>
+							<button type="roll" class="sheet-roll" name="roll_FumbleTest" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousStat}]]}} {{title=^{FUMBLE}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}"></span>
 					</button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="7" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">						
-							<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:wfrp4e} {{title=^{MINOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
+							<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:whfrp2e} {{title=^{MINOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
 					</button>
 				</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="8" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">				
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:wfrp4e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:whfrp2e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
 					</button>
 				</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="9" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:wfrp4e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:whfrp2e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll=[[1d100]]}}">
 					</button>
 				</div>		
 
@@ -2754,7 +2754,7 @@
 								<input class="sheet-center" type="number" name="attr_npc-skill" value="@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}" disabled="true" />
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_NPC-skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_NPC-skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill)}}"></button>
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
 
@@ -2786,7 +2786,7 @@
 								<input class="sheet-center" type="number" name="attr_npc-skill2" value="@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}" disabled="true" />				
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_NPC-skill2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname2}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} } {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill2)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_NPC-skill2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname2}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} } {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill2)}}"></button>
 							</div>
 														
 							</div>	
@@ -2904,10 +2904,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="1" selected />
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 
 						</div>
@@ -2972,10 +2972,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="2"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -3039,10 +3039,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="3"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -3099,7 +3099,7 @@
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -3156,7 +3156,7 @@
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -3256,13 +3256,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -3308,13 +3308,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[  [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-praydamage2}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[  [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-praydamage2}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -3360,13 +3360,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -3413,13 +3413,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast2)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg2" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-spell-button-group sheet-right">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage2}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage2}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg2)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -3467,13 +3467,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-spell-button-group sheet-right">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage3}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg3)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage3}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg3)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -3525,7 +3525,7 @@
 							</div>	
 							
 							<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll-flex" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
 							</div>
 						</div>
 		</div>	
@@ -3600,27 +3600,27 @@
 				</div>						
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack2" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack2" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="3" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed2" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed2" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="3" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed3" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed3" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 
 					</div>		
@@ -3664,19 +3664,19 @@
 
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="0" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &amp&{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[(@{InitiativeStat})]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &amp&{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[(@{InitiativeStat})]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+@{InitiativeStat}&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+@{InitiativeStat}&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="2" checked="checked" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+floor((@{AgilityStat})/10)+floor((@{InitiativeStat})/10)&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+floor((@{AgilityStat})/10)+floor((@{InitiativeStat})/10)&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>				
@@ -3688,11 +3688,11 @@
 
 				<input type="checkbox" name="attr_NPCUsedRanged" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged" style="margin-left: 77px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged" style="margin-left: 77px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
 				</div>		
 				<input type="checkbox" name="attr_NPCUsedRanged" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged2" style="margin-left: 77px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged2" style="margin-left: 77px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
 				</div>	
 
 	
@@ -3900,35 +3900,35 @@
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillStat}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Weapon_Skill)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillStat}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Weapon_Skill)}}"></button>
 						</div>
 						<input class="sheet-hidden" type="textarea" name="attr_Weapon_SkillB" value="[l](~@{character_name}|CriticalTest)" />
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}}  {{title=^{BALLISTIC-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{BallisticSkillStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Ballistic_Skill)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}}  {{title=^{BALLISTIC-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{BallisticSkillStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Ballistic_Skill)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}{{title=^{STRENGTH}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{StrengthStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Strength)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}{{title=^{STRENGTH}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{StrengthStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Strength)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1)*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Toughness)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1)*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Toughness)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Initiative)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Initiative)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Agility)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Agility)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{blindeded=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{DexterityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Dexterity)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{blindeded=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{DexterityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Dexterity)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{IntelligenceStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Intelligence)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{IntelligenceStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Intelligence)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{WILL-POWER}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Will_Power)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{WILL-POWER}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Will_Power)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{FellowshipStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Fellowship)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{FellowshipStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Fellowship)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 						</div>
@@ -3994,46 +3994,46 @@
 							
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="0" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCAthletics" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCAthletics)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCAthletics" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCAthletics)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="1" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCCool" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{COOL}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCCool)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCCool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{COOL}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCCool)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="2" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_CriticalTest" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{title=Critical Roll}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{reroll=@{NPC-rep}CriticalTest)}}">
+							<button type="roll" class="sheet-roll" name="roll_CriticalTest" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{title=Critical Roll}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{reroll=@{NPC-rep}CriticalTest)}}">
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="3" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCDodge" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{DODGE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reroll=@{NPC-rep}NPCDodge)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCDodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{DODGE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reroll=@{NPC-rep}NPCDodge)}}"></button>
 						</div>					
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="4" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCEndurance" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCEndurance)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCEndurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCEndurance)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="5" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCPerception" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{PERCEPTION}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCPerception)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCPerception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{PERCEPTION}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCPerception)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="6" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_FumbleTest" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousStat}]]}} {{title=^{FUMBLE}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}"></span>
+							<button type="roll" class="sheet-roll" name="roll_FumbleTest" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousStat}]]}} {{title=^{FUMBLE}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}"></span>
 					</button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="7" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">						
-							<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:wfrp4e} {{title=^{MINOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
+							<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:whfrp2e} {{title=^{MINOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
 					</button>
 				</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="8" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">				
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:wfrp4e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:whfrp2e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
 					</button>
 				</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="9" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:wfrp4e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:whfrp2e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll=[[1d100]]}}">
 					</button>
 				</div>		
 
@@ -4087,7 +4087,7 @@
 								<input class="sheet-center" type="number" name="attr_npc-skill" value="@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}" disabled="true" />
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_NPC-skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_NPC-skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill)}}"></button>
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
 
@@ -4119,7 +4119,7 @@
 								<input class="sheet-center" type="number" name="attr_npc-skill2" value="@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}" disabled="true" />				
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_NPC-skill2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname2}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} } {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill2)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_NPC-skill2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname2}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} } {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill2)}}"></button>
 							</div>
 														
 							</div>	
@@ -4237,10 +4237,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="1" selected />
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 
 						</div>
@@ -4305,10 +4305,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="2"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -4372,10 +4372,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="3"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -4432,7 +4432,7 @@
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -4489,7 +4489,7 @@
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -4589,13 +4589,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -4641,13 +4641,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-praydamage2}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-praydamage2}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -4693,13 +4693,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -4746,13 +4746,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast2)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg2" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-spell-button-group sheet-right">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage2}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage2}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg2)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -4800,13 +4800,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-spell-button-group sheet-right">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage3}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg3)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage3}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg3)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -4858,7 +4858,7 @@
 							</div>	
 							
 							<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll-flex" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
 							</div>
 						</div>
 		</div>	
@@ -4933,27 +4933,27 @@
 				</div>						
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}}  {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack2" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack2" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedWeapon" class="sheet-hidden sheet-hider" value="3" />
 				<div class="sheet-col-1-30 sheet-left sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 51px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttack3" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed2" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed2" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 				<input type="checkbox" name="attr_NPCUsedDefensive" class="sheet-hidden sheet-hider" value="3" />
 				<div class="sheet-col-1-30 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed3" style="margin-left: 52px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCOpposed3" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
 				</div>
 
 					</div>		
@@ -4997,19 +4997,19 @@
 
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="0" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &amp&{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[(@{InitiativeStat})]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &amp&{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[(@{InitiativeStat})]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+@{InitiativeStat}&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+@{InitiativeStat}&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>
 				<input type="checkbox" name="attr_init_rule" class="sheet-hidden sheet-hider" value="2" checked="checked" />
 				<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+floor((@{AgilityStat})/10)+floor((@{InitiativeStat})/10)&{tracker}]]}}">
+					<button type="roll" class="combat-actions-np" name="roll_Initiative" style="height: 20px" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{inittest=[[1d10+floor((@{AgilityStat})/10)+floor((@{InitiativeStat})/10)&{tracker}]]}}">
 						<span data-i18n="INITIATIVE">Initiative</span>
 					</button>
 				</div>				
@@ -5021,11 +5021,11 @@
 
 				<input type="checkbox" name="attr_NPCUsedRanged" class="sheet-hidden sheet-hider" value="1" />
 				<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged" style="margin-left: 77px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged" style="margin-left: 77px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
 				</div>		
 				<input type="checkbox" name="attr_NPCUsedRanged" class="sheet-hidden sheet-hider" value="2" />
 				<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-block-a">
-					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged2" style="margin-left: 77px" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
+					<button type="roll" class="sheet-npc-combat" name="roll_NPCAttackRanged2" style="margin-left: 77px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualities2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rdg</span></button>
 				</div>	
 
 	
@@ -5233,35 +5233,35 @@
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillStat}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Weapon_Skill)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Weapon_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillStat}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Weapon_Skill)}}"></button>
 						</div>
 						<input class="sheet-hidden" type="textarea" name="attr_Weapon_SkillB" value="[l](~@{character_name}|CriticalTest)" />
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}}  {{title=^{BALLISTIC-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{BallisticSkillStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Ballistic_Skill)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Ballistic_Skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}}  {{title=^{BALLISTIC-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{BallisticSkillStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}Ballistic_Skill)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}{{title=^{STRENGTH}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{StrengthStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Strength)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}{{title=^{STRENGTH}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{StrengthStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Strength)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1)*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Toughness)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]]}kh1)*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Toughness)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Initiative)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Initiative)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Agility)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Agility)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{blindeded=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{DexterityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Dexterity)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{blindeded=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{DexterityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Dexterity)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{IntelligenceStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Intelligence)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{IntelligenceStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Intelligence)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{WILL-POWER}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Will_Power)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Will_Power" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{WILL-POWER}}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Will_Power)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{FellowshipStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Fellowship)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0})]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{FellowshipStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}Fellowship)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
 						</div>
@@ -5327,46 +5327,46 @@
 							
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="0" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCAthletics" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCAthletics)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCAthletics" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCAthletics)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="1" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCCool" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{COOL}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCCool)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCCool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{blindeded=[[0]]}} {{title=^{COOL}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{WillPowerStat} [CHAR] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCCool)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="2" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_CriticalTest" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{title=Critical Roll}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{reroll=@{NPC-rep}CriticalTest)}}">
+							<button type="roll" class="sheet-roll" name="roll_CriticalTest" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{title=Critical Roll}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{reroll=@{NPC-rep}CriticalTest)}}">
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="3" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCDodge" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{DODGE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reroll=@{NPC-rep}NPCDodge)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCDodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{DODGE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{AgilityStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reroll=@{NPC-rep}NPCDodge)}}"></button>
 						</div>					
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="4" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCEndurance" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCEndurance)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCEndurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENDURANCE}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[(@{ConditionModNPC})*-1]] [COND] + @{ToughnessStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCEndurance)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="5" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_NPCPerception" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{PERCEPTION}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCPerception)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_NPCPerception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[@{deafened}]]}} {{title=^{PERCEPTION}}} {{skill=Action}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionHearModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + @{InitiativeStat} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}NPCPerception)}}"></button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="6" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_FumbleTest" value="@{Whisper} &{template:wfrp4e} {{unconscious=[[@{UnconsciousStat}]]}} {{title=^{FUMBLE}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}"></span>
+							<button type="roll" class="sheet-roll" name="roll_FumbleTest" value="@{Whisper} &{template:whfrp2e} {{unconscious=[[@{UnconsciousStat}]]}} {{title=^{FUMBLE}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}"></span>
 					</button>
 						</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="7" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">						
-							<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:wfrp4e} {{title=^{MINOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
+							<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:whfrp2e} {{title=^{MINOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
 					</button>
 				</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="8" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">				
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:wfrp4e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:whfrp2e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
 					</button>
 				</div>
 				<input type="checkbox" name="attr_SkillRollNPC" class="sheet-hidden sheet-hider" value="9" />												
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:wfrp4e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:whfrp2e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{npc_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll=[[1d100]]}}">
 					</button>
 				</div>		
 
@@ -5420,7 +5420,7 @@
 								<input class="sheet-center" type="number" name="attr_npc-skill" value="@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}" disabled="true" />
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_NPC-skill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_NPC-skill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar}+@{npc-skillAdv}+@{npc-skillMisc}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill)}}"></button>
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
 
@@ -5452,7 +5452,7 @@
 								<input class="sheet-center" type="number" name="attr_npc-skill2" value="@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}" disabled="true" />				
 							</div>
 							<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_NPC-skill2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname2}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} } {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill2)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_NPC-skill2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{No condition tracking, add manually|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{npc-skillname2}}} {{skill=Skill}} {{character_name=@{npc_name}}} {{target=[[ [[@{ConditionModNPC}*-1]] [COND] + [[@{npc-skillChar2}+@{npc-skillAdv2}+@{npc-skillMisc2}]] [SKILL] + ?{No condition tracking, add manually|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} } {{NPC=[[1]]}} {{reroll=@{NPC-rep}npc-skill2)}}"></button>
 							</div>
 														
 							</div>	
@@ -5570,10 +5570,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="1" selected />
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 
 						</div>
@@ -5638,10 +5638,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="2"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10)]] [ADV]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -5705,10 +5705,10 @@
 								<input type="checkbox" name="attr_NPCUsedDefensive" value="3"  />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttack3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}}   {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
 							</div>
 							<div class="sheet-col-4-100 sheet-center  sheet-vert-middle sheet-mar-l-lg">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">OPP</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCOpposed3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">OPP</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -5765,7 +5765,7 @@
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC}+@{NPCBonusRanged}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged}}} {{range=@{NPCRangeRanged}}} {{rolltype=[[@{NPCImpaleRanged}]]}} {{damage=[[@{NPCStrengthBonusRanged}+@{NPCDamageRanged}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -5822,7 +5822,7 @@
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
 							</div>
 							<div class="sheet-col-4-100 sheet-center">
-								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_NPCAttackRanged2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCRangedName2}}} {{character_name=@{npc_name}}} {{attacktype=Ranged Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{RangedSkillNPC2}+@{NPCBonusRanged2}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD]]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{qualities=@{NPCQualitiesRanged2}}} {{range=@{NPCRangeRanged2}}} {{rolltype=[[@{NPCImpaleRanged2}]]}} {{damage=[[@{NPCStrengthBonusRanged2}+@{NPCDamageRanged2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttackRanged2)}}"><span data-i18n="ABB-RGD">Rgd</span></button>
 							</div>
 						</div>
 									<span class="sheet-spacer"></span>
@@ -5922,13 +5922,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{prayrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange}}} {{spelltarget=Targets: @{npc-praytarget}}} {{spellduration=Duration: @{npc-prayduration}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -5974,13 +5974,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{prayrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-prayduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[7]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCast2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-prayDmg2" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-praydamage2}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_PrayCastDmg2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[@{ConditionModNPC}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-prayname2}}} {{character_name=@{npc_name}}} {{spelltype=Prayer}} {{spellrange=Range: @{npc-prayrange2}}} {{spelltarget=Targets: @{npc-praytarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[@{ConditionModNPC}]] [COND] + [[@{FellowshipStat}+@{npc-prayloremodmod2})]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{spelldescription=@{npc-praydesc2}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-praydamage2}]]}} {{arcanetest=true}} {{rolltype=[[8]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{RTwrath=@{NPC-rt-wrath}}} {{reroll=@{NPC-rep}PrayCastDmg2)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -6026,13 +6026,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname}}} {{character_name=@{npc_name}}} {{spelltype=Channelling}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange}}} {{spelltarget=Targets: @{npc-spelltarget}}} {{spellduration=Duration: @{npc-spellduration}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -6079,13 +6079,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg2" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast2)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg2" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-spell-button-group sheet-right">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg2" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage2}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg2)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg2" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname2}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}}   {{spellrange=Range: @{npc-spellrange2}}} {{spelltarget=Targets: @{npc-spelltarget2}}} {{spellduration=Duration: @{npc-spellduration2}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod2}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber2}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc2}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage2}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg2)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -6133,13 +6133,13 @@
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-4-100 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCast3)}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_npc-SpellDmg3" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-4-100 sheet-spell-button-group sheet-right">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage3}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg3)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast3" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{npc-spellname3}}} {{character_name=@{npc_name}}} {{spelltype=Spell}} {{advantage=[[@{AdvantageNPCDisplay}*@{Advantage_casting}]]}} {{spellrange=Range: @{npc-spellrange3}}} {{spelltarget=Targets: @{npc-spelltarget3}}} {{spellduration=Duration: @{npc-spellduration3}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{IntelligenceStat}+@{npc-loremodmod3}]] [SKILL] + ?{Modifier (Adv. already added)|0} [MOD] + [[(@{AdvantageNPC}*10*@{Advantage_casting})]] [ADV]]]}} {{spellcastingnumber=[[@{npc-spellcastingnumber3}]]}} {{accuchanexlsl=[[@{npc-spellchannelsl}]]}} {{spelldescription=@{npc-spelldesc3}}} {{test=[[@{roll_rule}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{npc-spelldamage3}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}SpellCastDmg3)}}">
 									<span data-i18n="CAST">Cast</span>
 							</div>
 						</div>
@@ -6191,7 +6191,7 @@
 							</div>	
 							
 							<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll-flex" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
+								<button type="roll" class="sheet-roll-flex" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Channeling Roll Modifier|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{npc_name}}} {{target=[[ [[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1)*-1]] [COND] + [[@{WillPowerStat}+@{npc-chmod}]] [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{spellcastingnumber=@{npc-chancastingnumber}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{accuchanexlsl=?{Accumulated Extended Channelling SL (Start at 0)|@{npc-spellchannelsl}}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{NPC=[[1]]}} {{RTminor=@{NPC-rt-minor}}} {{RTmajor=@{NPC-rt-major}}} {{reroll=@{NPC-rep}ExtChannellingLoreRoll)}}"><span data-i18n="CAST">Cast</span></button>
 							</div>
 						</div>
 		</div>	
@@ -6832,34 +6832,34 @@
 							<br />
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm sheet-pad-b-lg">
-							<button type="roll" class="sheet-roll" name="roll_WeaponSkill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{WeaponSkillMod}}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}}  {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{WeaponSkill} [CHAR] + ?{@{translation_modifier}|@{WeaponSkillMod}} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{WeaponSkillSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}Weapon_Skill)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_WeaponSkill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{WeaponSkillMod}}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}}  {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{WeaponSkill} [CHAR] + ?{@{translation_modifier}|@{WeaponSkillMod}} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{WeaponSkillSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}Weapon_Skill)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_BallisticSkill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{BallisticSkillMod}}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} { {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{BALLISTIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{BallisticSkill} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{BallisticSkillSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}Ballistic_Skill)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_BallisticSkill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{BallisticSkillMod}}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} { {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{BALLISTIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{BallisticSkill} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{BallisticSkillSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}Ballistic_Skill)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{StrengthMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{STRENGTH}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Strength} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{StrengthSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Strength)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Strength" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{StrengthMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{STRENGTH}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Strength} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{StrengthSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Strength)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{ToughnessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Toughness} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{ToughnessSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Toughness)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Toughness" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{ToughnessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Toughness} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{ToughnessSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Toughness)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{InitiativeMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + @{Initiative} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{InitiativeSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Initiative)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Initiative" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{InitiativeMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + @{Initiative} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{InitiativeSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Initiative)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{AgilityMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_move}*-1]] [COND] + @{Agility} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{AgilitySL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Agility)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Agility" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{AgilityMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_move}*-1]] [COND] + @{Agility} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{AgilitySL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Agility)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{DexterityMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_move}*-1]] [COND] + @{Dexterity} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{DexteritySL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Dexterity)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Dexterity" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{DexterityMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_move}*-1]] [COND] + @{Dexterity} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{DexteritySL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Dexterity)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{IntelligenceMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Intelligence} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{IntelligenceSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Intelligence)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Intelligence" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{IntelligenceMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Intelligence} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{IntelligenceSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Intelligence)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_WillPower" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{WillpowerMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{WILL-POWER}}}{{character_name=@{character_name}}}  {{target=[[ [[@{condgen}*-1]] [COND] + @{WillPower} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{WillPowerSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Will_Power)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_WillPower" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{WillpowerMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{WILL-POWER}}}{{character_name=@{character_name}}}  {{target=[[ [[@{condgen}*-1]] [COND] + @{WillPower} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{WillPowerSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Will_Power)}}"></button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{FellowshipMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen}*-1)]] [COND] + @{Fellowship} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{FellowshipSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Fellowship)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Fellowship" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{FellowshipMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen}*-1)]] [COND] + @{Fellowship} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{FellowshipSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Fellowship)}}"></button>
 						</div>
 					</div>					
 					
@@ -6869,34 +6869,34 @@
 							<br />
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm sheet-pad-b-lg">
-							<button type="action" class="sheet-roll" name="act_WeaponSkill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{WeaponSkillMod}}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}}  {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{WeaponSkill} [CHAR] + ?{@{translation_modifier}|@{WeaponSkillMod}} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{WeaponSkillSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}WeaponSkill)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}" style="font-family: dicefontd20;">t</button>
+							<button type="action" class="sheet-roll" name="act_WeaponSkill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{WeaponSkillMod}}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}}  {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{WEAPON-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{WeaponSkill} [CHAR] + ?{@{translation_modifier}|@{WeaponSkillMod}} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{WeaponSkillSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}WeaponSkill)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}" style="font-family: dicefontd20;">t</button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="action" class="sheet-roll" name="act_BallisticSkill" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{BallisticSkillMod}}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} { {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{BALLISTIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{BallisticSkill} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{BallisticSkillSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}BallisticSkill)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}" style="font-family: dicefontd20;">t</button>
+							<button type="action" class="sheet-roll" name="act_BallisticSkill" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{BallisticSkillMod}}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} { {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{BALLISTIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{BallisticSkill} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{BallisticSkillSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}BallisticSkill)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}" style="font-family: dicefontd20;">t</button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="action" class="sheet-roll" name="act_Strength" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{StrengthMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{STRENGTH}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Strength} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{StrengthSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Strength)}}" style="font-family: dicefontd20;">t</button>
+							<button type="action" class="sheet-roll" name="act_Strength" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{StrengthMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{STRENGTH}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Strength} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{StrengthSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Strength)}}" style="font-family: dicefontd20;">t</button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="action" class="sheet-roll" name="act_Toughness" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{ToughnessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Toughness} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{ToughnessSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Toughness)}}" style="font-family: dicefontd20;">t</button>
+							<button type="action" class="sheet-roll" name="act_Toughness" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{ToughnessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{TOUGHNESS}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Toughness} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{ToughnessSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Toughness)}}" style="font-family: dicefontd20;">t</button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="action" class="sheet-roll" name="act_Initiative" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{InitiativeMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + @{Initiative} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{InitiativeSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Initiative)}}" style="font-family: dicefontd20;">t</button>
+							<button type="action" class="sheet-roll" name="act_Initiative" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{InitiativeMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + @{Initiative} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{InitiativeSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Initiative)}}" style="font-family: dicefontd20;">t</button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="action" class="sheet-roll" name="act_Agility" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{AgilityMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_move}*-1]] [COND] + @{Agility} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{AgilitySL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Agility)}}" style="font-family: dicefontd20;">t</button>
+							<button type="action" class="sheet-roll" name="act_Agility" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{AgilityMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AGILITY}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_move}*-1]] [COND] + @{Agility} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{AgilitySL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Agility)}}" style="font-family: dicefontd20;">t</button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="action" class="sheet-roll" name="act_Dexterity" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{DexterityMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_move}*-1]] [COND] + @{Dexterity} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{DexteritySL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Dexterity)}}" style="font-family: dicefontd20;">t</button>
+							<button type="action" class="sheet-roll" name="act_Dexterity" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{DexterityMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{DEXTERITY}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_move}*-1]] [COND] + @{Dexterity} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{DexteritySL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Dexterity)}}" style="font-family: dicefontd20;">t</button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="action" class="sheet-roll" name="act_Intelligence" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{IntelligenceMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Intelligence} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{IntelligenceSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Intelligence)}}" style="font-family: dicefontd20;">t</button>
+							<button type="action" class="sheet-roll" name="act_Intelligence" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{IntelligenceMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTELLIGENCE}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + @{Intelligence} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{IntelligenceSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Intelligence)}}" style="font-family: dicefontd20;">t</button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="action" class="sheet-roll" name="act_willpower" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{WillpowerMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{WILL-POWER}}}{{character_name=@{character_name}}}  {{target=[[ [[@{condgen}*-1]] [COND] + @{WillPower} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{WillPowerSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}WillPower)}}" style="font-family: dicefontd20;">t</button>
+							<button type="action" class="sheet-roll" name="act_willpower" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{WillpowerMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{WILL-POWER}}}{{character_name=@{character_name}}}  {{target=[[ [[@{condgen}*-1]] [COND] + @{WillPower} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{WillPowerSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}WillPower)}}" style="font-family: dicefontd20;">t</button>
 						</div>
 						<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-							<button type="action" class="sheet-roll" name="act_Fellowship" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{FellowshipMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen}*-1)]] [COND] + @{Fellowship} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{FellowshipSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Fellowship)}}" style="font-family: dicefontd20;">t</button>
+							<button type="action" class="sheet-roll" name="act_Fellowship" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{FellowshipMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{FELLOWSHIP}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen}*-1)]] [COND] + @{Fellowship} [CHAR] + ?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{SLmod=[[?{SL Modifier|@{FellowshipSL}}]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{reroll=@{RT-reroll}Fellowship)}}" style="font-family: dicefontd20;">t</button>
 						</div>
 					</div>
 
@@ -7038,7 +7038,7 @@
 							<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-pad-t-lg sheet-mar-l-md">
 								<span  style="font-size: 14px" data-i18n="MOVEMENTCAP">MOVEMENT</span>
 								<div class="sheet-col-1-13 sheet-center"style="float: right; margin-right: 35px;">
-									<button type="roll" class="sheet-combat-actions-rep" style="width:42px" name="roll_Sprint" value="@{Whisper} &amp;{template:wfrp4e} {{modvalue=[[20]]}} {{sprinting=true}} {{cond=[[@{condgen_see_move}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{title=^{ATHLETICS}}} {{skill=^{SPRINT-ROLL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{Athletics} [SKILL] + 20 [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{movement=[[@{Run}*2)]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}"><span data-i18n="SPRINT">Sprint</span></button>
+									<button type="roll" class="sheet-combat-actions-rep" style="width:42px" name="roll_Sprint" value="@{Whisper} &amp;{template:whfrp2e} {{modvalue=[[20]]}} {{sprinting=true}} {{cond=[[@{condgen_see_move}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{title=^{ATHLETICS}}} {{skill=^{SPRINT-ROLL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{Athletics} [SKILL] + 20 [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{movement=[[@{Run}*2)]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}CharacterAction)}}"><span data-i18n="SPRINT">Sprint</span></button>
 								</div>					
 							</div>	
 							<img src="https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/seperator-center.png?raw=true">	
@@ -7084,10 +7084,10 @@
 							<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-pad-t-lg sheet-mar-l-md">
 								<span  style="font-size: 14px" data-i18n="CORRUPTION-&-SINCAP">CORRUPTION & SIN </span>
 								<div class="sheet-col-1-13 sheet-center"style="float: right; margin-right: 35px;">
-									<button type="roll" class="sheet-combat-actions-rep" style="width:42px" name="roll_Wrath" value="@{Whisper} &{template:wfrp4e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll= [[[[1d100]] [ROLL] + (@{Sin}*10) [SIN] ]]}}"><span data-i18n="WRATH">Wrath</span></button>
+									<button type="roll" class="sheet-combat-actions-rep" style="width:42px" name="roll_Wrath" value="@{Whisper} &{template:whfrp2e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll= [[[[1d100]] [ROLL] + (@{Sin}*10) [SIN] ]]}}"><span data-i18n="WRATH">Wrath</span></button>
 								</div>	
 								<div class="sheet-col-1-13 sheet-center" style="float: right; margin-right: 30px;">
-									<button type="roll" class="sheet-combat-actions-rep" style="width:55px" name="roll_Mutations" value="@{Whisper} &{template:wfrp4e} {{mutation=[[?{Choose a Mutation Type|Physical Mutation, 0|Mental Mutation, 1|Fixation, 2}]]}} {{chaos=[[?{Choose a Chaos God|Any Power, 0|Khorne, 1|Nurgle, 2|Slaanesh, 3|Tzeentch, 4}]]}} {{character_name=@{character_name}}} {{mutationroll=[[1d100]]}} {{mutationroll2=[[1d100]]}} {{mutationroll3=[[2d10]]}}"><span data-i18n="MUTATION">Mutation</span></button>
+									<button type="roll" class="sheet-combat-actions-rep" style="width:55px" name="roll_Mutations" value="@{Whisper} &{template:whfrp2e} {{mutation=[[?{Choose a Mutation Type|Physical Mutation, 0|Mental Mutation, 1|Fixation, 2}]]}} {{chaos=[[?{Choose a Chaos God|Any Power, 0|Khorne, 1|Nurgle, 2|Slaanesh, 3|Tzeentch, 4}]]}} {{character_name=@{character_name}}} {{mutationroll=[[1d100]]}} {{mutationroll2=[[1d100]]}} {{mutationroll3=[[2d10]]}}"><span data-i18n="MUTATION">Mutation</span></button>
 								</div>	
 							</div>	
 							<img src="https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/seperator-center.png?raw=true">	
@@ -7237,7 +7237,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_Art" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ART}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{ArtChar}+@{ArtAdv}+@{ArtMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Art_modtype1}]]}} {{mod1=@{Art_mod1}}} {{mod2type=[[@{Art_modtype2}]]}} {{mod2=@{Art_mod2}}} {{mod3type=[[@{Art_modtype3}]]}} {{mod3=@{Art_mod3}}} {{reroll=@{RT-reroll}Art)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_Art" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ART}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{ArtChar}+@{ArtAdv}+@{ArtMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Art_modtype1}]]}} {{mod1=@{Art_mod1}}} {{mod2type=[[@{Art_modtype2}]]}} {{mod2=@{Art_mod2}}} {{mod3type=[[@{Art_modtype3}]]}} {{mod3=@{Art_mod3}}} {{reroll=@{RT-reroll}Art)}}"></button>
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -7340,7 +7340,7 @@
 									<input class="sheet-center" type="number" name="attr_ArtSpecialization" value="@{ArtSpecializationChar}+@{ArtSpecializationAdv}+@{ArtSpecializationMisc}+(@{condgen_see}*-1)" disabled="true" />
 								</div>	
 								<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-									<button type="roll" class="sheet-roll" name="roll_ArtSpecialization" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{ArtSpecializationName}}} {{skill=^{ART}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{ArtSpecializationChar}+@{ArtSpecializationAdv}+@{ArtSpecializationMisc}]] [SKILL] +?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Art_cust_modtype1}]]}} {{mod1=@{Art_cust_mod1}}} {{mod2type=[[@{Art_cust_modtype2}]]}} {{mod2=@{Art_cust_mod2}}} {{mod3type=[[@{Art_cust_modtype3}]]}} {{mod3=@{Art_cust_mod3}}} {{reroll=@{RT-rep}ArtSpecialization)}}"></button>
+									<button type="roll" class="sheet-roll" name="roll_ArtSpecialization" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{ArtSpecializationName}}} {{skill=^{ART}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{ArtSpecializationChar}+@{ArtSpecializationAdv}+@{ArtSpecializationMisc}]] [SKILL] +?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Art_cust_modtype1}]]}} {{mod1=@{Art_cust_mod1}}} {{mod2type=[[@{Art_cust_modtype2}]]}} {{mod2=@{Art_cust_mod2}}} {{mod3type=[[@{Art_cust_modtype3}]]}} {{mod3=@{Art_cust_mod3}}} {{reroll=@{RT-rep}ArtSpecialization)}}"></button>
 								</div>
 								
 							
@@ -7547,7 +7547,7 @@
 						</div>			
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Athletics" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{AthleticsChar}+@{AthleticsAdv}+@{AthleticsMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}Athletics)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Athletics" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{ATHLETICS}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{AthleticsChar}+@{AthleticsAdv}+@{AthleticsMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Athletics_modtype1}]]}} {{mod1=@{Athletics_mod1}}} {{mod2type=[[@{Athletics_modtype2}]]}} {{mod2=@{Athletics_mod2}}} {{mod3type=[[@{Athletics_modtype3}]]}} {{mod3=@{Athletics_mod3}}} {{reroll=@{RT-reroll}Athletics)}}"></button>
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -7648,7 +7648,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Bribery" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{BRIBERY}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{BriberyChar}+@{BriberyAdv}+@{BriberyMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Bribery_modtype1}]]}} {{mod1=@{Bribery_mod1}}} {{mod2type=[[@{Bribery_modtype2}]]}} {{mod2=@{Bribery_mod2}}} {{mod3type=[[@{Bribery_modtype3}]]}} {{mod3=@{Bribery_mod3}}} {{reroll=@{RT-reroll}Bribery)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Bribery" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{BRIBERY}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{BriberyChar}+@{BriberyAdv}+@{BriberyMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Bribery_modtype1}]]}} {{mod1=@{Bribery_mod1}}} {{mod2type=[[@{Bribery_modtype2}]]}} {{mod2=@{Bribery_mod2}}} {{mod3type=[[@{Bribery_modtype3}]]}} {{mod3=@{Bribery_mod3}}} {{reroll=@{RT-reroll}Bribery)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -7747,7 +7747,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Charm" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{CHARM}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CharmChar}+@{CharmAdv}+@{CharmMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{charstatus=@{status}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Charm_modtype1}]]}} {{mod1=@{Charm_mod1}}} {{mod2type=[[@{Charm_modtype2}]]}} {{mod2=@{Charm_mod2}}} {{mod3type=[[@{Charm_modtype3}]]}} {{mod3=@{Charm_mod3}}} {{reroll=@{RT-reroll}Charm)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Charm" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{CHARM}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CharmChar}+@{CharmAdv}+@{CharmMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{charstatus=@{status}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Charm_modtype1}]]}} {{mod1=@{Charm_mod1}}} {{mod2type=[[@{Charm_modtype2}]]}} {{mod2=@{Charm_mod2}}} {{mod3type=[[@{Charm_modtype3}]]}} {{mod3=@{Charm_mod3}}} {{reroll=@{RT-reroll}Charm)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -7846,7 +7846,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_CharmAnimal" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{CHARM-ANIMAL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CharmAnimalChar}+@{CharmAnimalAdv}+@{CharmAnimalMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{CharmAnimal_modtype1}]]}} {{mod1=@{CharmAnimal_mod1}}} {{mod2type=[[@{CharmAnimal_modtype2}]]}} {{mod2=@{CharmAnimal_mod2}}} {{mod3type=[[@{CharmAnimal_modtype3}]]}} {{mod3=@{CharmAnimal_mod3}}} {{reroll=@{RT-reroll}CharmAnimal)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_CharmAnimal" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{CHARM-ANIMAL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CharmAnimalChar}+@{CharmAnimalAdv}+@{CharmAnimalMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{CharmAnimal_modtype1}]]}} {{mod1=@{CharmAnimal_mod1}}} {{mod2type=[[@{CharmAnimal_modtype2}]]}} {{mod2=@{CharmAnimal_mod2}}} {{mod3type=[[@{CharmAnimal_modtype3}]]}} {{mod3=@{CharmAnimal_mod3}}} {{reroll=@{RT-reroll}CharmAnimal)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -7943,7 +7943,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Climb" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{CLIMB}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ClimbChar}+@{ClimbAdv}+@{ClimbMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Climb_modtype1}]]}} {{mod1=@{Climb_mod1}}} {{mod2type=[[@{Climb_modtype2}]]}} {{mod2=@{Climb_mod2}}} {{mod3type=[[@{Climb_modtype3}]]}} {{mod3=@{Climb_mod3}}} {{reroll=@{RT-reroll}Climb)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Climb" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{CLIMB}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ClimbChar}+@{ClimbAdv}+@{ClimbMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Climb_modtype1}]]}} {{mod1=@{Climb_mod1}}} {{mod2type=[[@{Climb_modtype2}]]}} {{mod2=@{Climb_mod2}}} {{mod3type=[[@{Climb_modtype3}]]}} {{mod3=@{Climb_mod3}}} {{reroll=@{RT-reroll}Climb)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -8040,7 +8040,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_ConsumeAlcohol" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{CONSUME-ALCOHOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{ConsumeAlcoholChar}+@{ConsumeAlcoholAdv}+@{ConsumeAlcoholMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{ConsumeAlcohol_modtype1}]]}} {{mod1=@{ConsumeAlcohol_mod1}}} {{mod2type=[[@{ConsumeAlcohol_modtype2}]]}} {{mod2=@{ConsumeAlcohol_mod2}}} {{mod3type=[[@{ConsumeAlcohol_modtype3}]]}} {{mod3=@{ConsumeAlcohol_mod3}}} {{reroll=@{RT-reroll}ConsumeAlcohol)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_ConsumeAlcohol" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{CONSUME-ALCOHOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{ConsumeAlcoholChar}+@{ConsumeAlcoholAdv}+@{ConsumeAlcoholMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{ConsumeAlcohol_modtype1}]]}} {{mod1=@{ConsumeAlcohol_mod1}}} {{mod2type=[[@{ConsumeAlcohol_modtype2}]]}} {{mod2=@{ConsumeAlcohol_mod2}}} {{mod3type=[[@{ConsumeAlcohol_modtype3}]]}} {{mod3=@{ConsumeAlcohol_mod3}}} {{reroll=@{RT-reroll}ConsumeAlcohol)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -8137,7 +8137,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Cool" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{COOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CoolChar}+@{CoolAdv}+@{CoolMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Cool_modtype1}]]}} {{mod1=@{Cool_mod1}}} {{mod2type=[[@{Cool_modtype2}]]}} {{mod2=@{Cool_mod2}}} {{mod3type=[[@{Cool_modtype3}]]}} {{mod3=@{Cool_mod3}}} {{reroll=@{RT-reroll}Cool)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Cool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{COOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{CoolChar}+@{CoolAdv}+@{CoolMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Cool_modtype1}]]}} {{mod1=@{Cool_mod1}}} {{mod2type=[[@{Cool_modtype2}]]}} {{mod2=@{Cool_mod2}}} {{mod3type=[[@{Cool_modtype3}]]}} {{mod3=@{Cool_mod3}}} {{reroll=@{RT-reroll}Cool)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -8234,7 +8234,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Dodge" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{DODGE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{DodgeChar}+@{DodgeAdv}+@{DodgeMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{qualities=@{armorQuality}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Dodge_modtype1}]]}} {{mod1=@{Dodge_mod1}}} {{mod2type=[[@{Dodge_modtype2}]]}} {{mod2=@{Dodge_mod2}}} {{mod3type=[[@{Dodge_modtype3}]]}} {{mod3=@{Dodge_mod3}}} {{reroll=@{RT-reroll}Dodge)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Dodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{DODGE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{DodgeChar}+@{DodgeAdv}+@{DodgeMisc}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{qualities=@{armorQuality}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Dodge_modtype1}]]}} {{mod1=@{Dodge_mod1}}} {{mod2type=[[@{Dodge_modtype2}]]}} {{mod2=@{Dodge_mod2}}} {{mod3type=[[@{Dodge_modtype3}]]}} {{mod3=@{Dodge_mod3}}} {{reroll=@{RT-reroll}Dodge)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -8331,7 +8331,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Drive" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{DRIVE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{DriveChar}+@{DriveAdv}+@{DriveMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Drive_modtype1}]]}} {{mod1=@{Drive_mod1}}} {{mod2type=[[@{Drive_modtype2}]]}} {{mod2=@{Drive_mod2}}} {{mod3type=[[@{Drive_modtype3}]]}} {{mod3=@{Drive_mod3}}} {{reroll=@{RT-reroll}Drive)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Drive" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{DRIVE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{DriveChar}+@{DriveAdv}+@{DriveMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Drive_modtype1}]]}} {{mod1=@{Drive_mod1}}} {{mod2type=[[@{Drive_modtype2}]]}} {{mod2=@{Drive_mod2}}} {{mod3type=[[@{Drive_modtype3}]]}} {{mod3=@{Drive_mod3}}} {{reroll=@{RT-reroll}Drive)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -8428,7 +8428,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Endurance" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[0]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}  {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}} {{reroll=@{RT-reroll}Endurance)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Endurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[0]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}}  {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}} {{reroll=@{RT-reroll}Endurance)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -8524,7 +8524,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_Entertain" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENTERTAIN}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EntertainChar}+@{EntertainAdv}+@{EntertainMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Entertain_modtype1}]]}} {{mod1=@{Entertain_mod1}}} {{mod2type=[[@{Entertain_modtype2}]]}} {{mod2=@{Entertain_mod2}}} {{mod3type=[[@{Entertain_modtype3}]]}} {{mod3=@{Entertain_mod3}}} {{reroll=@{RT-reroll}Entertain)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_Entertain" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ENTERTAIN}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EntertainChar}+@{EntertainAdv}+@{EntertainMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Entertain_modtype1}]]}} {{mod1=@{Entertain_mod1}}} {{mod2type=[[@{Entertain_modtype2}]]}} {{mod2=@{Entertain_mod2}}} {{mod3type=[[@{Entertain_modtype3}]]}} {{mod3=@{Entertain_mod3}}} {{reroll=@{RT-reroll}Entertain)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -8627,7 +8627,7 @@
 										<input class="sheet-center" type="number" name="attr_EntertainSpecialization" value="@{EntertainSpecializationChar}+@{EntertainSpecializationAdv}+@{EntertainSpecializationMisc}+(@{condgen}*-1)" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_EntertainSpecialization" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{EntertainSpecializationName}}} {{skill=^{ENTERTAIN}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EntertainSpecializationChar}+@{EntertainSpecializationAdv}+@{EntertainSpecializationMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Entertain_Custom_modtype1}]]}} {{mod1=@{Entertain_Custom_mod1}}} {{mod2type=[[@{Entertain_Custom_modtype2}]]}} {{mod2=@{Entertain_Custom_mod2}}} {{mod3type=[[@{Entertain_Custom_modtype3}]]}} {{mod3=@{Entertain_Custom_mod3}}} {{reroll=@{RT-rep}EntertainSpecialization)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_EntertainSpecialization" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{EntertainSpecializationName}}} {{skill=^{ENTERTAIN}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{EntertainSpecializationChar}+@{EntertainSpecializationAdv}+@{EntertainSpecializationMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Entertain_Custom_modtype1}]]}} {{mod1=@{Entertain_Custom_mod1}}} {{mod2type=[[@{Entertain_Custom_modtype2}]]}} {{mod2=@{Entertain_Custom_mod2}}} {{mod3type=[[@{Entertain_Custom_modtype3}]]}} {{mod3=@{Entertain_Custom_mod3}}} {{reroll=@{RT-rep}EntertainSpecialization)}}"></button>
 									</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
@@ -8826,7 +8826,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Gamble" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{GAMBLE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{GambleChar}+@{GambleAdv}+@{GambleMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Gamble_modtype1}]]}} {{mod1=@{Gamble_mod1}}} {{mod2type=[[@{Gamble_modtype2}]]}} {{mod2=@{Gamble_mod2}}} {{mod3type=[[@{Gamble_modtype3}]]}} {{mod3=@{Gamble_mod3}}} {{reroll=@{RT-reroll}Gamble)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Gamble" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{GAMBLE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{GambleChar}+@{GambleAdv}+@{GambleMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Gamble_modtype1}]]}} {{mod1=@{Gamble_mod1}}} {{mod2type=[[@{Gamble_modtype2}]]}} {{mod2=@{Gamble_mod2}}} {{mod3type=[[@{Gamble_modtype3}]]}} {{mod3=@{Gamble_mod3}}} {{reroll=@{RT-reroll}Gamble)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -8923,7 +8923,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Gossip" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{GOSSIP}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{GossipChar}+@{GossipAdv}+@{GossipMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{charstatus=@{status}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Gossip_modtype1}]]}} {{mod1=@{Gossip_mod1}}} {{mod2type=[[@{Gossip_modtype2}]]}} {{mod2=@{Gossip_mod2}}} {{mod3type=[[@{Gossip_modtype3}]]}} {{mod3=@{Gossip_mod3}}} {{reroll=@{RT-reroll}Gossip)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Gossip" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{GOSSIP}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{GossipChar}+@{GossipAdv}+@{GossipMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{charstatus=@{status}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Gossip_modtype1}]]}} {{mod1=@{Gossip_mod1}}} {{mod2type=[[@{Gossip_modtype2}]]}} {{mod2=@{Gossip_mod2}}} {{mod3type=[[@{Gossip_modtype3}]]}} {{mod3=@{Gossip_mod3}}} {{reroll=@{RT-reroll}Gossip)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -9020,7 +9020,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Haggle" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{HAGGLE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{HaggleChar}+@{HaggleAdv}+@{HaggleMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Haggle_modtype1}]]}} {{mod1=@{Haggle_mod1}}} {{mod2type=[[@{Haggle_modtype2}]]}} {{mod2=@{Haggle_mod2}}} {{mod3type=[[@{Haggle_modtype3}]]}} {{mod3=@{Haggle_mod3}}} {{reroll=@{RT-reroll}Haggle)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Haggle" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{HAGGLE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{HaggleChar}+@{HaggleAdv}+@{HaggleMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Haggle_modtype1}]]}} {{mod1=@{Haggle_mod1}}} {{mod2type=[[@{Haggle_modtype2}]]}} {{mod2=@{Haggle_mod2}}} {{mod3type=[[@{Haggle_modtype3}]]}} {{mod3=@{Haggle_mod3}}} {{reroll=@{RT-reroll}Haggle)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -9117,7 +9117,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Intimidate" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTIMIDATE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{IntimidateChar}+@{IntimidateAdv}+@{IntimidateMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{charstatus=@{status}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intimidate_modtype1}]]}} {{mod1=@{Intimidate_mod1}}} {{mod2type=[[@{Intimidate_modtype2}]]}} {{mod2=@{Intimidate_mod2}}} {{mod3type=[[@{Intimidate_modtype3}]]}} {{mod3=@{Intimidate_mod3}}} {{reroll=@{RT-reroll}Intimidate)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Intimidate" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTIMIDATE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{IntimidateChar}+@{IntimidateAdv}+@{IntimidateMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{charstatus=@{status}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intimidate_modtype1}]]}} {{mod1=@{Intimidate_mod1}}} {{mod2type=[[@{Intimidate_modtype2}]]}} {{mod2=@{Intimidate_mod2}}} {{mod3type=[[@{Intimidate_modtype3}]]}} {{mod3=@{Intimidate_mod3}}} {{reroll=@{RT-reroll}Intimidate)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -9214,7 +9214,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Intuition" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}} {{reroll=@{RT-reroll}Intuition)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Intuition" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}} {{reroll=@{RT-reroll}Intuition)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -9311,7 +9311,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Leadership" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{LEADERSHIP}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{LeadershipChar}+@{LeadershipAdv}+@{LeadershipMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{charstatus=@{status}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Leadership_modtype1}]]}} {{mod1=@{Leadership_mod1}}} {{mod2type=[[@{Leadership_modtype2}]]}} {{mod2=@{Leadership_mod2}}} {{mod3type=[[@{Leadership_modtype3}]]}} {{mod3=@{Leadership_mod3}}} {{reroll=@{RT-reroll}Leadership)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Leadership" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{LEADERSHIP}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{LeadershipChar}+@{LeadershipAdv}+@{LeadershipMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{charstatus=@{status}}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Leadership_modtype1}]]}} {{mod1=@{Leadership_mod1}}} {{mod2type=[[@{Leadership_modtype2}]]}} {{mod2=@{Leadership_mod2}}} {{mod3type=[[@{Leadership_modtype3}]]}} {{mod3=@{Leadership_mod3}}} {{reroll=@{RT-reroll}Leadership)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -9500,7 +9500,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_MeleeBasic" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-BASIC}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeBasic}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeBasic_modtype1}]]}} {{mod1=@{MeleeBasic_mod1}}} {{mod2type=[[@{MeleeBasic_modtype2}]]}} {{mod2=@{MeleeBasic_mod2}}} {{mod3type=[[@{MeleeBasic_modtype3}]]}} {{mod3=@{MeleeBasic_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeBasic)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_MeleeBasic" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-BASIC}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeBasic}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeBasic_modtype1}]]}} {{mod1=@{MeleeBasic_mod1}}} {{mod2type=[[@{MeleeBasic_modtype2}]]}} {{mod2=@{MeleeBasic_mod2}}} {{mod3type=[[@{MeleeBasic_modtype3}]]}} {{mod3=@{MeleeBasic_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeBasic)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -9601,7 +9601,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_MeleeBrawling" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-BRAWLING}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeBrawling}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeBrawling_modtype1}]]}} {{mod1=@{MeleeBrawling_mod1}}} {{mod2type=[[@{MeleeBrawling_modtype2}]]}} {{mod2=@{MeleeBrawling_mod2}}} {{mod3type=[[@{MeleeBrawling_modtype3}]]}} {{mod3=@{MeleeBrawling_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeBrawling)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_MeleeBrawling" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-BRAWLING}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeBrawling}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeBrawling_modtype1}]]}} {{mod1=@{MeleeBrawling_mod1}}} {{mod2type=[[@{MeleeBrawling_modtype2}]]}} {{mod2=@{MeleeBrawling_mod2}}} {{mod3type=[[@{MeleeBrawling_modtype3}]]}} {{mod3=@{MeleeBrawling_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeBrawling)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -9702,7 +9702,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_MeleeCavalry" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-CAVALRY}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeCavalry}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeCavalry_modtype1}]]}} {{mod1=@{MeleeCavalry_mod1}}} {{mod2type=[[@{MeleeCavalry_modtype2}]]}} {{mod2=@{MeleeCavalry_mod2}}} {{mod3type=[[@{MeleeCavalry_modtype3}]]}} {{mod3=@{MeleeCavalry_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeCavalry)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_MeleeCavalry" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-CAVALRY}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeCavalry}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeCavalry_modtype1}]]}} {{mod1=@{MeleeCavalry_mod1}}} {{mod2type=[[@{MeleeCavalry_modtype2}]]}} {{mod2=@{MeleeCavalry_mod2}}} {{mod3type=[[@{MeleeCavalry_modtype3}]]}} {{mod3=@{MeleeCavalry_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeCavalry)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -9802,7 +9802,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_MeleeFencing" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-FENCING}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeFencing}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeFencing_modtype1}]]}} {{mod1=@{MeleeFencing_mod1}}} {{mod2type=[[@{MeleeFencing_modtype2}]]}} {{mod2=@{MeleeFencing_mod2}}} {{mod3type=[[@{MeleeFencing_modtype3}]]}} {{mod3=@{MeleeFencing_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeFencing)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_MeleeFencing" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-FENCING}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeFencing}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeFencing_modtype1}]]}} {{mod1=@{MeleeFencing_mod1}}} {{mod2type=[[@{MeleeFencing_modtype2}]]}} {{mod2=@{MeleeFencing_mod2}}} {{mod3type=[[@{MeleeFencing_modtype3}]]}} {{mod3=@{MeleeFencing_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeFencing)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -9902,7 +9902,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_MeleeFlail" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-FLAIL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeFlail}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeFlail_modtype1}]]}} {{mod1=@{MeleeFlail_mod1}}} {{mod2type=[[@{MeleeFlail_modtype2}]]}} {{mod2=@{MeleeFlail_mod2}}} {{mod3type=[[@{MeleeFlail_modtype3}]]}} {{mod3=@{MeleeFlail_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeFlail)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_MeleeFlail" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-FLAIL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeFlail}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeFlail_modtype1}]]}} {{mod1=@{MeleeFlail_mod1}}} {{mod2type=[[@{MeleeFlail_modtype2}]]}} {{mod2=@{MeleeFlail_mod2}}} {{mod3type=[[@{MeleeFlail_modtype3}]]}} {{mod3=@{MeleeFlail_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeFlail)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -10002,7 +10002,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_MeleeParry" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-PARRY}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeParry}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeParry_modtype1}]]}} {{mod1=@{MeleeParry_mod1}}} {{mod2type=[[@{MeleeParry_modtype2}]]}} {{mod2=@{MeleeParry_mod2}}} {{mod3type=[[@{MeleeParry_modtype3}]]}} {{mod3=@{MeleeParry_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeParry)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_MeleeParry" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-PARRY}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleeParry}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeParry_modtype1}]]}} {{mod1=@{MeleeParry_mod1}}} {{mod2type=[[@{MeleeParry_modtype2}]]}} {{mod2=@{MeleeParry_mod2}}} {{mod3type=[[@{MeleeParry_modtype3}]]}} {{mod3=@{MeleeParry_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeParry)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -10102,7 +10102,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_MeleePolearm" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-POLEARM}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleePolearm}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleePolearm_modtype1}]]}} {{mod1=@{MeleePolearm_mod1}}} {{mod2type=[[@{MeleePolearm_modtype2}]]}} {{mod2=@{MeleePolearm_mod2}}} {{mod3type=[[@{MeleePolearm_modtype3}]]}} {{mod3=@{MeleePolearm_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleePolearm)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_MeleePolearm" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-POLEARM}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{MeleePolearm}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleePolearm_modtype1}]]}} {{mod1=@{MeleePolearm_mod1}}} {{mod2type=[[@{MeleePolearm_modtype2}]]}} {{mod2=@{MeleePolearm_mod2}}} {{mod3type=[[@{MeleePolearm_modtype3}]]}} {{mod3=@{MeleePolearm_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleePolearm)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -10202,7 +10202,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_MeleeTwoHanded" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-TWOHANDED}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{MeleeTwoHanded} {SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeTwoHanded_modtype1}]]}} {{mod1=@{MeleeTwoHanded_mod1}}} {{mod2type=[[@{MeleeTwoHanded_modtype2}]]}} {{mod2=@{MeleeTwoHanded_mod2}}} {{mod3type=[[@{MeleeTwoHanded_modtype3}]]}} {{mod3=@{MeleeTwoHanded_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeTwoHanded)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_MeleeTwoHanded" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{MELEE-TWOHANDED}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + @{MeleeTwoHanded} {SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[0]]}} {{mod1type=[[@{MeleeTwoHanded_modtype1}]]}} {{mod1=@{MeleeTwoHanded_mod1}}} {{mod2type=[[@{MeleeTwoHanded_modtype2}]]}} {{mod2=@{MeleeTwoHanded_mod2}}} {{mod3type=[[@{MeleeTwoHanded_modtype3}]]}} {{mod3=@{MeleeTwoHanded_mod3}}} {{NPC=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeTwoHanded)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -10301,7 +10301,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Navigation" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{NAVIGATION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{NavigationChar}+@{NavigationAdv}+@{NavigationMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Navigation_modtype1}]]}} {{mod1=@{Navigation_mod1}}} {{mod2type=[[@{Navigation_modtype2}]]}} {{mod2=@{Navigation_mod2}}} {{mod3type=[[@{Navigation_modtype3}]]}} {{mod3=@{Navigation_mod3}}} {{reroll=@{RT-reroll}Navigation)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Navigation" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{NAVIGATION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{NavigationChar}+@{NavigationAdv}+@{NavigationMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Navigation_modtype1}]]}} {{mod1=@{Navigation_mod1}}} {{mod2type=[[@{Navigation_modtype2}]]}} {{mod2=@{Navigation_mod2}}} {{mod3type=[[@{Navigation_modtype3}]]}} {{mod3=@{Navigation_mod3}}} {{reroll=@{RT-reroll}Navigation)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -10398,7 +10398,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_OutdoorSurvival" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{OUTDOOR-SURVIVAL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{OutdoorSurvival}]] [SKILL] +?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{OutdoorSurvival_modtype1}]]}} {{mod1=@{OutdoorSurvival_mod1}}} {{mod2type=[[@{OutdoorSurvival_modtype2}]]}} {{mod2=@{OutdoorSurvival_mod2}}} {{mod3type=[[@{OutdoorSurvival_modtype3}]]}} {{mod3=@{OutdoorSurvival_mod3}}} {{reroll=@{RT-reroll}OutdoorSurvival)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_OutdoorSurvival" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{OUTDOOR-SURVIVAL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{OutdoorSurvival}]] [SKILL] +?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{OutdoorSurvival_modtype1}]]}} {{mod1=@{OutdoorSurvival_mod1}}} {{mod2type=[[@{OutdoorSurvival_modtype2}]]}} {{mod2=@{OutdoorSurvival_mod2}}} {{mod3type=[[@{OutdoorSurvival_modtype3}]]}} {{mod3=@{OutdoorSurvival_mod3}}} {{reroll=@{RT-reroll}OutdoorSurvival)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -10495,7 +10495,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Perception" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]] [PEN] + [[@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{armorpen=[[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}} {{reroll=@{RT-reroll}Perception)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Perception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_hear}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see_hear}*-1)]] [COND] + [[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]] [PEN] + [[@{PerceptionChar}+@{PerceptionAdv}+@{PerceptionMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{armorpen=[[(@{armorcoifpenalty}+@{armorhelmpenalty})*-1]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}} {{reroll=@{RT-reroll}Perception)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -10591,7 +10591,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_Ride" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RIDE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RideChar}+@{RideAdv}+@{RideMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Ride_modtype1}]]}} {{mod1=@{Ride_mod1}}} {{mod2type=[[@{Ride_modtype2}]]}} {{mod2=@{Ride_mod2}}} {{mod3type=[[@{Ride_modtype3}]]}} {{mod3=@{Ride_mod3}}} {{reroll=@{RT-reroll}Ride)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_Ride" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RIDE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RideChar}+@{RideAdv}+@{RideMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Ride_modtype1}]]}} {{mod1=@{Ride_mod1}}} {{mod2type=[[@{Ride_modtype2}]]}} {{mod2=@{Ride_mod2}}} {{mod3type=[[@{Ride_modtype3}]]}} {{mod3=@{Ride_mod3}}} {{reroll=@{RT-reroll}Ride)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -10696,7 +10696,7 @@
 										<input class="sheet-center" type="number" name="attr_RideSpecialization" value="@{RideSpecializationChar}+@{RideSpecializationAdv}+@{RideSpecializationMisc}+(@{condgen_see_move}*-1)" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_RideSpecialization" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{RideSpecializationName}}} {{skill=^{RIDE}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RideSpecializationChar}+@{RideSpecializationAdv}+@{RideSpecializationMisc}]] [SKILL] + ?{@{translation_modifier}|0} {MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Ride_Custom_modtype1}]]}} {{mod1=@{Ride_Custom_mod1}}} {{mod2type=[[@{Ride_Custom_modtype2}]]}} {{mod2=@{Ride_Custom_mod2}}} {{mod3type=[[@{Ride_Custom_modtype3}]]}} {{mod3=@{Ride_Custom_mod3}}} {{reroll=@{RT-rep}RideSpecialization)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_RideSpecialization" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{RideSpecializationName}}} {{skill=^{RIDE}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RideSpecializationChar}+@{RideSpecializationAdv}+@{RideSpecializationMisc}]] [SKILL] + ?{@{translation_modifier}|0} {MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Ride_Custom_modtype1}]]}} {{mod1=@{Ride_Custom_mod1}}} {{mod2type=[[@{Ride_Custom_modtype2}]]}} {{mod2=@{Ride_Custom_mod2}}} {{mod3type=[[@{Ride_Custom_modtype3}]]}} {{mod3=@{Ride_Custom_mod3}}} {{reroll=@{RT-rep}RideSpecialization)}}"></button>
 						</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
@@ -10898,7 +10898,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Row" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condall}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{ROW}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RowChar}+@{RowAdv}+@{RowMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Row_modtype1}]]}} {{mod1=@{Row_mod1}}} {{mod2type=[[@{Row_modtype2}]]}} {{mod2=@{Row_mod2}}} {{mod3type=[[@{Row_modtype3}]]}} {{mod3=@{Row_mod3}}} {{reroll=@{RT-reroll}Row)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Row" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condall}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{ROW}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RowChar}+@{RowAdv}+@{RowMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Row_modtype1}]]}} {{mod1=@{Row_mod1}}} {{mod2type=[[@{Row_modtype2}]]}} {{mod2=@{Row_mod2}}} {{mod3type=[[@{Row_modtype3}]]}} {{mod3=@{Row_mod3}}} {{reroll=@{RT-reroll}Row)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -10994,7 +10994,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_Stealth" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{STEALTH}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]] [PEN] + [[@{StealthChar}+@{StealthAdv}+@{StealthMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{armorpen=[[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Stealth_modtype1}]]}} {{mod1=@{Stealth_mod1}}} {{mod2type=[[@{Stealth_modtype2}]]}} {{mod2=@{Stealth_mod2}}} {{mod3type=[[@{Stealth_modtype3}]]}} {{mod3=@{Stealth_mod3}}} {{reroll=@{RT-reroll}Stealth)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_Stealth" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{STEALTH}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]] [PEN] + [[@{StealthChar}+@{StealthAdv}+@{StealthMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{armorpen=[[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Stealth_modtype1}]]}} {{mod1=@{Stealth_mod1}}} {{mod2type=[[@{Stealth_modtype2}]]}} {{mod2=@{Stealth_mod2}}} {{mod3type=[[@{Stealth_modtype3}]]}} {{mod3=@{Stealth_mod3}}} {{reroll=@{RT-reroll}Stealth)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -11098,7 +11098,7 @@
 										<input class="sheet-center" type="number" name="attr_StealthSpecialization" value="@{StealthSpecializationChar}+@{StealthSpecializationAdv}+@{StealthSpecializationMisc}-@{armormailpenalty}-@{armorplatepenalty}-@{armorplatelegspenalty}+(@{condgen_see_move}*-1)" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_StealthSpecialization" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{StealthSpecializationName}}} {{skill=^{STEALTH}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]] [PEN] + [[@{StealthSpecializationChar}+@{StealthSpecializationAdv}+@{StealthSpecializationMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{armorpen=[[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]]}} {{mod1type=[[@{Stealth_Custom_modtype1}]]}} {{mod1=@{Stealth_Custom_mod1}}} {{mod2type=[[@{Stealth_Custom_modtype2}]]}} {{mod2=@{Stealth_Custom_mod2}}} {{mod3type=[[@{Stealth_Custom_modtype3}]]}} {{mod3=@{Stealth_Custom_mod3}}} {{reroll=@{RT-rep}StealthSpecialization)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_StealthSpecialization" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{StealthSpecializationName}}} {{skill=^{STEALTH}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]] [PEN] + [[@{StealthSpecializationChar}+@{StealthSpecializationAdv}+@{StealthSpecializationMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{armorpen=[[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]]}} {{mod1type=[[@{Stealth_Custom_modtype1}]]}} {{mod1=@{Stealth_Custom_mod1}}} {{mod2type=[[@{Stealth_Custom_modtype2}]]}} {{mod2=@{Stealth_Custom_mod2}}} {{mod3type=[[@{Stealth_Custom_modtype3}]]}} {{mod3=@{Stealth_Custom_mod3}}} {{reroll=@{RT-rep}StealthSpecialization)}}"></button>
 						</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
@@ -11319,7 +11319,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_AnimalCare" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ANIMAL-CARE}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[(@{AnimalCareChar}+@{AnimalCareAdv}+@{AnimalCareMisc})*@{AnimalCareTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{AnimalCare_modtype1}]]}} {{mod1=@{AnimalCare_mod1}}} {{mod2type=[[@{AnimalCare_modtype2}]]}} {{mod2=@{AnimalCare_mod2}}} {{mod3type=[[@{AnimalCare_modtype3}]]}} {{mod3=@{AnimalCare_mod3}}} {{reroll=@{RT-reroll}AnimalCare)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_AnimalCare" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{ANIMAL-CARE}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[(@{AnimalCareChar}+@{AnimalCareAdv}+@{AnimalCareMisc})*@{AnimalCareTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{AnimalCare_modtype1}]]}} {{mod1=@{AnimalCare_mod1}}} {{mod2type=[[@{AnimalCare_modtype2}]]}} {{mod2=@{AnimalCare_mod2}}} {{mod3type=[[@{AnimalCare_modtype3}]]}} {{mod3=@{AnimalCare_mod3}}} {{reroll=@{RT-reroll}AnimalCare)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -11435,7 +11435,7 @@
 										<input class="sheet-center" type="number" name="attr_AnimalTraining" value="(@{AnimalTrainingChar}+@{AnimalTrainingAdv}+@{AnimalTrainingMisc}+(@{condgen}*-1))*@{AnimalTrainingTaken}" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle sheet-dev">
-										<button type="roll" class="sheet-roll" name="roll_AnimalTraining" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{AnimalTrainingSpecialization}}} {{skill=^{ANIMAL-TRAINING}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[(@{AnimalTrainingChar}+@{AnimalTrainingAdv}+@{AnimalTrainingMisc})*@{AnimalTrainingTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{AnimalTraining_modtype1}]]}} {{mod1=@{AnimalTraining_mod1}}} {{mod2type=[[@{AnimalTraining_modtype2}]]}} {{mod2=@{AnimalTraining_mod2}}} {{mod3type=[[@{AnimalTraining_modtype3}]]}} {{mod3=@{AnimalTraining_mod3}}} {{reroll=@{RT-rep}AnimalTraining)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_AnimalTraining" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{AnimalTrainingSpecialization}}} {{skill=^{ANIMAL-TRAINING}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[(@{AnimalTrainingChar}+@{AnimalTrainingAdv}+@{AnimalTrainingMisc})*@{AnimalTrainingTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{AnimalTraining_modtype1}]]}} {{mod1=@{AnimalTraining_mod1}}} {{mod2type=[[@{AnimalTraining_modtype2}]]}} {{mod2=@{AnimalTraining_mod2}}} {{mod3type=[[@{AnimalTraining_modtype3}]]}} {{mod3=@{AnimalTraining_mod3}}} {{reroll=@{RT-rep}AnimalTraining)}}"></button>
 									</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_AnimalTrainingTaken" value="1" />
@@ -11771,7 +11771,7 @@
 							</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingFire" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-FIRE}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingFire}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingFire_modtype1}]]}} {{mod1=@{ChannellingFire_mod1}}} {{mod2type=[[@{ChannellingFire_modtype2}]]}} {{mod2=@{ChannellingFire_mod2}}} {{mod3type=[[@{ChannellingFire_modtype3}]]}} {{mod3=@{ChannellingFire_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingFire)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingFire" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-FIRE}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingFire}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingFire_modtype1}]]}} {{mod1=@{ChannellingFire_mod1}}} {{mod2type=[[@{ChannellingFire_modtype2}]]}} {{mod2=@{ChannellingFire_mod2}}} {{mod3type=[[@{ChannellingFire_modtype3}]]}} {{mod3=@{ChannellingFire_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingFire)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -11876,7 +11876,7 @@
 							</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingHeavens" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-HEAVENS}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{ChannellingHeavensChar}+@{ChannellingHeavensAdv}+@{ChannellingHeavensMisc})*@{ChannellingHeavensTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingHeavens_modtype1}]]}} {{mod1=@{ChannellingHeavens_mod1}}} {{mod2type=[[@{ChannellingHeavens_modtype2}]]}} {{mod2=@{ChannellingHeavens_mod2}}} {{mod3type=[[@{ChannellingHeavens_modtype3}]]}} {{mod3=@{ChannellingHeavens_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingHeavens)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingHeavens" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-HEAVENS}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{ChannellingHeavensChar}+@{ChannellingHeavensAdv}+@{ChannellingHeavensMisc})*@{ChannellingHeavensTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingHeavens_modtype1}]]}} {{mod1=@{ChannellingHeavens_mod1}}} {{mod2type=[[@{ChannellingHeavens_modtype2}]]}} {{mod2=@{ChannellingHeavens_mod2}}} {{mod3type=[[@{ChannellingHeavens_modtype3}]]}} {{mod3=@{ChannellingHeavens_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingHeavens)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -11981,7 +11981,7 @@
 							</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingMetal" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-METAL}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{ChannellingMetalChar}+@{ChannellingMetalAdv}+@{ChannellingMetalMisc})*@{ChannellingMetalTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingMetal_modtype1}]]}} {{mod1=@{ChannellingMetal_mod1}}} {{mod2type=[[@{ChannellingMetal_modtype2}]]}} {{mod2=@{ChannellingMetal_mod2}}} {{mod3type=[[@{ChannellingMetal_modtype3}]]}} {{mod3=@{ChannellingMetal_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingMetal)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingMetal" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-METAL}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{ChannellingMetalChar}+@{ChannellingMetalAdv}+@{ChannellingMetalMisc})*@{ChannellingMetalTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingMetal_modtype1}]]}} {{mod1=@{ChannellingMetal_mod1}}} {{mod2type=[[@{ChannellingMetal_modtype2}]]}} {{mod2=@{ChannellingMetal_mod2}}} {{mod3type=[[@{ChannellingMetal_modtype3}]]}} {{mod3=@{ChannellingMetal_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingMetal)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -12086,7 +12086,7 @@
 							</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingBeasts" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-BEASTS}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingBeastsChar}+@{ChannellingBeastsAdv}+@{ChannellingBeastsMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingBeasts_modtype1}]]}} {{mod1=@{ChannellingBeasts_mod1}}} {{mod2type=[[@{ChannellingBeasts_modtype2}]]}} {{mod2=@{ChannellingBeasts_mod2}}} {{mod3type=[[@{ChannellingBeasts_modtype3}]]}} {{mod3=@{ChannellingBeasts_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingBeasts)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingBeasts" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-BEASTS}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingBeastsChar}+@{ChannellingBeastsAdv}+@{ChannellingBeastsMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingBeasts_modtype1}]]}} {{mod1=@{ChannellingBeasts_mod1}}} {{mod2type=[[@{ChannellingBeasts_modtype2}]]}} {{mod2=@{ChannellingBeasts_mod2}}} {{mod3type=[[@{ChannellingBeasts_modtype3}]]}} {{mod3=@{ChannellingBeasts_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingBeasts)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -12191,7 +12191,7 @@
 							</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingLife" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-LIFE}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingLifeChar}+@{ChannellingLifeAdv}+@{ChannellingLifeMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingLife_modtype1}]]}} {{mod1=@{ChannellingLife_mod1}}} {{mod2type=[[@{ChannellingLife_modtype2}]]}} {{mod2=@{ChannellingLife_mod2}}} {{mod3type=[[@{ChannellingLife_modtype3}]]}} {{mod3=@{ChannellingLife_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingLife)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingLife" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-LIFE}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingLifeChar}+@{ChannellingLifeAdv}+@{ChannellingLifeMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingLife_modtype1}]]}} {{mod1=@{ChannellingLife_mod1}}} {{mod2type=[[@{ChannellingLife_modtype2}]]}} {{mod2=@{ChannellingLife_mod2}}} {{mod3type=[[@{ChannellingLife_modtype3}]]}} {{mod3=@{ChannellingLife_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingLife)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -12296,7 +12296,7 @@
 							</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingLight" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-LIGHT}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingLightChar}+@{ChannellingLightAdv}+@{ChannellingLightMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingLight_modtype1}]]}} {{mod1=@{ChannellingLight_mod1}}} {{mod2type=[[@{ChannellingLight_modtype2}]]}} {{mod2=@{ChannellingLight_mod2}}} {{mod3type=[[@{ChannellingLight_modtype3}]]}} {{mod3=@{ChannellingLight_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingLight)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingLight" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-LIGHT}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingLightChar}+@{ChannellingLightAdv}+@{ChannellingLightMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingLight_modtype1}]]}} {{mod1=@{ChannellingLight_mod1}}} {{mod2type=[[@{ChannellingLight_modtype2}]]}} {{mod2=@{ChannellingLight_mod2}}} {{mod3type=[[@{ChannellingLight_modtype3}]]}} {{mod3=@{ChannellingLight_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingLight)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -12401,7 +12401,7 @@
 							</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingDeath" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-DEATH}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingDeathChar}+@{ChannellingDeathAdv}+@{ChannellingDeathMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingDeath_modtype1}]]}} {{mod1=@{ChannellingDeath_mod1}}} {{mod2type=[[@{ChannellingDeath_modtype2}]]}} {{mod2=@{ChannellingDeath_mod2}}} {{mod3type=[[@{ChannellingDeath_modtype3}]]}} {{mod3=@{ChannellingDeath_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingDeath)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingDeath" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-DEATH}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingDeathChar}+@{ChannellingDeathAdv}+@{ChannellingDeathMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingDeath_modtype1}]]}} {{mod1=@{ChannellingDeath_mod1}}} {{mod2type=[[@{ChannellingDeath_modtype2}]]}} {{mod2=@{ChannellingDeath_mod2}}} {{mod3type=[[@{ChannellingDeath_modtype3}]]}} {{mod3=@{ChannellingDeath_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingDeath)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -12506,7 +12506,7 @@
 							</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingShadows" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-SHADOWS}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingShadowsChar}+@{ChannellingShadowsAdv}+@{ChannellingShadowsMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingShadows_modtype1}]]}} {{mod1=@{ChannellingShadows_mod1}}} {{mod2type=[[@{ChannellingShadows_modtype2}]]}} {{mod2=@{ChannellingShadows_mod2}}} {{mod3type=[[@{ChannellingShadows_modtype3}]]}} {{mod3=@{ChannellingShadows_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingShadows)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingShadows" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-SHADOWS}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingShadowsChar}+@{ChannellingShadowsAdv}+@{ChannellingShadowsMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingShadows_modtype1}]]}} {{mod1=@{ChannellingShadows_mod1}}} {{mod2type=[[@{ChannellingShadows_modtype2}]]}} {{mod2=@{ChannellingShadows_mod2}}} {{mod3type=[[@{ChannellingShadows_modtype3}]]}} {{mod3=@{ChannellingShadows_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingShadows)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -12610,7 +12610,7 @@
 							</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingWitch" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-WITCH}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingWitchChar}+@{ChannellingWitchAdv}+@{ChannellingWitchMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingWitch_modtype1}]]}} {{mod1=@{ChannellingWitch_mod1}}} {{mod2type=[[@{ChannellingWitch_modtype2}]]}} {{mod2=@{ChannellingWitch_mod2}}} {{mod3type=[[@{ChannellingWitch_modtype3}]]}} {{mod3=@{ChannellingWitch_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingWitch)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingWitch" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-WITCH}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingWitchChar}+@{ChannellingWitchAdv}+@{ChannellingWitchMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingWitch_modtype1}]]}} {{mod1=@{ChannellingWitch_mod1}}} {{mod2type=[[@{ChannellingWitch_modtype2}]]}} {{mod2=@{ChannellingWitch_mod2}}} {{mod3type=[[@{ChannellingWitch_modtype3}]]}} {{mod3=@{ChannellingWitch_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingWitch)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -12715,7 +12715,7 @@
 							</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingDark" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-DARK}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingDarkChar}+@{ChannellingDarkAdv}+@{ChannellingDarkMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingDark_modtype1}]]}} {{mod1=@{ChannellingDark_mod1}}} {{mod2type=[[@{ChannellingDark_modtype2}]]}} {{mod2=@{ChannellingDark_mod2}}} {{mod3type=[[@{ChannellingDark_modtype3}]]}} {{mod3=@{ChannellingDark_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingDark)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingDark" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-DARK}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingDarkChar}+@{ChannellingDarkAdv}+@{ChannellingDarkMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingDark_modtype1}]]}} {{mod1=@{ChannellingDark_mod1}}} {{mod2type=[[@{ChannellingDark_modtype2}]]}} {{mod2=@{ChannellingDark_mod2}}} {{mod3type=[[@{ChannellingDark_modtype3}]]}} {{mod3=@{ChannellingDark_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingDark)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -12820,7 +12820,7 @@
 							</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingChaos" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-CHAOS}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingChaosChar}+@{ChannellingChaosAdv}+@{ChannellingChaosMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingChaos_modtype1}]]}} {{mod1=@{ChannellingChaos_mod1}}} {{mod2type=[[@{ChannellingChaos_modtype2}]]}} {{mod2=@{ChannellingChaos_mod2}}} {{mod3type=[[@{ChannellingChaos_modtype3}]]}} {{mod3=@{ChannellingChaos_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingChaos)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingChaos" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-CHAOS}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingChaosChar}+@{ChannellingChaosAdv}+@{ChannellingChaosMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingChaos_modtype1}]]}} {{mod1=@{ChannellingChaos_mod1}}} {{mod2type=[[@{ChannellingChaos_modtype2}]]}} {{mod2=@{ChannellingChaos_mod2}}} {{mod3type=[[@{ChannellingChaos_modtype3}]]}} {{mod3=@{ChannellingChaos_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingChaos)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -12924,7 +12924,7 @@
 							</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_ChannellingMisc" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-MISC}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingMiscChar}+@{ChannellingMiscAdv}+@{ChannellingMiscMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingMisc_modtype1}]]}} {{mod1=@{ChannellingMisc_mod1}}} {{mod2type=[[@{ChannellingMisc_modtype2}]]}} {{mod2=@{ChannellingMisc_mod2}}} {{mod3type=[[@{ChannellingMisc_modtype3}]]}} {{mod3=@{ChannellingMisc_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingMisc)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_ChannellingMisc" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{CHANNELLING-MISC}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{ChannellingMiscChar}+@{ChannellingMiscAdv}+@{ChannellingMiscMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ChannellingMisc_modtype1}]]}} {{mod1=@{ChannellingMisc_mod1}}} {{mod2type=[[@{ChannellingMisc_modtype2}]]}} {{mod2=@{ChannellingMisc_mod2}}} {{mod3type=[[@{ChannellingMisc_modtype3}]]}} {{mod3=@{ChannellingMisc_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}ChannellingMisc)}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}}"></button>
 						</div>
 	<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -13028,7 +13028,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Evaluate" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{EVALUATE}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{EvaluateChar}+@{EvaluateAdv}+@{EvaluateMisc})*@{EvaluateTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Evaluate_modtype1}]]}} {{mod1=@{Evaluate_mod1}}} {{mod2type=[[@{Evaluate_modtype2}]]}} {{mod2=@{Evaluate_mod2}}} {{mod3type=[[@{Evaluate_modtype3}]]}} {{mod3=@{Evaluate_mod3}}} {{reroll=@{RT-reroll}Evaluate)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Evaluate" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{EVALUATE}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{EvaluateChar}+@{EvaluateAdv}+@{EvaluateMisc})*@{EvaluateTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Evaluate_modtype1}]]}} {{mod1=@{Evaluate_mod1}}} {{mod2type=[[@{Evaluate_modtype2}]]}} {{mod2=@{Evaluate_mod2}}} {{mod3type=[[@{Evaluate_modtype3}]]}} {{mod3=@{Evaluate_mod3}}} {{reroll=@{RT-reroll}Evaluate)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -13129,7 +13129,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Heal" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{HEAL}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{HealChar}+@{HealAdv}+@{HealMisc})*@{HealTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{healtest=1}} {{intBns=[[@{IntelligenceBonus}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Heal_modtype1}]]}} {{mod1=@{Heal_mod1}}} {{mod2type=[[@{Heal_modtype2}]]}} {{mod2=@{Heal_mod2}}} {{mod3type=[[@{Heal_modtype3}]]}} {{mod3=@{Heal_mod3}}} {{reroll=@{RT-reroll}Heal)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Heal" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{HEAL}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{HealChar}+@{HealAdv}+@{HealMisc})*@{HealTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{skilltest=true}} {{healtest=1}} {{intBns=[[@{IntelligenceBonus}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Heal_modtype1}]]}} {{mod1=@{Heal_mod1}}} {{mod2type=[[@{Heal_modtype2}]]}} {{mod2=@{Heal_mod2}}} {{mod3type=[[@{Heal_modtype3}]]}} {{mod3=@{Heal_mod3}}} {{reroll=@{RT-reroll}Heal)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -13245,7 +13245,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_LangMagick" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{rolltype=[[5]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{LANG-MAGICK}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{LangMagick}]] [SKILL] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{LangMagick_modtype1}]]}} {{mod1=@{LangMagick_mod1}}} {{mod2type=[[@{LangMagick_modtype2}]]}} {{mod2=@{LangMagick_mod2}}} {{mod3type=[[@{LangMagick_modtype3}]]}} {{mod3=@{LangMagick_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RT-reroll}LangMagick)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_LangMagick" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{rolltype=[[5]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{LANG-MAGICK}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{LangMagick}]] [SKILL] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{LangMagick_modtype1}]]}} {{mod1=@{LangMagick_mod1}}} {{mod2type=[[@{LangMagick_modtype2}]]}} {{mod2=@{LangMagick_mod2}}} {{mod3type=[[@{LangMagick_modtype3}]]}} {{mod3=@{LangMagick_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RT-reroll}LangMagick)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -13353,7 +13353,7 @@
 										<input class="sheet-center" type="number" name="attr_Language" value="(@{LanguageChar}+@{LanguageAdv}+@{LanguageMisc}+(@{condgen_see}*-1))*@{LanguageTaken}" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_Language" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{LanguageSpecialization}}} {{skill=^{LANGUAGE}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{LanguageChar}+@{LanguageAdv}+@{LanguageMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Language_modtype1}]]}} {{mod1=@{Language_mod1}}} {{mod2type=[[@{Language_modtype2}]]}} {{mod2=@{Language_mod2}}} {{mod3type=[[@{Language_modtype3}]]}} {{mod3=@{Language_mod3}}} {{reroll=@{RT-rep}Language)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_Language" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{LanguageSpecialization}}} {{skill=^{LANGUAGE}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{LanguageChar}+@{LanguageAdv}+@{LanguageMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Language_modtype1}]]}} {{mod1=@{Language_mod1}}} {{mod2type=[[@{Language_modtype2}]]}} {{mod2=@{Language_mod2}}} {{mod3type=[[@{Language_modtype3}]]}} {{mod3=@{Language_mod3}}} {{reroll=@{RT-rep}Language)}}"></button>
 						</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_LanguageTaken" value="1" />
@@ -13568,7 +13568,7 @@
 										<input class="sheet-center" type="number" name="attr_Lore" value="(@{LoreChar}+@{LoreAdv}+@{LoreMisc}+(@{condgen_see}*-1))*@{LoreTaken}" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_Lore" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{LoreSpecialization}}} {{title=@{LoreSpecialization}}} {{skill=^{LORE}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{LoreChar}+@{LoreAdv}+@{LoreMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Lore_modtype1}]]}} {{mod1=@{Lore_mod1}}} {{mod2type=[[@{Lore_modtype2}]]}} {{mod2=@{Lore_mod2}}} {{mod3type=[[@{Lore_modtype3}]]}} {{mod3=@{Lore_mod3}}} {{reroll=@{RT-rep}Lore)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_Lore" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{LoreSpecialization}}} {{title=@{LoreSpecialization}}} {{skill=^{LORE}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[@{LoreChar}+@{LoreAdv}+@{LoreMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Lore_modtype1}]]}} {{mod1=@{Lore_mod1}}} {{mod2type=[[@{Lore_modtype2}]]}} {{mod2=@{Lore_mod2}}} {{mod3type=[[@{Lore_modtype3}]]}} {{mod3=@{Lore_mod3}}} {{reroll=@{RT-rep}Lore)}}"></button>
 						</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_LoreTaken" value="1" />
@@ -13779,7 +13779,7 @@
 										<input class="sheet-center" type="number" name="attr_Perform" value="(@{PerformChar}+@{PerformAdv}+@{PerformMisc}+(@{condgen_see_move}*-1))*@{PerformTaken}" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_Perform" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{PerformSpecialization}}} {{skill=^{PERFORM}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{PerformChar}+@{PerformAdv}+@{PerformMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perform_modtype1}]]}} {{mod1=@{Perform_mod1}}} {{mod2type=[[@{Perform_modtype2}]]}} {{mod2=@{Perform_mod2}}} {{mod3type=[[@{Perform_modtype3}]]}} {{mod3=@{Perform_mod3}}} {{reroll=@{RT-rep}Perform)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_Perform" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{PerformSpecialization}}} {{skill=^{PERFORM}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{PerformChar}+@{PerformAdv}+@{PerformMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perform_modtype1}]]}} {{mod1=@{Perform_mod1}}} {{mod2type=[[@{Perform_modtype2}]]}} {{mod2=@{Perform_mod2}}} {{mod3type=[[@{Perform_modtype3}]]}} {{mod3=@{Perform_mod3}}} {{reroll=@{RT-rep}Perform)}}"></button>
 						</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_PerformTaken" value="1" />
@@ -13979,7 +13979,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_PickLock" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PICK-LOCK}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[@{PickLockChar}+@{PickLockAdv}+@{PickLockMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{PickLock_modtype1}]]}} {{mod1=@{PickLock_mod1}}} {{mod2type=[[@{PickLock_modtype2}]]}} {{mod2=@{PickLock_mod2}}} {{mod3type=[[@{PickLock_modtype3}]]}} {{mod3=@{PickLock_mod3}}} {{reroll=@{RT-reroll}PickLock)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_PickLock" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{PICK-LOCK}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[@{PickLockChar}+@{PickLockAdv}+@{PickLockMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{PickLock_modtype1}]]}} {{mod1=@{PickLock_mod1}}} {{mod2type=[[@{PickLock_modtype2}]]}} {{mod2=@{PickLock_mod2}}} {{mod3type=[[@{PickLock_modtype3}]]}} {{mod3=@{PickLock_mod3}}} {{reroll=@{RT-reroll}PickLock)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -14089,7 +14089,7 @@
 										<input class="sheet-center" type="number" name="attr_Play" value="(@{PlayChar}+@{PlayAdv}+@{PlayMisc}+(@{condgen_see}*-1))*@{PlayTaken}" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_Play" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{PlaySpecialization}}} {{title=@{PlaySpecialization}}} {{skill=^{PLAY}}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[@{PlaySpecializationChar}+@{PlayAdv}+@{PlayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Play_modtype1}]]}} {{mod1=@{Play_mod1}}} {{mod2type=[[@{Play_modtype2}]]}} {{mod2=@{Play_mod2}}} {{mod3type=[[@{Play_modtype3}]]}} {{mod3=@{Play_mod3}}} {{reroll=@{RT-rep}Play)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_Play" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{PlaySpecialization}}} {{title=@{PlaySpecialization}}} {{skill=^{PLAY}}}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[@{PlaySpecializationChar}+@{PlayAdv}+@{PlayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Play_modtype1}]]}} {{mod1=@{Play_mod1}}} {{mod2type=[[@{Play_modtype2}]]}} {{mod2=@{Play_mod2}}} {{mod3type=[[@{Play_modtype3}]]}} {{mod3=@{Play_mod3}}} {{reroll=@{RT-rep}Play)}}"></button>
 						</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_PlayTaken" value="1" />
@@ -14291,7 +14291,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_Pray" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=^{PRAY}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{rolltype=[[5]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Pray_modtype1}]]}} {{mod1=@{Pray_mod1}}} {{mod2type=[[@{Pray_modtype2}]]}} {{mod2=@{Pray_mod2}}} {{mod3type=[[@{Pray_modtype3}]]}} {{mod3=@{Pray_mod3}}} {{NPC=[[0]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}Pray)}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_Pray" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=^{PRAY}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{rolltype=[[5]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Pray_modtype1}]]}} {{mod1=@{Pray_mod1}}} {{mod2type=[[@{Pray_modtype2}]]}} {{mod2=@{Pray_mod2}}} {{mod3type=[[@{Pray_modtype3}]]}} {{mod3=@{Pray_mod3}}} {{NPC=[[0]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}Pray)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -14476,7 +14476,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_RangedBlackpowder" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{RANGED-BLACKPOWDER}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedBlackpowder}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedBlackpowder_modtype1}]]}} {{mod1=@{RangedBlackpowder_mod1}}} {{mod2type=[[@{RangedBlackpowder_modtype2}]]}} {{mod2=@{RangedBlackpowder_mod2}}} {{mod3type=[[@{RangedBlackpowder_modtype3}]]}} {{mod3=@{RangedBlackpowder_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedBlackpowder)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_RangedBlackpowder" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{RANGED-BLACKPOWDER}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedBlackpowder}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedBlackpowder_modtype1}]]}} {{mod1=@{RangedBlackpowder_mod1}}} {{mod2type=[[@{RangedBlackpowder_modtype2}]]}} {{mod2=@{RangedBlackpowder_mod2}}} {{mod3type=[[@{RangedBlackpowder_modtype3}]]}} {{mod3=@{RangedBlackpowder_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedBlackpowder)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -14576,7 +14576,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_RangedBow" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-BOW}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedBow}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedBow_modtype1}]]}} {{mod1=@{RangedBow_mod1}}} {{mod2type=[[@{RangedBow_modtype2}]]}} {{mod2=@{RangedBow_mod2}}} {{mod3type=[[@{RangedBow_modtype3}]]}} {{mod3=@{RangedBow_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedBow)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_RangedBow" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-BOW}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedBow}]] [SKILL] + [[@{Advantage}*10]] [ADV] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedBow_modtype1}]]}} {{mod1=@{RangedBow_mod1}}} {{mod2type=[[@{RangedBow_modtype2}]]}} {{mod2=@{RangedBow_mod2}}} {{mod3type=[[@{RangedBow_modtype3}]]}} {{mod3=@{RangedBow_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedBow)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -14676,7 +14676,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_RangedCrossbow" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-CROSSBOW}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedCrossbow}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedCrossbow_modtype1}]]}} {{mod1=@{RangedCrossbow_mod1}}} {{mod2type=[[@{RangedCrossbow_modtype2}]]}} {{mod2=@{RangedCrossbow_mod2}}} {{mod3type=[[@{RangedCrossbow_modtype3}]]}} {{mod3=@{RangedCrossbow_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedCrossbow)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_RangedCrossbow" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-CROSSBOW}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedCrossbow}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedCrossbow_modtype1}]]}} {{mod1=@{RangedCrossbow_mod1}}} {{mod2type=[[@{RangedCrossbow_modtype2}]]}} {{mod2=@{RangedCrossbow_mod2}}} {{mod3type=[[@{RangedCrossbow_modtype3}]]}} {{mod3=@{RangedCrossbow_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedCrossbow)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -14778,7 +14778,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_RangedEngineering" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-ENGINEERING}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedEngineering}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedEngineering_modtype1}]]}} {{mod1=@{RangedEngineering_mod1}}} {{mod2type=[[@{RangedEngineering_modtype2}]]}} {{mod2=@{RangedEngineering_mod2}}} {{mod3type=[[@{RangedEngineering_modtype3}]]}} {{mod3=@{RangedEngineering_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedEngineering)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_RangedEngineering" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-ENGINEERING}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedEngineering}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedEngineering_modtype1}]]}} {{mod1=@{RangedEngineering_mod1}}} {{mod2type=[[@{RangedEngineering_modtype2}]]}} {{mod2=@{RangedEngineering_mod2}}} {{mod3type=[[@{RangedEngineering_modtype3}]]}} {{mod3=@{RangedEngineering_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedEngineering)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -14880,7 +14880,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_RangedEntangling" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-ENTANGLING}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedEntangling}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedEntangling_modtype1}]]}} {{mod1=@{RangedEntangling_mod1}}} {{mod2type=[[@{RangedEntangling_modtype2}]]}} {{mod2=@{RangedEntangling_mod2}}} {{mod3type=[[@{RangedEntangling_modtype3}]]}} {{mod3=@{RangedEntangling_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedEntangling)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_RangedEntangling" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-ENTANGLING}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedEntangling}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedEntangling_modtype1}]]}} {{mod1=@{RangedEntangling_mod1}}} {{mod2type=[[@{RangedEntangling_modtype2}]]}} {{mod2=@{RangedEntangling_mod2}}} {{mod3type=[[@{RangedEntangling_modtype3}]]}} {{mod3=@{RangedEntangling_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedEntangling)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -14982,7 +14982,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_RangedExplosives" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-EXPLOSIVES}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedExplosives}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedExplosives_modtype1}]]}} {{mod1=@{RangedExplosives_mod1}}} {{mod2type=[[@{RangedExplosives_modtype2}]]}} {{mod2=@{RangedExplosives_mod2}}} {{mod3type=[[@{RangedExplosives_modtype3}]]}} {{mod3=@{RangedExplosives_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedExplosives)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_RangedExplosives" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-EXPLOSIVES}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedExplosives}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedExplosives_modtype1}]]}} {{mod1=@{RangedExplosives_mod1}}} {{mod2type=[[@{RangedExplosives_modtype2}]]}} {{mod2=@{RangedExplosives_mod2}}} {{mod3type=[[@{RangedExplosives_modtype3}]]}} {{mod3=@{RangedExplosives_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedExplosives)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -15086,7 +15086,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_RangedSling" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-SLING}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedSling}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedSling_modtype1}]]}} {{mod1=@{RangedSling_mod1}}} {{mod2type=[[@{RangedSling_modtype2}]]}} {{mod2=@{RangedSling_mod2}}} {{mod3type=[[@{RangedSling_modtype3}]]}} {{mod3=@{RangedSling_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedSling)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_RangedSling" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-SLING}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedSling}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedSling_modtype1}]]}} {{mod1=@{RangedSling_mod1}}} {{mod2type=[[@{RangedSling_modtype2}]]}} {{mod2=@{RangedSling_mod2}}} {{mod3type=[[@{RangedSling_modtype3}]]}} {{mod3=@{RangedSling_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedSling)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -15188,7 +15188,7 @@
 							</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-								<button type="roll" class="sheet-roll" name="roll_RangedThrowing" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-THROWING}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedThrowing}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedThrowing_modtype1}]]}} {{mod1=@{RangedThrowing_mod1}}} {{mod2type=[[@{RangedThrowing_modtype2}]]}} {{mod2=@{RangedThrowing_mod2}}} {{mod3type=[[@{RangedThrowing_modtype3}]]}} {{mod3=@{RangedThrowing_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedThrowing)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
+								<button type="roll" class="sheet-roll" name="roll_RangedThrowing" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{advantage=[[@{AdvantageDisplay}]]}} {{rolltype=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{RANGED-THROWING}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{RangedThrowing}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[2]]}} {{mod1type=[[@{RangedThrowing_modtype1}]]}} {{mod1=@{RangedThrowing_mod1}}} {{mod2type=[[@{RangedThrowing_modtype2}]]}} {{mod2=@{RangedThrowing_mod2}}} {{mod3type=[[@{RangedThrowing_modtype3}]]}} {{mod3=@{RangedThrowing_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedThrowing)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -15293,7 +15293,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />	
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Research" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{RESEARCH}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{ResearchChar}+@{ResearchAdv}+@{ResearchMisc})*@{ResearchTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Research_modtype1}]]}} {{mod1=@{Research_mod1}}} {{mod2type=[[@{Research_modtype2}]]}} {{mod2=@{Research_mod2}}} {{mod3type=[[@{Research_modtype3}]]}} {{mod3=@{Research_mod3}}} {{reroll=@{RT-reroll}Research)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Research" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{RESEARCH}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{ResearchChar}+@{ResearchAdv}+@{ResearchMisc})*@{ResearchTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Research_modtype1}]]}} {{mod1=@{Research_mod1}}} {{mod2type=[[@{Research_modtype2}]]}} {{mod2=@{Research_mod2}}} {{mod3type=[[@{Research_modtype3}]]}} {{mod3=@{Research_mod3}}} {{reroll=@{RT-reroll}Research)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -15404,7 +15404,7 @@
 										<input class="sheet-center" type="number" name="attr_Sail" value="(@{SailSpecializationChar}+@{SailAdv}+@{SailMisc}+(@{condgen_see}*-1))*@{SailTaken}" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_Sail" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{SailSpecialization}}} {{skill=@{SailSpecialization}}} {{skill=^{SAIL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{SailSpecializationChar}+@{SailAdv}+@{SailMisc})*@{SailTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Sail_modtype1}]]}} {{mod1=@{Sail_mod1}}} {{mod2type=[[@{Sail_modtype2}]]}} {{mod2=@{Sail_mod2}}} {{mod3type=[[@{Sail_modtype3}]]}} {{mod3=@{Sail_mod3}}} {{reroll=@{RT-rep}Sail)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_Sail" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{SailSpecialization}}} {{skill=@{SailSpecialization}}} {{skill=^{SAIL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{SailSpecializationChar}+@{SailAdv}+@{SailMisc})*@{SailTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Sail_modtype1}]]}} {{mod1=@{Sail_mod1}}} {{mod2type=[[@{Sail_modtype2}]]}} {{mod2=@{Sail_mod2}}} {{mod3type=[[@{Sail_modtype3}]]}} {{mod3=@{Sail_mod3}}} {{reroll=@{RT-rep}Sail)}}"></button>
 						</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_SailTaken" value="1" />
@@ -15625,7 +15625,7 @@
 										<input class="sheet-center" type="number" name="attr_SecretSigns" value="(@{SecretSignsChar}+@{SecretSignsAdv}+@{SecretSignsMisc}+(@{condgen_see}*-1))*@{SecretSignsTaken}" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_SecretSigns" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{SecretSignsSpecialization}}} {{skill=^{SECRET-SIGNS}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{SecretSignsChar}+@{SecretSignsAdv}+@{SecretSignsMisc})*@{SecretSignsTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{SecretSigns_modtype1}]]}} {{mod1=@{SecretSigns_mod1}}} {{mod2type=[[@{SecretSigns_modtype2}]]}} {{mod2=@{SecretSigns_mod2}}} {{mod3type=[[@{SecretSigns_modtype3}]]}} {{mod3=@{SecretSigns_mod3}}} {{reroll=@{RT-rep}SecretSigns)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_SecretSigns" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=@{SecretSignsSpecialization}}} {{skill=^{SECRET-SIGNS}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{SecretSignsChar}+@{SecretSignsAdv}+@{SecretSignsMisc})*@{SecretSignsTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{SecretSigns_modtype1}]]}} {{mod1=@{SecretSigns_mod1}}} {{mod2type=[[@{SecretSigns_modtype2}]]}} {{mod2=@{SecretSigns_mod2}}} {{mod3type=[[@{SecretSigns_modtype3}]]}} {{mod3=@{SecretSigns_mod3}}} {{reroll=@{RT-rep}SecretSigns)}}"></button>
 						</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_SecretSignsTaken" value="1" />
@@ -15833,7 +15833,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_SetTrap" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{SET-TRAP}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{SetTrapChar}+@{SetTrapAdv}+@{SetTrapMisc})*@{SetTrapTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{SetTrap_modtype1}]]}} {{mod1=@{SetTrap_mod1}}} {{mod2type=[[@{SetTrap_modtype2}]]}} {{mod2=@{SetTrap_mod2}}} {{mod3type=[[@{SetTrap_modtype3}]]}} {{mod3=@{SetTrap_mod3}}} {{reroll=@{RT-reroll}SetTrap)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_SetTrap" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{SET-TRAP}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{SetTrapChar}+@{SetTrapAdv}+@{SetTrapMisc})*@{SetTrapTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{SetTrap_modtype1}]]}} {{mod1=@{SetTrap_mod1}}} {{mod2type=[[@{SetTrap_modtype2}]]}} {{mod2=@{SetTrap_mod2}}} {{mod3type=[[@{SetTrap_modtype3}]]}} {{mod3=@{SetTrap_mod3}}} {{reroll=@{RT-reroll}SetTrap)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />	
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -15932,7 +15932,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_SleightofHand" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{SLEIGHT-OF-HAND}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{SleightofHandChar}+@{SleightofHandAdv}+@{SleightofHandMisc})*@{SleightofHandTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{SleightofHand_modtype1}]]}} {{mod1=@{SleightofHand_mod1}}} {{mod2type=[[@{SleightofHand_modtype2}]]}} {{mod2=@{SleightofHand_mod2}}} {{mod3type=[[@{SleightofHand_modtype3}]]}} {{mod3=@{SleightofHand_mod3}}} {{reroll=@{RT-reroll}SleightofHand)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_SleightofHand" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{SLEIGHT-OF-HAND}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{SleightofHandChar}+@{SleightofHandAdv}+@{SleightofHandMisc})*@{SleightofHandTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{SleightofHand_modtype1}]]}} {{mod1=@{SleightofHand_mod1}}} {{mod2type=[[@{SleightofHand_modtype2}]]}} {{mod2=@{SleightofHand_mod2}}} {{mod3type=[[@{SleightofHand_modtype3}]]}} {{mod3=@{SleightofHand_mod3}}} {{reroll=@{RT-reroll}SleightofHand)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -16032,7 +16032,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Swim" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{SWIM}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{SwimChar}+@{SwimAdv}+@{SwimMisc})*@{SwimTaken}]] [SKILL] +?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Swim_modtype1}]]}} {{mod1=@{Swim_mod1}}} {{mod2type=[[@{Swim_modtype2}]]}} {{mod2=@{Swim_mod2}}} {{mod3type=[[@{Swim_modtype3}]]}} {{mod3=@{Swim_mod3}}} {{reroll=@{RT-reroll}Swim)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Swim" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{SWIM}}} {{skill=^{ADVANCED-SKILL}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[(@{SwimChar}+@{SwimAdv}+@{SwimMisc})*@{SwimTaken}]] [SKILL] +?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Swim_modtype1}]]}} {{mod1=@{Swim_mod1}}} {{mod2type=[[@{Swim_modtype2}]]}} {{mod2=@{Swim_mod2}}} {{mod3type=[[@{Swim_modtype3}]]}} {{mod3=@{Swim_mod3}}} {{reroll=@{RT-reroll}Swim)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -16132,7 +16132,7 @@
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="0" />
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Track" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{TRACK}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{TrackChar}+@{TrackAdv}+@{TrackMisc})*@{TrackTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Track_modtype1}]]}} {{mod1=@{Track_mod1}}} {{mod2type=[[@{Track_modtype2}]]}} {{mod2=@{Track_mod2}}} {{mod3type=[[@{Track_modtype3}]]}} {{mod3=@{Track_mod3}}} {{reroll=@{RT-reroll}Track)}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Track" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=^{TRACK}}} {{skill=^{ADVANCED-SKILL}}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen_see}*-1]] [COND] + [[(@{TrackChar}+@{TrackAdv}+@{TrackMisc})*@{TrackTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Track_modtype1}]]}} {{mod1=@{Track_mod1}}} {{mod2type=[[@{Track_modtype2}]]}} {{mod2=@{Track_mod2}}} {{mod3type=[[@{Track_modtype3}]]}} {{mod3=@{Track_mod3}}} {{reroll=@{RT-reroll}Track)}}"></button>
 						</div>
 		<input type="checkbox" name="attr_Devmode" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
@@ -16244,7 +16244,7 @@
 										<input class="sheet-center" type="number" name="attr_Trade" value="(@{TradeChar}+@{TradeAdv}+@{TradeMisc}+(@{condgen}*-1))*@{TradeTaken}" disabled="true" />
 									</div>
 									<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-										<button type="roll" class="sheet-roll" name="roll_Trade" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{TradeSpecialization}}} {{skill=^{TRADE}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[(@{TradeSpecializationChar}+@{TradeAdv}+@{TradeMisc})*@{TradeTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Trade_modtype1}]]}} {{mod1=@{Trade_mod1}}} {{mod2type=[[@{Trade_modtype2}]]}} {{mod2=@{Trade_mod2}}} {{mod3type=[[@{Trade_modtype3}]]}} {{mod3=@{Trade_mod3}}} {{reroll=@{RT-rep}Trade)}}"></button>
+										<button type="roll" class="sheet-roll" name="roll_Trade" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{title=@{TradeSpecialization}}} {{skill=^{TRADE}}} {{character_name=@{character_name}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[(@{TradeSpecializationChar}+@{TradeAdv}+@{TradeMisc})*@{TradeTaken}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Trade_modtype1}]]}} {{mod1=@{Trade_mod1}}} {{mod2type=[[@{Trade_modtype2}]]}} {{mod2=@{Trade_mod2}}} {{mod3type=[[@{Trade_modtype3}]]}} {{mod3=@{Trade_mod3}}} {{reroll=@{RT-rep}Trade)}}"></button>
 						</div>
 						<div class="sheet-col-1-20 sheet-center sheet-pad-r-sm sheet-vert-middle">
 							<input type="checkbox" name="attr_TradeTaken" value="1" />
@@ -17092,7 +17092,7 @@
 							<input type="checkbox" name="attr_TalentCareer" value="1" />
 						</div>									
 						<div class="sheet-col-1-25 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-talent-show" name="roll_Talents" title="Display in Chat" value="@{Whisper} &{template:wfrp4e} {{talent=true}} {{title=@{TalentName}}} {{skill=Talent}} {{character_name=@{character_name}}} {{talent=true}} {{talenttest=@{TalentTest}}} {{talentdesc=@{TalentDesc}}} {{talentchar=@{TalentChar}}} {{talentlevel=@{TalentLevel}}} {{talentmax=@{TalentMax}}}"><span class="talsetshow-check__span" checked="unchecked">w</span></button>
+							<button type="roll" class="sheet-talent-show" name="roll_Talents" title="Display in Chat" value="@{Whisper} &{template:whfrp2e} {{talent=true}} {{title=@{TalentName}}} {{skill=Talent}} {{character_name=@{character_name}}} {{talent=true}} {{talenttest=@{TalentTest}}} {{talentdesc=@{TalentDesc}}} {{talentchar=@{TalentChar}}} {{talentlevel=@{TalentLevel}}} {{talentmax=@{TalentMax}}}"><span class="talsetshow-check__span" checked="unchecked">w</span></button>
 						</div>	
 						<span class="sheet-spacer"></span>
 					</div>
@@ -17323,11 +17323,11 @@
 						<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-mar-t-lg sheet-mar-l-md">
 							<span  style="font-size: 14px;" data-i18n="MELEE-WEAPONS">MELEE WEAPONS</span>		
 							<div class="sheet-col-1-13 sheet-center"style="float: right; margin-right: 15px;">
-								<button type="roll" class="sheet-combat-actions-rep" name="roll_MeleeOpposed" value="@{Whisper} &{template:wfrp4e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Opposed Defense Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{attacktype=^{OPPOSED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Opposed Defense Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{Used_DefenseDefensive}]]}} {{test=$[[0]]}} {{reach=@{Used_DefenseReach}}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{showdmg=[[@{Used_DefenseOpposedDmg}]]}} {{hitlocation=true}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{armorqualities=@{armorQuality}}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeOpposed)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
+								<button type="roll" class="sheet-combat-actions-rep" name="roll_MeleeOpposed" value="@{Whisper} &{template:whfrp2e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Opposed Defense Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{attacktype=^{OPPOSED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Opposed Defense Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{Used_DefenseDefensive}]]}} {{test=$[[0]]}} {{reach=@{Used_DefenseReach}}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{showdmg=[[@{Used_DefenseOpposedDmg}]]}} {{hitlocation=true}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{armorqualities=@{armorQuality}}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeOpposed)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
 								<span data-i18n="OPPOSED">Opposed</span></button>
 							</div>	
 							<div class="sheet-col-1-13 sheet-center" style="float: right;">
-								<button type="roll" class="sheet-combat-actions-rep" name="roll_MeleeAttack"  value="@{Whisper} &{template:wfrp4e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Opposed Attack Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{character_name=@{character_name}}} {{attacktype=^{MELEE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Opposed Attack Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=$[[0]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
+								<button type="roll" class="sheet-combat-actions-rep" name="roll_MeleeAttack"  value="@{Whisper} &{template:whfrp2e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Opposed Attack Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{character_name=@{character_name}}} {{attacktype=^{MELEE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Opposed Attack Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=$[[0]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
 							<span data-i18n="ATTACK">Attack</span></button>
 							</div>				
 						</div>	
@@ -17864,7 +17864,7 @@
 							<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-mar-t-lg sheet-mar-l-md">
 								<span  style="font-size: 14px" data-i18n="RANGED-WEAPONS">RANGED WEAPONS</span>		
 							<div class="sheet-col-1-13 sheet-center"style="float: right; margin-right: 10px;">
-					<button type="roll" class="sheet-combat-actions-rep" name="roll_RangedAttack" value="@{Whisper} &{template:wfrp4e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Ranged Attack Roll Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Roll Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=$[[0]]}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{range=@{Used_WeaponRange}}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"><span data-i18n="SHOOT">Shoot</span>
+					<button type="roll" class="sheet-combat-actions-rep" name="roll_RangedAttack" value="@{Whisper} &{template:whfrp2e} [[ (([[@{roll_rule}]]-1)%10)+1 ]] {{modvalue=[[?{Ranged Attack Roll Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Roll Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=$[[0]]}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{range=@{Used_WeaponRange}}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"><span data-i18n="SHOOT">Shoot</span>
 					</button>
 							</div>					
 							</div>	
@@ -19320,22 +19320,22 @@
 			<span class="sheet-spacer"></span>					
 			<div class="sheet-row">			
 				<div class="sheet-col-1-4 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:wfrp4e} {{title=^{MINOR-MISCAST}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Minor" value="@{Whisper} &{template:whfrp2e} {{title=^{MINOR-MISCAST}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{minorroll=[[1d100]]}}">
 						<span data-i18n="MINOR-MISCAST">Minor Miscast</span>
 					</button>
 				</div>		
 				<div class="sheet-col-1-4 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:wfrp4e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Major" value="@{Whisper} &{template:whfrp2e} {{title=^{MAJOR-MISCAST}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{majorroll=[[1d100]]}}">
 						<span data-i18n="MAJOR-MISCAST">Major Miscast</span>
 					</button>
 				</div>
 				<div class="sheet-col-1-4  sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:wfrp4e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll= [[[[1d100]] [ROLL] + (@{Sin}*10) [SIN] ]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Wrath" value="@{Whisper} &{template:whfrp2e} {{title=^{WRATH-OF-THE-GODS}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{wrathroll= [[[[1d100]] [ROLL] + (@{Sin}*10) [SIN] ]]}}">
 						<span data-i18n="WRATH-OF-THE-GODS">Wrath of the Gods</span>
 					</button>
 				</div>
 				<div class="sheet-col-1-4  sheet-center">
-								<button type="roll" class="sheet-combat-actions-np" name="roll_Dispel" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{title=Dispel}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}}{{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage_casting}*10*@{Advantage_casting}]] [ADV] ]]}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{rolltype=[[5]]}} {{arcanetest=true}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RT-reroll}Dispel)}}">
+								<button type="roll" class="sheet-combat-actions-np" name="roll_Dispel" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{title=Dispel}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}}{{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage_casting}*10*@{Advantage_casting}]] [ADV] ]]}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{rolltype=[[5]]}} {{arcanetest=true}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RT-reroll}Dispel)}}">
 						<span data-i18n="DISPEL">Dispel</span>
 					</button>					
 				</div>
@@ -19521,13 +19521,13 @@
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{mod1type=[[@{PettySpell_modtype1}]]}} {{mod1=@{PettySpell_mod1}}} {{mod2type=[[@{PettySpell_modtype2}]]}} {{mod2=@{PettySpell_mod2}}} {{mod3type=[[@{PettySpell_modtype3}]]}} {{mod3=@{PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{mod1type=[[@{PettySpell_modtype1}]]}} {{mod1=@{PettySpell_mod1}}} {{mod2type=[[@{PettySpell_modtype2}]]}} {{mod2=@{PettySpell_mod2}}} {{mod3type=[[@{PettySpell_modtype3}]]}} {{mod3=@{PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{spelldamage}+@{spelldamagewb}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{PettySpell_modtype1}]]}} {{mod1=@{PettySpell_mod1}}} {{mod2type=[[@{PettySpell_modtype2}]]}} {{mod2=@{PettySpell_mod2}}} {{mod3type=[[@{PettySpell_modtype3}]]}} {{mod3=@{PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCastDmg)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{spelldamage}+@{spelldamagewb}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{PettySpell_modtype1}]]}} {{mod1=@{PettySpell_mod1}}} {{mod2type=[[@{PettySpell_modtype2}]]}} {{mod2=@{PettySpell_mod2}}} {{mod3type=[[@{PettySpell_modtype3}]]}} {{mod3=@{PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCastDmg)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
@@ -19700,13 +19700,13 @@
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm">
-								<button type="action" class="sheet-roll-flex" name="act_spellcast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{mod1type=[[@{PettySpell_modtype1}]]}} {{mod1=@{PettySpell_mod1}}} {{mod2type=[[@{PettySpell_modtype2}]]}} {{mod2=@{PettySpell_mod2}}} {{mod3type=[[@{PettySpell_modtype3}]]}} {{mod3=@{PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}}">
+								<button type="action" class="sheet-roll-flex" name="act_spellcast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{mod1type=[[@{PettySpell_modtype1}]]}} {{mod1=@{PettySpell_mod1}}} {{mod2type=[[@{PettySpell_modtype2}]]}} {{mod2=@{PettySpell_mod2}}} {{mod3type=[[@{PettySpell_modtype3}]]}} {{mod3=@{PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm">
-								<button type="action" class="sheet-roll-flex" name="act_spellcastdmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{spelldamage}+@{spelldamagewb}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{PettySpell_modtype1}]]}} {{mod1=@{PettySpell_mod1}}} {{mod2type=[[@{PettySpell_modtype2}]]}} {{mod2=@{PettySpell_mod2}}} {{mod3type=[[@{PettySpell_modtype3}]]}} {{mod3=@{PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCastDmg)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}}">
+								<button type="action" class="sheet-roll-flex" name="act_spellcastdmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{PETTY-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spelldescription=@{spelldescription}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{spelldamage}+@{spelldamagewb}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{PettySpell_modtype1}]]}} {{mod1=@{PettySpell_mod1}}} {{mod2type=[[@{PettySpell_modtype2}]]}} {{mod2=@{PettySpell_mod2}}} {{mod3type=[[@{PettySpell_modtype3}]]}} {{mod3=@{PettySpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCastDmg)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
@@ -20016,13 +20016,13 @@
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}}{{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{ARCANE-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{accuchanexlsl=[[@{spellchannelsl}]]}} {{spelldescription=@{spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{mod1type=[[@{ArcaneSpell_modtype1}]]}} {{mod1=@{ArcaneSpell_mod1}}} {{mod2type=[[@{ArcaneSpell_modtype2}]]}} {{mod2=@{ArcaneSpell_mod2}}} {{mod3type=[[@{ArcaneSpell_modtype3}]]}} {{mod3=@{ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveDictionLvl3}]]}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}}{{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{ARCANE-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{accuchanexlsl=[[@{spellchannelsl}]]}} {{spelldescription=@{spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{mod1type=[[@{ArcaneSpell_modtype1}]]}} {{mod1=@{ArcaneSpell_mod1}}} {{mod2type=[[@{ArcaneSpell_modtype2}]]}} {{mod2=@{ArcaneSpell_mod2}}} {{mod3type=[[@{ArcaneSpell_modtype3}]]}} {{mod3=@{ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveDictionLvl3}]]}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{ARCANE-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{accuchanexlsl=[[@{spellchannelsl}]]}} {{spelldescription=@{spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{spelldamage}+@{spelldamagewb}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{ArcaneSpell_modtype1}]]}} {{mod1=@{ArcaneSpell_mod1}}} {{mod2type=[[@{ArcaneSpell_modtype2}]]}} {{mod2=@{ArcaneSpell_mod2}}} {{mod3type=[[@{ArcaneSpell_modtype3}]]}} {{mod3=@{ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCastDmg)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveDictionLvl3}]]}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_SpellCastDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{ARCANE-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{accuchanexlsl=[[@{spellchannelsl}]]}} {{spelldescription=@{spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{spelldamage}+@{spelldamagewb}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{ArcaneSpell_modtype1}]]}} {{mod1=@{ArcaneSpell_mod1}}} {{mod2type=[[@{ArcaneSpell_modtype2}]]}} {{mod2=@{ArcaneSpell_mod2}}} {{mod3type=[[@{ArcaneSpell_modtype3}]]}} {{mod3=@{ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCastDmg)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveDictionLvl3}]]}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
@@ -20127,7 +20127,7 @@
 							</div>
 							
 							<div class="sheet-col-1-12 sheet-center sheet-pad-l-md sheet-vert-middle">
-								<button type="roll" class="sheet-roll-flex" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Channeling Roll Modifier|@{ChanMod}}]]}} {{title=@{spellname}}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + @{ExtChannellingLore} [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{accuchanexlsl=[[?{Accumulated Extended Channelling SL (Start at 0)|@{spellchannelsl}}}} {{SLmod=[[?{SL Modifier|0}]]]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ExtChannellingLoreRoll_modtype1}]]}} {{mod1=@{ExtChannellingLoreRoll_mod1}}} {{mod2type=[[@{ExtChannellingLoreRoll_modtype2}]]}} {{mod2=@{ExtChannellingLoreRoll_mod2}}} {{mod3type=[[@{ExtChannellingLoreRoll_modtype3}]]}} {{mod3=@{ExtChannellingLoreRoll_mod3}}} {{NPC=[[0]]}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}ExtChannellingLoreRoll)}} {{sptal1=[[@{Talent_AethyricAttunementLvl}]]}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_ExtChannellingLoreRoll" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Channeling Roll Modifier|@{ChanMod}}]]}} {{title=@{spellname}}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + @{ExtChannellingLore} [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{accuchanexlsl=[[?{Accumulated Extended Channelling SL (Start at 0)|@{spellchannelsl}}}} {{SLmod=[[?{SL Modifier|0}]]]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ExtChannellingLoreRoll_modtype1}]]}} {{mod1=@{ExtChannellingLoreRoll_mod1}}} {{mod2type=[[@{ExtChannellingLoreRoll_modtype2}]]}} {{mod2=@{ExtChannellingLoreRoll_mod2}}} {{mod3type=[[@{ExtChannellingLoreRoll_modtype3}]]}} {{mod3=@{ExtChannellingLoreRoll_mod3}}} {{NPC=[[0]]}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}ExtChannellingLoreRoll)}} {{sptal1=[[@{Talent_AethyricAttunementLvl}]]}}">
 									<span data-i18n="CHANNEL">Channel</span>
 								</button>
 							</div>
@@ -20434,13 +20434,13 @@
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-								<button type="action" class="sheet-roll-flex" name="act_spellcast" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}}{{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{ARCANE-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{accuchanexlsl=[[@{spellchannelsl}]]}} {{spelldescription=@{spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{mod1type=[[@{ArcaneSpell_modtype1}]]}} {{mod1=@{ArcaneSpell_mod1}}} {{mod2type=[[@{ArcaneSpell_modtype2}]]}} {{mod2=@{ArcaneSpell_mod2}}} {{mod3type=[[@{ArcaneSpell_modtype3}]]}} {{mod3=@{ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveDictionLvl3}]]}}">
+								<button type="action" class="sheet-roll-flex" name="act_spellcast" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}}{{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{ARCANE-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{accuchanexlsl=[[@{spellchannelsl}]]}} {{spelldescription=@{spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{arcanetest=true}} {{rolltype=[[5]]}} {{mod1type=[[@{ArcaneSpell_modtype1}]]}} {{mod1=@{ArcaneSpell_mod1}}} {{mod2type=[[@{ArcaneSpell_modtype2}]]}} {{mod2=@{ArcaneSpell_mod2}}} {{mod3type=[[@{ArcaneSpell_modtype3}]]}} {{mod3=@{ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCast)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveDictionLvl3}]]}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-1-12 sheet-center sheet-pad-r-sm">
-								<button type="action" class="sheet-roll-flex" name="act_spellcastdmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{ARCANE-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{accuchanexlsl=[[@{spellchannelsl}]]}} {{spelldescription=@{spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{spelldamage}+@{spelldamagewb}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{ArcaneSpell_modtype1}]]}} {{mod1=@{ArcaneSpell_mod1}}} {{mod2type=[[@{ArcaneSpell_modtype2}]]}} {{mod2=@{ArcaneSpell_mod2}}} {{mod3type=[[@{ArcaneSpell_modtype3}]]}} {{mod3=@{ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCastDmg)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveDictionLvl3}]]}}">
+								<button type="action" class="sheet-roll-flex" name="act_spellcastdmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{SpellMod}}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{advantage=[[@{Advantage}*10*@{Advantage_casting}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{spelltype=^{ARCANE-SPELL}}} {{spellrange=Range: @{spellrange}}} {{spelltarget=Targets: @{spelltarget}}} {{spellduration=Duration: @{spellduration}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + [[{@{LangMagick}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] + [[@{Advantage}*10*@{Advantage_casting}]] [ADV] ]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{accuchanexlsl=[[@{spellchannelsl}]]}} {{spelldescription=@{spelldesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{spelldamage}+@{spelldamagewb}]]}} {{arcanetest=true}} {{rolltype=[[6]]}} {{mod1type=[[@{ArcaneSpell_modtype1}]]}} {{mod1=@{ArcaneSpell_mod1}}} {{mod2type=[[@{ArcaneSpell_modtype2}]]}} {{mod2=@{ArcaneSpell_mod2}}} {{mod3type=[[@{ArcaneSpell_modtype3}]]}} {{mod3=@{ArcaneSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}SpellCastDmg)}} {{sptal2=[[@{Talent_InstinctiveDictionLvl}]]}} {{sptal3=[[@{Talent_PerfectPitchLvl}]]}} {{sptal23=[[@{Talent_InstinctiveDictionLvl3}]]}}">
 									<span data-i18n="CAST">Cast</span>
 								</button>
 							</div>
@@ -20545,7 +20545,7 @@
 							</div>
 							
 							<div class="sheet-col-1-12 sheet-center sheet-pad-l-md sheet-vert-middle">
-								<button type="action" class="sheet-roll-flex" name="act_extchannellingloreroll" value="@{Whisper} &amp&{template:wfrp4e} {{modvalue=[[?{Channeling Roll Modifier|@{ChanMod}}]]}} {{title=@{spellname}}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + @{ExtChannellingLore} [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{accuchanexlsl=[[?{Accumulated Extended Channelling SL (Start at 0)|@{spellchannelsl}}}} {{SLmod=[[?{SL Modifier|0}]]]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ExtChannellingLoreRoll_modtype1}]]}} {{mod1=@{ExtChannellingLoreRoll_mod1}}} {{mod2type=[[@{ExtChannellingLoreRoll_modtype2}]]}} {{mod2=@{ExtChannellingLoreRoll_mod2}}} {{mod3type=[[@{ExtChannellingLoreRoll_modtype3}]]}} {{mod3=@{ExtChannellingLoreRoll_mod3}}} {{NPC=[[0]]}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}ExtChannellingLoreRoll)}} {{sptal1=[[@{Talent_AethyricAttunementLvl}]]}}">
+								<button type="action" class="sheet-roll-flex" name="act_extchannellingloreroll" value="@{Whisper} &amp&{template:whfrp2e} {{modvalue=[[?{Channeling Roll Modifier|@{ChanMod}}]]}} {{title=@{spellname}}} {{title=^{EXTENDED-CHANNELLING-TEST}}} {{skill=^{ADVANCED-SKILL}}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{character_name=@{character_name}}} {{target=[[ [[(@{condgen_see}*-1)]] [COND] + @{ExtChannellingLore} [SKILL] + ?{Channeling Roll Modifier|0} [MOD] ]]}} {{skilltest=true}} {{test=[[@{roll_rule}]]}} {{accuchanexlsl=[[?{Accumulated Extended Channelling SL (Start at 0)|@{spellchannelsl}}}} {{SLmod=[[?{SL Modifier|0}]]]]}} {{spellcastingnumber=[[@{spellcastingnumber}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{rolltype=[[9]]}} {{mod1type=[[@{ExtChannellingLoreRoll_modtype1}]]}} {{mod1=@{ExtChannellingLoreRoll_mod1}}} {{mod2type=[[@{ExtChannellingLoreRoll_modtype2}]]}} {{mod2=@{ExtChannellingLoreRoll_mod2}}} {{mod3type=[[@{ExtChannellingLoreRoll_modtype3}]]}} {{mod3=@{ExtChannellingLoreRoll_mod3}}} {{NPC=[[0]]}} {{RTminor=@{RT-minor}}} {{RTmajor=@{RT-major}}} {{reroll=@{RR-rep}ExtChannellingLoreRoll)}} {{sptal1=[[@{Talent_AethyricAttunementLvl}]]}}">
 									<span data-i18n="CHANNEL">Channel</span>
 								</button>
 							</div>
@@ -20699,7 +20699,7 @@
 								<input type="value" class="sheet-center" name="attr_targetbless" value="(@{Pray}+@{BlessMod})" disabled />
 							</div>
 							<div class="sheet-col-1-12 sheet-spell-button-group sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_Bless" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{BlessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{blessingrange}}} {{spelltarget=Targets: @{blessingtarget}}} {{spellduration=Duration: @{blessingduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[{@{PrayChar}+@{PrayAdv}+@{PrayMisc}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{blessingdesc}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[7]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{mod1type=[[@{BlessingSpell_modtype1}]]}} {{mod1=@{BlessingSpell_mod1}}} {{mod2type=[[@{BlessingSpell_modtype2}]]}} {{mod2=@{BlessingSpell_mod2}}} {{mod3type=[[@{BlessingSpell_modtype3}]]}} {{mod3=@{BlessingSpell_mod3}}} {{NPC=[[0]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RR-rep}Bless)}}"><span data-i18n="PRAY">Pray</span>
+								<button type="roll" class="sheet-roll-flex" name="roll_Bless" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{BlessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{blessingrange}}} {{spelltarget=Targets: @{blessingtarget}}} {{spellduration=Duration: @{blessingduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[{@{PrayChar}+@{PrayAdv}+@{PrayMisc}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{blessingdesc}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[7]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{mod1type=[[@{BlessingSpell_modtype1}]]}} {{mod1=@{BlessingSpell_mod1}}} {{mod2type=[[@{BlessingSpell_modtype2}]]}} {{mod2=@{BlessingSpell_mod2}}} {{mod3type=[[@{BlessingSpell_modtype3}]]}} {{mod3=@{BlessingSpell_mod3}}} {{NPC=[[0]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RR-rep}Bless)}}"><span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 
@@ -20841,7 +20841,7 @@
 								<input type="value" class="sheet-center" name="attr_targetbless" value="(@{Pray}+@{BlessMod})" disabled />
 							</div>
 							<div class="sheet-col-1-12 sheet-spell-button-group sheet-center sheet-pad-r-sm">
-								<button type="action" class="sheet-roll-flex" name="act_bless" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{BlessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{blessingrange}}} {{spelltarget=Targets: @{blessingtarget}}} {{spellduration=Duration: @{blessingduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[{@{PrayChar}+@{PrayAdv}+@{PrayMisc}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{blessingdesc}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[7]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{mod1type=[[@{BlessingSpell_modtype1}]]}} {{mod1=@{BlessingSpell_mod1}}} {{mod2type=[[@{BlessingSpell_modtype2}]]}} {{mod2=@{BlessingSpell_mod2}}} {{mod3type=[[@{BlessingSpell_modtype3}]]}} {{mod3=@{BlessingSpell_mod3}}} {{NPC=[[0]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RR-rep}Bless)}}"><span data-i18n="PRAY">Pray</span>
+								<button type="action" class="sheet-roll-flex" name="act_bless" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{BlessMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{blessingrange}}} {{spelltarget=Targets: @{blessingtarget}}} {{spellduration=Duration: @{blessingduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[{@{PrayChar}+@{PrayAdv}+@{PrayMisc}}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{blessingdesc}}} {{test=[[@{roll_rule}]]}} {{rolltype=[[7]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{mod1type=[[@{BlessingSpell_modtype1}]]}} {{mod1=@{BlessingSpell_mod1}}} {{mod2type=[[@{BlessingSpell_modtype2}]]}} {{mod2=@{BlessingSpell_mod2}}} {{mod3type=[[@{BlessingSpell_modtype3}]]}} {{mod3=@{BlessingSpell_mod3}}} {{NPC=[[0]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RR-rep}Bless)}}"><span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 
@@ -21068,13 +21068,13 @@
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_Miracle" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{MiracleMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{miraclerange}}} {{spelltarget=Targets: @{miracletarget}}} {{spellduration=Duration: @{miracleduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{miracledesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{rolltype=[[7]]}} {{mod1type=[[@{MiracleSpell_modtype1}]]}} {{mod1=@{MiracleSpell_mod1}}} {{mod2type=[[@{MiracleSpell_modtype2}]]}} {{mod2=@{MiracleSpell_mod2}}} {{mod3type=[[@{MiracleSpell_modtype3}]]}} {{mod3=@{MiracleSpell_mod3}}} {{NPC=[[3]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}Miracle)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_Miracle" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{MiracleMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{miraclerange}}} {{spelltarget=Targets: @{miracletarget}}} {{spellduration=Duration: @{miracleduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{miracledesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{rolltype=[[7]]}} {{mod1type=[[@{MiracleSpell_modtype1}]]}} {{mod1=@{MiracleSpell_mod1}}} {{mod2type=[[@{MiracleSpell_modtype2}]]}} {{mod2=@{MiracleSpell_mod2}}} {{mod3type=[[@{MiracleSpell_modtype3}]]}} {{mod3=@{MiracleSpell_mod3}}} {{NPC=[[3]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}Miracle)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm">
-								<button type="roll" class="sheet-roll-flex" name="roll_MiracleDmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{MiracleMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{miraclerange}}} {{spelltarget=Targets: @{miracletarget}}} {{spellduration=Duration: @{miracleduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{miracledesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{miracledamage}+@{Talent_HolyHatredLvl}]]}} {{praytest=true}} {{rolltype=[[8]]}} {{mod1type=[[@{MiracleSpell_modtype1}]]}} {{mod1=@{MiracleSpell_mod1}}} {{mod2type=[[@{MiracleSpell_modtype2}]]}} {{mod2=@{MiracleSpell_mod2}}} {{mod3type=[[@{MiracleSpell_modtype3}]]}} {{mod3=@{MiracleSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}MiracleDmg)}}">
+								<button type="roll" class="sheet-roll-flex" name="roll_MiracleDmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{MiracleMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{miraclerange}}} {{spelltarget=Targets: @{miracletarget}}} {{spellduration=Duration: @{miracleduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{miracledesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{miracledamage}+@{Talent_HolyHatredLvl}]]}} {{praytest=true}} {{rolltype=[[8]]}} {{mod1type=[[@{MiracleSpell_modtype1}]]}} {{mod1=@{MiracleSpell_mod1}}} {{mod2type=[[@{MiracleSpell_modtype2}]]}} {{mod2=@{MiracleSpell_mod2}}} {{mod3type=[[@{MiracleSpell_modtype3}]]}} {{mod3=@{MiracleSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}MiracleDmg)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -21292,13 +21292,13 @@
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="0" checked="checked" />							
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm">
-								<button type="action" class="sheet-roll-flex" name="act_miracle" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{MiracleMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{miraclerange}}} {{spelltarget=Targets: @{miracletarget}}} {{spellduration=Duration: @{miracleduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{miracledesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{rolltype=[[7]]}} {{mod1type=[[@{MiracleSpell_modtype1}]]}} {{mod1=@{MiracleSpell_mod1}}} {{mod2type=[[@{MiracleSpell_modtype2}]]}} {{mod2=@{MiracleSpell_mod2}}} {{mod3type=[[@{MiracleSpell_modtype3}]]}} {{mod3=@{MiracleSpell_mod3}}} {{NPC=[[3]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}Miracle)}}">
+								<button type="action" class="sheet-roll-flex" name="act_miracle" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{MiracleMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{miraclerange}}} {{spelltarget=Targets: @{miracletarget}}} {{spellduration=Duration: @{miracleduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{miracledesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{praytest=true}} {{rolltype=[[7]]}} {{mod1type=[[@{MiracleSpell_modtype1}]]}} {{mod1=@{MiracleSpell_mod1}}} {{mod2type=[[@{MiracleSpell_modtype2}]]}} {{mod2=@{MiracleSpell_mod2}}} {{mod3type=[[@{MiracleSpell_modtype3}]]}} {{mod3=@{MiracleSpell_mod3}}} {{NPC=[[3]]}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}Miracle)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
 							<input type="checkbox" name="attr_SpellDmg" class="sheet-hidden sheet-hider" value="1" />
 							<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm">
-								<button type="action" class="sheet-roll-flex" name="act_miracledmg" value="@{Whisper} &{template:wfrp4e} {{modvalue=[[?{@{translation_modifier}|@{MiracleMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{miraclerange}}} {{spelltarget=Targets: @{miracletarget}}} {{spellduration=Duration: @{miracleduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{miracledesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{miracledamage}+@{Talent_HolyHatredLvl}]]}} {{praytest=true}} {{rolltype=[[8]]}} {{mod1type=[[@{MiracleSpell_modtype1}]]}} {{mod1=@{MiracleSpell_mod1}}} {{mod2type=[[@{MiracleSpell_modtype2}]]}} {{mod2=@{MiracleSpell_mod2}}} {{mod3type=[[@{MiracleSpell_modtype3}]]}} {{mod3=@{MiracleSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}MiracleDmg)}}">
+								<button type="action" class="sheet-roll-flex" name="act_miracledmg" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|@{MiracleMod}}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[0]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{sin=[[@{Sin}]]}} {{title=@{spellname}}} {{character_name=@{character_name}}} {{spelltype=^{PRAYER}}} {{spellrange=Range: @{miraclerange}}} {{spelltarget=Targets: @{miracletarget}}} {{spellduration=Duration: @{miracleduration}}} {{target=[[ [[@{condgen}*-1]] [COND] + [[@{PrayChar}+@{PrayAdv}+@{PrayMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{spelldescription=@{miracledesc}}} {{test=[[@{roll_rule}]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{spelltest=[[1d10]]}} {{hitlocation=true}} {{spelldamage=[[@{miracledamage}+@{Talent_HolyHatredLvl}]]}} {{praytest=true}} {{rolltype=[[8]]}} {{mod1type=[[@{MiracleSpell_modtype1}]]}} {{mod1=@{MiracleSpell_mod1}}} {{mod2type=[[@{MiracleSpell_modtype2}]]}} {{mod2=@{MiracleSpell_mod2}}} {{mod3type=[[@{MiracleSpell_modtype3}]]}} {{mod3=@{MiracleSpell_mod3}}} {{NPC=[[0]]}} {{RTcrit=@{RT-crit}}} {{RTwrath=@{RT-wrath}}} {{reroll=@{RT-reroll}MiracleDmg)}}">
 									<span data-i18n="PRAY">Pray</span>
 								</button>
 							</div>
@@ -22822,7 +22822,7 @@
 						</div>	
 </div>
 
-	<rolltemplate class="sheet-rolltemplate-wfrp4e">
+	<rolltemplate class="sheet-rolltemplate-whfrp2e">
 		<div class="sheet-rt-card">
 			<div class="sheet-rt-header sheet-relative {{#chartest}} sheet-ability{{/chartest}}{{#skilltest}} sheet-action{{/skilltest}}{{#skilltest}} sheet-combat-actions{{/skilltest}}{{#healtest}} sheet-heal{{/healtest}}{{#attacktest}} sheet-attack{{/attacktest}}{{#fumbleroll}} sheet-weapon{{/fumbleroll}}{{#amputationroll}} sheet-weapon{{/amputationroll}}{{#critroll}} sheet-weapon{{/critroll}}{{#spelltest}} sheet-spell{{/spelltest}}{{#arcanemark}} sheet-spell{{/arcanemark}}{{#godmark}} sheet-spell{{/godmark}}{{#bloodloss}} sheet-action{{/bloodloss}}">
 				{{#character_name}}
@@ -34253,7 +34253,7 @@ on('clicked:meleeattackmain', (eventInfo) => {
    let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_MeleePrecise}+@{Used_MeleePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkMain}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Opposed Attack Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{ATTACK}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Opposed Attack Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttackMain)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{fast=[[@{Used_MeleeFast}]]}} {{slow=[[@{Used_MeleeSlow}]]}} {{hack=[[@{Used_MeleeHack}]]}} {{precise=[[@{Used_MeleePrecise}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[@{Used_MeleeTiring}]]}} {{penetrating=[[@{Used_MeleePenetrating}]]}} {{pummel=[[@{Used_MeleePummel}]]}} {{practical=[[@{Used_MeleePractical}]]}} {{wrap=[[@{Used_MeleeWrap}]]}} {{distract=[[@{Used_MeleeDistract}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll;
 
 				
@@ -34306,7 +34306,7 @@ on('clicked:meleechargemain', (eventInfo) => {
    let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_MeleePrecise}+@{Used_MeleePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkMain}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Charge Attack Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{CHARGE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Charge Attack Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}meleechargemain)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{fast=[[@{Used_MeleeFast}]]}} {{slow=[[@{Used_MeleeSlow}]]}} {{hack=[[@{Used_MeleeHack}]]}} {{precise=[[@{Used_MeleePrecise}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[0]]}} {{penetrating=[[@{Used_MeleePenetrating}]]}} {{pummel=[[@{Used_MeleePummel}]]}} {{practical=[[@{Used_MeleePractical}]]}} {{charge=true}} {{wrap=[[@{Used_MeleeWrap}]]}} {{distract=[[@{Used_MeleeDistract}]]}} ';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll;
 
 				
@@ -34352,7 +34352,7 @@ on('clicked:meleeopposedmain', (eventInfo) => {
    let roll = '{{test=[[@{roll_rule}]]}} {{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{DefensiveTotal}+@{Used_MeleePractical}+@{Talent_RiposteLvl}+@{Talent_ReversalLvl}+(@{Used_MeleeShield}*@{Talent_ShieldsmanLvl}) [SL TOTAL]]]}} {{sladd=[[0]]}} {{slbonusdef=[[@{slbonusDefMain}]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MeleeWeaponSkill}]] [SKILL] + ?{Opposed Defense Modifier|@{Used_MeleeBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{modvalue=[[?{Opposed Defense Modifier|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{attacktype=^{PARRY}}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{showdmg=[[@{Used_MeleeOpposedDmg}]]}} {{hitlocation=true}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{armorqualities=@{armorQuality}}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Melee_def_modtype1}]]}} {{mod1=@{Used_Melee_def_mod1}}} {{mod2type=[[@{Used_Melee_def_modtype2}]]}} {{mod2=@{Used_Melee_def_mod2}}} {{mod3type=[[@{Used_Melee_def_modtype3}]]}} {{mod3=@{Used_Melee_def_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeOpposedMain)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{RTriposte=@{RT-ripostedmgmain}}} {{hack=[[@{Used_MeleeHack}]]}} {{practical=[[@{Used_MeleePractical}]]}} {{shieldsman=[[@{Used_MeleeShield}*@{Talent_ShieldsmanLvl}]]}} {{defensive=[[@{DefensiveTotal}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[@{Used_MeleeTiring}]]}} {{penetrating=[[@{Used_MeleePenetrating}]]}} {{pummel=[[@{Used_MeleePummel}]]}} {{riposte=[[@{Talent_RiposteLvl}]]}} {{reversal=[[@{Talent_ReversalLvl}]]}} {{trapblade=[[@{Used_MeleeTrapBlade}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll;
 
 				
@@ -34407,7 +34407,7 @@ on('clicked:ripostedmgmain', (eventInfo) => {
    let roll = '{{ripostedmg}} {{lastunitdie=@{LastUnitDieMain}}} {{test=[[@{LastRollMain}]]}} {{title=^{RIPOSTE}}} {{character_name=@{character_name}}}{{unconscious=[[@{UnconsciousMod}]]}} {{attacktype=^{DAMAGE}}} {{attacktest=true}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{showdmg=[[1]]}} {{hitlocation=true}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{mod1type=[[@{Used_Melee_def_modtype1}]]}} {{mod1=@{Used_Melee_def_mod1}}} {{mod2type=[[@{Used_Melee_def_modtype2}]]}} {{mod2=@{Used_Melee_def_mod2}}} {{mod3type=[[@{Used_Melee_def_modtype3}]]}} {{mod3=@{Used_Melee_def_mod3}}} {{NPC=[[0]]}} {{hack=[[@{Used_MeleeHack}]]}} {{defensive=[[@{DefensiveTotal}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{penetrating=[[@{Used_MeleePenetrating}]]}} {{pummel=[[@{Used_MeleePummel}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll;
    let computed = v.LastUnitDieMain;
 				
@@ -34443,7 +34443,7 @@ on('clicked:meleeattackoff', (eventInfo) => {
    let roll = '{{test=[[@{roll_rule}]]}} {{sl=[[0]]}} {{slbonus=[[@{Used_DefensePrecise}+@{Used_DefensePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkOff}]]}} {{sladd=[[0]]}} {{modvalue=[[?{Opposed Attack Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{ATTACK}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[>ambi<]] [PEN] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Opposed Attack Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{offpen=[[>ambi<]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{reach=@{Used_DefenseReach}}} {{damaging=[[@{Used_DefenseDamaging}]]}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttackOff)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{fast=[[@{Used_DefenseFast}]]}} {{slow=[[@{Used_DefenseSlow}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{tiring=[[@{Used_DefenseTiring}]]}} {{penetrating=[[@{Used_DefensePenetrating}]]}} {{pummel=[[@{Used_DefensePummel}]]}} {{hack=[[@{Used_DefenseHack}]]}} {{precise=[[@{Used_DefensePrecise}]]}} {{impact=[[@{Used_DefenseImpact}]]}} {{practical=[[@{Used_DefensePractical}]]}} {{wrap=[[@{Used_DefenseWrap}]]}} {{distract=[[@{Used_DefenseDistract}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e} ';
+   let rollBegins = '@{Whisper} &{template:whfrp2e} ';
    let rollEnds = ' {{mod1type=[[@{Used_Defense_att_modtype1}]]}} {{mod1=@{Used_Defense_att_mod1}}} {{mod2type=[[@{Used_Defense_att_modtype2}]]}} {{mod2=@{Used_Defense_att_mod2}}} {{mod3type=[[@{Used_Defense_att_modtype3}]]}} {{mod3=@{Used_Defense_att_mod3}}}';
    let rollPart = roll.replaceAll('>ambi<', ambipen);
 				
@@ -34501,7 +34501,7 @@ on('clicked:meleechargeoff', (eventInfo) => {
    let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_DefensePrecise}+@{Used_DefensePractical} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusAtkOff}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Charge Attack Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{CHARGE}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Charge Attack Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_MeleeDamaging}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Defense_att_modtype1}]]}} {{mod1=@{Used_Defense_att_mod1}}} {{mod2type=[[@{Used_Defense_att_modtype2}]]}} {{mod2=@{Used_Defense_att_mod2}}} {{mod3type=[[@{Used_Defense_att_modtype3}]]}} {{mod3=@{Used_Defense_att_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}meleechargeoff)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{fast=[[@{Used_DefenseFast}]]}} {{slow=[[@{Used_DefenseSlow}]]}} {{hack=[[@{Used_DefenseHack}]]}} {{precise=[[@{Used_MeleePrecise}]]}} {{impact=[[@{Used_MeleeImpact}]]}} {{tiring=[[0]]}} {{penetrating=[[@{Used_DefensePenetrating}]]}} {{pummel=[[@{Used_DefensePummel}]]}} {{practical=[[@{Used_DefensePractical}]]}} {{charge=true}} {{wrap=[[@{Used_DefenseWrap}]]}} {{distract=[[@{Used_DefenseDistract}]]}} ';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll;
 
 				
@@ -34561,7 +34561,7 @@ on('clicked:meleeopposedoff', (eventInfo) => {
    let roll = '{{test=[[@{roll_rule}]]}} {{sl=[[0]]}} {{slbonus=[[@{DefensiveTotal}+@{Used_DefensePractical}+@{Talent_RiposteLvl}+@{Talent_ReversalLvl}+(@{Used_DefenseShield}*@{Talent_ShieldsmanLvl})]]}} {{sladd=[[0]]}} {{slbonusdef=[[@{slbonusDefOff}]]}} {{modvalue=[[?{Opposed Defense Modifier|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[>offpen<]] [PEN] + [[@{Used_DefenseWeaponSkill}]] [SKILL] + ?{Opposed Defense Modifier|@{Used_DefenseBonus}} [MOD] + [[@{Advantage}*10]] [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{reach=@{Used_DefenseReach}}} {{damaging=[[@{Used_DefenseDamaging}]]}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{offpen=[[>offpen<]]}} {{qualities=@{Used_DefenseQualities}}} {{showdmg=[[@{Used_DefenseOpposedDmg}]]}} {{hitlocation=true}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{armorqualities=@{armorQuality}}} {{attacktype=^{PARRY}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{RTriposte=@{RT-ripostedmgoff}}} {{reroll=@{RT-reroll}MeleeOpposedOff)}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{hack=[[@{Used_DefenseHack}]]}} {{shieldsman=[[@{Used_DefenseShield}*@{Talent_ShieldsmanLvl}]]}} {{practical=[[@{Used_DefensePractical}]]}} {{impact=[[@{Used_DefenseImpact}]]}} {{tiring=[[@{Used_DefenseTiring}]]}} {{penetrating=[[@{Used_DefensePenetrating}]]}} {{pummel=[[@{Used_DefensePummel}]]}} {{defensive=[[@{DefensiveTotal}]]}} {{riposte=[[@{Talent_RiposteLvl}]]}} {{reversal=[[@{Talent_ReversalLvl}]]}} {{trapblade=[[@{Used_DefenseTrapBlade}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll.replaceAll('>offpen<', offpen);
 
 				
@@ -34611,7 +34611,7 @@ on('clicked:ripostedmgoff', (eventInfo) => {
    let roll = '{{ripostedmg}} {{lastunitdie=@{LastUnitDieOff}}} {{test=[[@{LastRollOff}]]}} {{title=^{RIPOSTE}}} {{character_name=@{character_name}}}{{unconscious=[[@{UnconsciousMod}]]}} {{attacktype=^{DAMAGE}}} {{attacktest=true}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{showdmg=[[1]]}} {{hitlocation=true}} {{damage=[[@{Used_DefenseStrengthBonus}+@{Used_DefenseDamageBonus}]]}} {{damaging=[[@{Used_DefenseDamaging}]]}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{NPC=[[0]]}} {{hack=[[@{Used_DefenseHack}]]}} {{defensive=[[@{DefensiveTotal}]]}} {{impact=[[@{Used_DefenseImpact}]]}} {{penetrating=[[@{Used_DefensePenetrating}]]}} {{pummel=[[@{Used_DefensePummel}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll;
    let computed = v.LastUnitDieOff;
 				
@@ -34639,7 +34639,7 @@ on('clicked:rangedatk', (eventInfo) => {
    let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_RangedPrecise}+@{Used_RangedPractical}-@{Used_RangedImprecise} [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusRgd}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Ranged Attack Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[10*@{Used_RangedAccurate}]] [TALENTS] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{damaging=[[@{Used_RangedDamaging}]]}} {{reach=@{Used_WeaponRange}}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}+@{Talent_AccurateShotLvl}]]}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAtk)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}} {{precise=[[@{Used_RangedPrecise}]]}} {{imprecise=[[@{Used_RangedImprecise}]]}} {{blast=[[@{Used_RangedBlast}*@{Used_RangedBlastRating}]]}} {{repeater=[[@{Used_RangedRepeater}*@{Used_RangedRepeaterRating}]]}} {{entangle=[[@{Used_RangedEntangle}]]}} {{penetrating=[[@{Used_RangedPenetrating}]]}} {{tiring=[[0]]}} {{blackpowder=[[@{Used_RangedBlackpowder}]]}} {{practical=[[@{Used_RangedPractical}]]}} {{accurate=[[@{Used_RangedAccurate}*10]]}} {{hack=[[@{Used_RangedHack}]]}} {{dangerous=[[@{Used_RangedDangerous}]]}} {{impact=[[@{Used_RangedImpact}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll;
 				
         startRoll(rollBegins + rollPart, (results) => {
@@ -34682,7 +34682,7 @@ on('clicked:rangedweaponrld', (eventInfo) => {
    let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Talent_GunnerLvl} [SL TOTAL]]]}} {{slbonusatk=[[@{Talent_GunnerLvl}]]}} {{sladd=[[0]]}} {{test=[[@{roll_rule}]]}} {{modvalue=[[?{Reload Roll Modifier|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{RELOAD}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_RangedBalisticSkill}]] [SKILL] + [[@{Advantage}*10]] [ADV] +?{Reload Roll Modifier|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} {{hitlocation=true}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{reach=@{Used_WeaponRange}}} {{qualities=@{Used_RangedQualities}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedWeaponRld)}} {{reload=[[1]]}} {{reloadrating=[[@{Used_RangedReloadRatingInput}*@{Used_RangedReload}]]}} {{gunner=[[@{Talent_GunnerLvl}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll;
 
 				
@@ -34733,7 +34733,7 @@ on('clicked:repeating_spellbookpetty:spellcast clicked:repeating_spellbookpetty:
    var prefix = eventInfo.triggerName.slice(8, -13);}
    
    var skillcap = skill.toUpperCase();
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollDmg = rollDmgPart.replaceAll('prefix2-', `${prefix}`);
    let rollPart = roll.replaceAll('prefix2-', `${prefix}`);
    
@@ -34783,7 +34783,7 @@ on('clicked:repeating_spellbookarcane:spellcast clicked:repeating_spellbookarcan
    if (skill === "spellcastdmg") {rollDmgPart = ' {{hitlocation=true}} {{spelldamage=[[@{prefix2-_spelldamage}+@{prefix2-_spelldamagewb}]]}}';
    var prefix = eventInfo.triggerName.slice(8, -13);}
    
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollDmg = rollDmgPart.replaceAll('prefix2-', `${prefix}`);
    let rollPart = roll.replaceAll('prefix2-', `${prefix}`);
    
@@ -34833,7 +34833,7 @@ on('clicked:repeating_spellbookarcane:extchannellingloreroll', (eventInfo) => {
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = eventInfo.triggerName.slice(8, -23);
    
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll.replaceAll('prefix2-', `${prefix}`);
    
                console.log("Test Skill");	
@@ -34879,7 +34879,7 @@ on('clicked:repeating_divineblessings:bless', (eventInfo) => {
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = eventInfo.triggerName.slice(8, -6);
    
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll.replaceAll('prefix2-', `${prefix}`);
    
 				
@@ -34926,7 +34926,7 @@ on('clicked:repeating_divinemiracles:miracle clicked:repeating_divinemiracles:mi
    if (skill === "miracledmg") {rollDmgPart = ' {{hitlocation=true}} {{spelldamage=[[@{prefix2-_miracledamage}+@{Talent_HolyHatredLvl}]]}}';
    var prefix = eventInfo.triggerName.slice(8, -11);}
    
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollDmg = rollDmgPart.replaceAll('prefix2-', `${prefix}`);
    let rollPart = roll.replaceAll('prefix2-', `${prefix}`);
    
@@ -34971,7 +34971,7 @@ on('clicked:repeating_divinemiracles:miracle clicked:repeating_divinemiracles:mi
    var trigger = eventInfo.triggerName.slice(8);
    var triggercap = trigger.toUpperCase();		
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPartPart = roll.replaceAll('>Char<', trigger);
    let rollPart = rollPartPart.replaceAll('>Charcap<', triggercap);
    
@@ -35014,7 +35014,7 @@ on('clicked:repeating_divinemiracles:miracle clicked:repeating_divinemiracles:mi
    var trigger = eventInfo.triggerName.slice(8);
    var triggercap = trigger.toUpperCase();		
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPartPart = roll.replaceAll('>Char<', trigger);
    let rollPart4 = rollPartPart.replaceAll('>Charcap<', triggercap);
    
@@ -35154,7 +35154,7 @@ on('clicked:repeating_divinemiracles:miracle clicked:repeating_divinemiracles:mi
    var trigger = eventInfo.triggerName.slice(8);
    var triggercap = trigger.toUpperCase();		
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPartPart = roll.replaceAll('>Char<', trigger);
    let rollPart2 = rollPartPart.replaceAll('>Charcap<', triggercap);
 
@@ -35237,7 +35237,7 @@ on('clicked:repeating_divinemiracles:miracle clicked:repeating_divinemiracles:mi
    var skillpre = trigger.split('_').slice(-1);
    var skill = skillpre[0].slice(0, -14);
    var skillcap = skill.toUpperCase();
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart3 = roll.replaceAll('prefix-', `${trigger}`).replaceAll('prefix2-', `${prefix2}`).replaceAll('>Skill<', `${skillcap}`);
 
 	if (skill === 'stealth') {var pen = '[SKILL] + [[(@{armormailpenalty}+@{armorplatepenalty}+@{armorplatelegspenalty})*-1]] [PEN]';}
@@ -35299,7 +35299,7 @@ on('clicked:repeating_divinemiracles:miracle clicked:repeating_divinemiracles:mi
    var skillpre = trigger.split('_');
    var skill = skillpre[3];
    var skillcap = skill.toUpperCase();
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart2 = roll.replaceAll('prefix-', `${trigger}`).replaceAll('>Skill<', `${skillcap}`);
 
 	if (skill === 'language') {cond = '{{cond=[[@{condgen_see}]]}}  {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}}';
@@ -35368,7 +35368,7 @@ on('clicked:initiative_houserule0', (eventInfo) => {
    let roll = '{{modvalue=[[?{@{translation_modifier}|0}]]}} {{sl=[[0]]}} {{slbonus=[[0]]}} {{sladd=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{target=[[ @{Initiative} [INIT] +?{@{translation_modifier}|0} [MOD] ]]}} {{chartest=true}} {{test=[[@{roll_rule}&{tracker}]]}} {{SLmod=[[?{SL Modifier|0}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll;
 
 				
@@ -35407,7 +35407,7 @@ on('clicked:initiative_houserule1', (eventInfo) => {
    let roll = '{{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[1d10 [d10] +(@{Initiative} [INIT] +?{@{translation_modifier}|0})&{tracker}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll;
 
 				
@@ -35434,7 +35434,7 @@ on('clicked:initiative_houserule2', (eventInfo) => {
    let roll = '{{unconscious=[[@{UnconsciousMod}]]}} {{title=^{INITIATIVE}}} {{character_name=@{character_name}}} {{inittest=[[[[1d10]] [d10] +[[floor((@{Agility})/10)]] [AGIB] +[[floor((@{Initiative}+?{@{translation_modifier}|0})/10)]] [INITB] &{tracker}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll;
 
 				
@@ -35461,7 +35461,7 @@ on('clicked:criticaltest', (eventInfo) => {
    let roll = '{{unconscious=[[@{UnconsciousMod}]]}} {{title=Critical Roll}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{critlocation=[[?{Choose a Hit Location|Random (1d100),[[1d100]]|Head,1|Right Arm,10|Left Arm,30|Body,46|Right Leg,85|Left Leg,96}]]}} {{critroll=[[1d(100+?{Crit Roll Modifier|0})]]}} {{modvalue=[[?{Crit Roll Modifier|0}]]}} {{critdmgbonus=[[@{Talent_StrikeToInjureLvl} [STRIKE TO INJURE]]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll;
 				
         startRoll(rollBegins + rollPart, (results) => {
@@ -35484,7 +35484,7 @@ on('clicked:fumbletest', (eventInfo) => {
    let roll = '{{unconscious=[[@{UnconsciousMod}]]}} {{title=^{FUMBLE}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{fumbleroll=[[1d100]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll;
 
 				
@@ -35508,7 +35508,7 @@ on('clicked:AmputationTest', (eventInfo) => {
    let roll = '{{modvalue=[[?{@{translation_modifier}|0}]]}} {{sl=[[0]]}} {{slbonus=[[0]]}} {{sladd=[[0]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_move}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{deafened=[[0]]}} {{title=^{AMPUTATION}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{amputationroll=true}} {{test=[[@{roll_rule}]]}} {{target=[[ [[@{condgen_move}*-1]] [COND] + [[@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}]] [SKILL] + ?{@{translation_modifier}|0} [MOD] ]]}} {{SLmod=[[?{SL Modifier|0}]]}}';
    var trigger = eventInfo.triggerName.slice(8);
    var prefix = trigger.split('_').slice(0,3).join('_') + '_';
-   let rollBegins = '@{Whisper} &{template:wfrp4e}';
+   let rollBegins = '@{Whisper} &{template:whfrp2e}';
    let rollPart = roll;