From 7d20a358eae2f64e24f32d2ddffe3900d3cc2bce Mon Sep 17 00:00:00 2001
From: Nic Bradley <nic.m.bradley@gmail.com>
Date: Sat, 20 Feb 2021 12:54:28 -0800
Subject: [PATCH] WFRPv1.04

---
 .../.gitignore                                |   3 +
 .../README.md                                 |  10 +
 .../package.json                              |  30 +
 .../src/js/dragndrop.js                       |   6 -
 .../src/js/helperfunctions.js                 |   2 +
 .../src/js/sheetworkers.js                    | 156 ++--
 .../src/pug/abstracts.pug                     |   4 +-
 .../src/pug/components/_component-index.pug   |   3 +-
 .../src/pug/components/control.pug            |   4 +-
 .../repeating/npc-additional-skill.pug        |  13 +
 .../pug/components/repeating/spell-row.pug    |   6 +-
 .../src/pug/components/skill-grouped.pug      |  18 +-
 .../src/pug/layout/npc.pug                    |  21 +-
 .../src/pug/layout/pc.pug                     |   6 +
 .../src/pug/layout/settings.pug               |  10 +-
 .../src/pug/rolls.pug                         |  33 +-
 .../src/pug/rolltemplates.pug                 |  26 +-
 .../src/pug/wfrp4.pug                         |   8 +-
 .../src/scss/_abstracts.scss                  |   4 +-
 .../src/scss/_rolltemplates.scss              |   4 +
 .../src/scss/control/_hide.scss               |  12 +
 .../src/scss/layout/_npc.scss                 |  31 +-
 .../src/scss/layout/pc/_pc.scss               |   4 +-
 .../src/scss/styling/_form_fields.scss        |  17 +
 .../src/scss/styling/_panel.scss              |   2 +-
 .../translation.json                          |  14 +
 .../wfrp4.css                                 |  50 +-
 .../wfrp4.html                                | 682 ++++++++++++------
 28 files changed, 864 insertions(+), 315 deletions(-)
 create mode 100644 Warhammer Fantasy Roleplay 4e Official/.gitignore
 create mode 100644 Warhammer Fantasy Roleplay 4e Official/README.md
 create mode 100644 Warhammer Fantasy Roleplay 4e Official/package.json
 create mode 100644 Warhammer Fantasy Roleplay 4e Official/src/pug/components/repeating/npc-additional-skill.pug

diff --git a/Warhammer Fantasy Roleplay 4e Official/.gitignore b/Warhammer Fantasy Roleplay 4e Official/.gitignore
new file mode 100644
index 0000000000..d3f9e9e331
--- /dev/null
+++ b/Warhammer Fantasy Roleplay 4e Official/.gitignore	
@@ -0,0 +1,3 @@
+.DS_Store
+node_modules
+package-lock.json
\ No newline at end of file
diff --git a/Warhammer Fantasy Roleplay 4e Official/README.md b/Warhammer Fantasy Roleplay 4e Official/README.md
new file mode 100644
index 0000000000..c1753c1d7f
--- /dev/null
+++ b/Warhammer Fantasy Roleplay 4e Official/README.md	
@@ -0,0 +1,10 @@
+# wfrp4e-official
+The Working Repository for the official Warhammer Fantasy Roleplay 4th Edition Character Sheet
+
+## File Structure
+
+This sheet is developed using NPM and compiled languages (Pug and SCSS); understanding of these technologies is required. 
+
+Dependencies are outlined in the package.json. Just use `npm install` to download them.
+
+Start the compiles for SCSS & PUG with `npm start`.
\ No newline at end of file
diff --git a/Warhammer Fantasy Roleplay 4e Official/package.json b/Warhammer Fantasy Roleplay 4e Official/package.json
new file mode 100644
index 0000000000..0207a333ad
--- /dev/null
+++ b/Warhammer Fantasy Roleplay 4e Official/package.json	
@@ -0,0 +1,30 @@
+{
+  "name": "wfrp4e-official",
+  "version": "1.0.4",
+  "description": "The Official sheet development for Warhammer Fantasy Roleplay 4th Edititon",
+  "main": "index.js",
+  "dependencies": {
+    "npm-run-all": "^4.1.5",
+    "pug": "^3.0.0",
+    "sass": "^1.32.7"
+  },
+  "devDependencies": {},
+  "scripts": {
+    "start": "npm-run-all --parallel compile:sass compile:pug",
+    "compile:sass": "sass src/scss/wfrp4.scss wfrp4.css --no-source-map --watch",
+    "compile:pug": "pug src/pug/wfrp4.pug --out . -P -w"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/nmbradley/wfrp4e-official.git"
+  },
+  "keywords": [
+    "Roll20"
+  ],
+  "author": "Nic Bradley",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/nmbradley/wfrp4e-official/issues"
+  },
+  "homepage": "https://github.com/nmbradley/wfrp4e-official#readme"
+}
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/js/dragndrop.js b/Warhammer Fantasy Roleplay 4e Official/src/js/dragndrop.js
index 2f2995df73..bcbad9ca49 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/js/dragndrop.js	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/js/dragndrop.js	
@@ -182,8 +182,6 @@ const wfrpDragAndDrop = ( () => {
             updateAttrs[`${characteristic.replace(/ /g,"_")}_bonus`] = Math.floor(characteristics[characteristic]/10);
         } 
 
-        console.log(updateAttrs);
-
         const trait_map = new Map();
 
         for (const trait of traits) {
@@ -495,8 +493,6 @@ const wfrpDragAndDrop = ( () => {
         }
 
         getAttrs(token_values, settings => {
-
-            console.log(settings)
             
             const default_attr = {
                 width: 70,
@@ -511,8 +507,6 @@ const wfrpDragAndDrop = ( () => {
 
             getAttrs(attrs, values => {
 
-                console.log(values)
-
                 for (const item in settings) {    
                     if (settings[item] !== "") {
                         default_attr[item] = settings[item];
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/js/helperfunctions.js b/Warhammer Fantasy Roleplay 4e Official/src/js/helperfunctions.js
index b64733c066..11db4bb034 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/js/helperfunctions.js	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/js/helperfunctions.js	
@@ -1,3 +1,5 @@
+
+
 const helperFunctions = (() => {
 
     const extractRepeatingId = (attribute, section) => {
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/js/sheetworkers.js b/Warhammer Fantasy Roleplay 4e Official/src/js/sheetworkers.js
index eebae94bf6..294a78997e 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/js/sheetworkers.js	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/js/sheetworkers.js	
@@ -3,7 +3,7 @@ const wfrpModule = ( () => {
     // Global Variables
 
     const wfrp = {
-        sheet_version: "1.0.3",
+        sheet_version: "1.0.4",
 
         characteristics: [
             "weapon_skill",
@@ -96,6 +96,7 @@ const wfrpModule = ( () => {
             "explosives",
             "sling",
             "throwing",
+            "azyr",
             "aqshy",
             "chamon",
             "dhar",
@@ -104,7 +105,8 @@ const wfrpModule = ( () => {
             "hysh",
             "shyish",
             "ulgu",
-            "magick"
+            "magick",
+            "custom"
         ],
 
         repeating_skills: [
@@ -137,7 +139,10 @@ const wfrpModule = ( () => {
 
     const initSheet = () => {
 
-        wfrp.characteristics.forEach(char => calculateCharacteristic(char));
+        wfrp.characteristics.forEach(char => {
+            calculateCharacteristic(char)
+            recalculateAttribute(`${char}_modifier`, char);
+        });
 
         wfrp.skills.forEach(skill => calculateSkill(skill));
 
@@ -188,7 +193,7 @@ const wfrpModule = ( () => {
         let slbonus = "";
 
         if (new_value === "1") {
-            query = "?{Bonus|0}";
+            query = "?{Target Bonus|0}";
             slbonus = "{{sl_bonus=?{SL Bonus|0}}}"
         }
         
@@ -217,10 +222,10 @@ const wfrpModule = ( () => {
     }
 
     const toggleInitOption = (new_value) => {
-        const init = (new_value === "1") ? `{{init=[[@{initiative} &{tracker}]]}}` :
-                     (new_value === "2") ? `{{init=[[@{initiative}+1d10 &{tracker}]]}}` :
-                     (new_value === "3") ? `{{init=[[@{agility_bonus}+@{initiative_bonus}+1d10 &{tracker}]]}}` :
-                     `{{init=[[@{initiative}]]}}`;
+        const init = (new_value === "1") ? `{{init=[[@{initiative}+@{init_bonus} &{tracker}]]}}` :
+                     (new_value === "2") ? `{{init=[[@{initiative}+1d10+@{init_bonus} &{tracker}]]}}` :
+                     (new_value === "3") ? `{{init=[[@{agility_bonus}+@{initiatve_bonus}+1d10+@{init_bonus} &{tracker}]]}}` :
+                     `{{init=[[@{initiative}+@{init_bonus}]]}}`;
 
         setAttrs({roll_init:init});
     }
@@ -266,7 +271,7 @@ const wfrpModule = ( () => {
     }
 
     const recalculateAttribute = (attribute, query) => {
-        const attrs = [...wfrp.characteristics, ...wfrp.characteristics.map(item => `${item}_bonus`)];
+        const attrs = [...wfrp.characteristics, ...wfrp.characteristics.map(item => `${item}_bonus`), ...wfrp.characteristics.map(item => `${item}_custom_mod`)];
         let match_array = [query];
         const parsed_query = query.replace(/ /g, "_");
 
@@ -346,6 +351,8 @@ const wfrpModule = ( () => {
                         }
                     });
 
+                    if (wfrp.characteristics.includes(query)) mod_array.push(+values[`${parsed_query}_custom_mod`]);
+
                     const new_value = mod_array.reduce((a,b) => a+b, 0);
 
                     setAttrs({[attribute]:new_value});
@@ -367,6 +374,9 @@ const wfrpModule = ( () => {
             size: 0
         }
 
+        if (new_value === "") {
+            return;
+        }
         if (new_value === "human") {
             update["fate"] = 2;
             update["resilience"] = 1;
@@ -397,6 +407,12 @@ const wfrpModule = ( () => {
             update["movement"] = 5;
             update["size"] = "average";
         }
+        if (new_value === "gnome") {
+            update["fate"] = 2;
+            update["resilience"] = 0;
+            update["movement"] = 3;
+            update["size"] = "small";
+        }
 
         if (new_value !== "custom") {
 
@@ -404,15 +420,14 @@ const wfrpModule = ( () => {
                 const skills = helperFunctions.parseJSON(page.data.Skills);
                 const talents = helperFunctions.parseJSON(page.data.Talents);
     
-                let skills_fixed = [];
-                let talents_fixed = [];
+                const skills_fixed = skills.Fixed.split(",").map(item=>item.trim()) || [];
+                const talents_fixed = talents.Fixed.split(",").map(item=>item.trim()) || [];
+    
                 let talents_choices = [];
     
                 let skill_index = 1;
                 let talent_index = 1;
                 
-                if (skills.Fixed) skills_fixed = skills.Fixed.split(",").map(item=>item.trim());
-                if (talents.Fixed) talents_fixed = talents.Fixed.split(",").map(item=>item.trim());
                 if (talents.Choices) talents.Choices.forEach(choice => talents_choices = [...talents_choices, ...choice]);
     
                 for (let index = 1; index <= 12; index++) {
@@ -442,8 +457,10 @@ const wfrpModule = ( () => {
                     update[`species_talent_${talent_index}_advances`] = "0";
                     talent_index++;
                 }
+
+                update["advances_changed"] = 1;
     
-                setAttrs(update, {silent:true}, callback => calculateTalentAdvances());
+                setAttrs(update, {silent:true});
             });
 
         } else {
@@ -497,7 +514,7 @@ const wfrpModule = ( () => {
             const initial = parseInt(values[`${characteristic}_initial`]) || 0;
             const advances = parseInt(values[`${characteristic}_advances`]) || 0;
             const modifier = parseInt(values[`${characteristic}_modifier`]) || 0;
-            const custom_mod = parseInt(values[`${characteristic}_custom_mod`]) || 0;
+            // const custom_mod = parseInt(values[`${characteristic}_custom_mod`]) || 0;
             const bonusmod = parseInt(values[`${characteristic}_bonusmod`]) || 0;
 
             if (values["npc"] === "on") {
@@ -513,7 +530,7 @@ const wfrpModule = ( () => {
                 return;
             } else {
 
-                const current = initial + advances + modifier + custom_mod;
+                const current = initial + advances + modifier;
     
                 const bonus = Math.floor(current / 10) + bonusmod;
     
@@ -1167,7 +1184,7 @@ const wfrpModule = ( () => {
         });   
     }
 
-    const calculateSkillAdvances = (skill) => {
+    const calculateSkillAdvances = () => {
         getSectionIDs("careers", id_array => {
 
             getSectionIDs("noncareer-skills", id_array_2 => {
@@ -1346,7 +1363,7 @@ const wfrpModule = ( () => {
 
                                 const key_array = Object.keys(values).filter(item => item !== "");
 
-                                let page_name = key.split("(")[0].trim() || key;
+                                let page_name = key.trim() || key;
 
                                 if (value_array_test.includes(page_name.toLowerCase())) {
                                     const index = value_array_test.indexOf(page_name.toLowerCase());
@@ -1389,7 +1406,7 @@ const wfrpModule = ( () => {
     const calculateInitColumns = (source_attribute, new_value) => {
         const attrs = [];
         const source_type = (source_attribute.match(/talent/g)) ? "talent" :
-                            (source_attribute.match(/skill/g)) ? "skill" :
+                            (source_attribute.match(/career_skill/g)) ? "skill" :
                             false;
         const source_id = helperFunctions.extractRepeatingId(source_attribute, "careers");
         const is_init = source_attribute.match(/init/);
@@ -1410,6 +1427,7 @@ const wfrpModule = ( () => {
 
         getAttrs(attrs, values => {
             const spent = Object.values(values).filter(item => item !== "").map(item => parseInt(item));
+            if (spent.length === 0) return;
             const total = spent.reduce((a,b) => a+b) || 0;
             const maximum_allowed = (source_type === "skill") ? 40 : 1;
             
@@ -1423,6 +1441,14 @@ const wfrpModule = ( () => {
 
     }
 
+    const updateAdvances = () => {
+        wfrp.characteristics.forEach(characteristic => calculateCharacteristicAdvances(characteristic));
+        calculateSkillAdvances();
+        calculateTalentAdvances();
+
+        setAttrs({advances_changed:0});
+    }
+
     // Trappings, Weapons & Armor Functions
 
     const calculateArmour = () => {
@@ -1548,9 +1574,9 @@ const wfrpModule = ( () => {
                         armour_array.forEach(id => {
                             const worn = values[`repeating_armour_${id}_armour_worn`] || false;
                             const enc = parseInt(values[`repeating_armour_${id}_armour_enc`])
-                            const total = (worn === "on") ? enc - 1 : enc || 0
+                            const total = (enc > 0 && worn === "on") ? enc - 1 : enc || 0
 
-                            total_enc += total >= 0 ? total : 0;
+                            total_enc += total;
                         });
 
                         weapons_array.forEach(id => {
@@ -1565,9 +1591,9 @@ const wfrpModule = ( () => {
                             const worn = values[`repeating_trappings_${id}_trappings_worn`] || false;
                             const inenc = values[`repeating_trappings_${id}_trappings_inenc`] || "0";
 
-                            const total = (worn === "on") ? (enc - 1) * amount : enc * amount;
+                            const total = (enc > 0 && worn === "on") ? (enc - 1) * amount : enc * amount;
 
-                            if (inenc === "on") total_enc += total >= 0 ? total : 0;
+                            if (inenc === "on") total_enc += total;
                         });
 
                         setAttrs({encumbrance:total_enc})
@@ -1845,6 +1871,11 @@ const wfrpModule = ( () => {
             "intuition",
             "perception",
             "cool",
+            "npc_dodge",
+            "npc_endurance",
+            "npc_intuition",
+            "npc_perception",
+            "npc_cool",
             ...wfrp.characteristics
         ];
 
@@ -1852,11 +1883,31 @@ const wfrpModule = ( () => {
             if (values[`NPC`] === "0") return;
             const update = {};
 
-            if (!values[`dodge`]) update[`dodge`] = values[`agility`];
-            if (!values[`endurance`]) update[`endurance`] = values[`toughness`];
-            if (!values[`intuition`]) update[`intuition`] = values[`initiative`];
-            if (!values[`perception`]) update[`perception`] = values[`initiative`];
-            if (!values[`cool`]) update[`cool`] = values[`willpower`];
+            const dodge = (values["dodge"]) ? values["dodge"] :
+                            (values["npc_dodge"]) ? values["npc_dodge"] : 
+                            values["agility"];
+
+            const endurance = (values["endurance"]) ? values["endurance"] :
+                            (values["npc_endurance"]) ? values["npc_endurance"] : 
+                            values["toughness"];
+
+            const intuition = (values["intuition"]) ? values["intuition"] :
+                            (values["npc_intuition"]) ? values["npc_intuition"] : 
+                            values["initiative"];
+
+            const perception = (values["perception"]) ? values["perception"] :
+                            (values["npc_perception"]) ? values["npc_perception"] : 
+                            values["initiative"];
+
+            const cool = (values["cool"]) ? values["cool"] :
+                            (values["npc_cool"]) ? values["npc_cool"] : 
+                            values["willpower"];
+
+            update[`npc_dodge`] = dodge;
+            update[`npc_endurance`] = endurance;
+            update[`npc_intuition`] = intuition;
+            update[`npc_perception`] = perception;
+            update[`npc_cool`] = cool;
 
             setAttrs(update);
 
@@ -1877,6 +1928,7 @@ const wfrpModule = ( () => {
         toggleRollCrits:toggleRollCrits,
         toggleInitOption:toggleInitOption,
         toggleWhisper:toggleWhisper,
+        recalculateAttribute:recalculateAttribute,
         parseModField:parseModField,
 
         // Class and Species Controls
@@ -1891,7 +1943,6 @@ const wfrpModule = ( () => {
         // Skill Functions
         calculateSkill: calculateSkill,
         calculateSpecialisation: calculateSpecialisation,
-        //updateRepeatingSkillBase: updateRepeatingSkillBase,
         recalculateRepeatingSkill: recalculateRepeatingSkill,
         cascadeSkillChanges:cascadeSkillChanges,
 
@@ -1900,18 +1951,19 @@ const wfrpModule = ( () => {
         updateCurrentCareer: updateCurrentCareer,
         updateCurrentCareerLevel: updateCurrentCareerLevel,
         updateCareerNames: updateCareerNames,
-        updateFirstCareer:updateFirstCareer,
+        updateFirstCareer: updateFirstCareer,
 
         // Experience Functions
-        calculateTotalAdvances:calculateTotalAdvances,
-        recalculateEarnedXP:recalculateEarnedXP,
-        recalculateCurrentXP:recalculateCurrentXP,
-        recalculateSpentXP:recalculateSpentXP,
         calculateCharacteristicAdvances:calculateCharacteristicAdvances,
         calculateSkillAdvances:calculateSkillAdvances,
         calculateTalentAdvances:calculateTalentAdvances,
+        calculateTotalAdvances:calculateTotalAdvances,
         calculateInitColumns:calculateInitColumns,
         consolidateXP:consolidateXP,
+        recalculateEarnedXP:recalculateEarnedXP,
+        recalculateCurrentXP:recalculateCurrentXP,
+        recalculateSpentXP:recalculateSpentXP,
+        updateAdvances: updateAdvances,
 
         // Trappings, Weapons & Armor Functions
         calculateArmour:calculateArmour,
@@ -1960,7 +2012,11 @@ on(`change:setting_whisper`, eventInfo => wfrpModule.toggleWhisper(eventInfo.new
     "repeating_weapon:weapon_mods",
     "repeating_armour:armour_mods",
 ].forEach(modifier => {
-    on(`change:${modifier}`, eventInfo => wfrpModule.parseModField(eventInfo.newValue, eventInfo.previousValue))
+    on(`change:${modifier}`, eventInfo => wfrpModule.parseModField(eventInfo.newValue, eventInfo.previousValue));
+});
+
+wfrpModule.wfrp.characteristics.forEach(characteristic => {
+    on(`change:${characteristic}_custom_mod`, eventInfo => wfrpModule.recalculateAttribute(`${characteristic}_modifier`, characteristic));
 });
 
 // CLASS AND SPECIES CONTROLS
@@ -2012,6 +2068,8 @@ wfrpModule.wfrp.repeating_skills.forEach(section => {
 
 // CAREERS CHANGES
 
+on(`clicked:update_advances`, eventInfo => wfrpModule.updateAdvances());
+
 on(`change:repeating_careers change:_reporder:careers`, eventInfo => {
     if (eventInfo.sourceType === "player" && !eventInfo.sourceAttribute.match(/reporder/g)) wfrpModule.calculateTotalAdvances(eventInfo.sourceAttribute);
     wfrpModule.updateCareerPath();
@@ -2044,36 +2102,34 @@ on(`change:current_xp change:spent_xp change:total_xp remove:repeating_experienc
 
 on(`change:repeating_experience change:repeating_experiencespent change:experience_mod remove:repeating_experiencespent remove:repeating_experience`, eventInfo => wfrpModule.recalculateSpentXP());
 
+const advance_triggers = []
+
 wfrpModule.wfrp.characteristics.forEach(characteristic => {
-    on(`change:repeating_careers:career_${characteristic}_advances change:repeating_careers:career_${characteristic}_init`, eventInfo => wfrpModule.calculateCharacteristicAdvances(characteristic))
+    advance_triggers.push(`change:repeating_careers:career_${characteristic}_advances change:repeating_careers:career_${characteristic}_init`)
 });
 
 [1,2,3,4].forEach(level => {
     [1,2,3,4,5].forEach(talent => {
-        on(`change:repeating_careers:career_talent_${level}_${talent}_name 
-            change:repeating_careers:career_talent_${level}_${talent}_init 
-            change:repeating_careers:career_talent_${level}_${talent}_advances`, 
-            eventInfo => wfrpModule.calculateTalentAdvances());
+        advance_triggers.push(`change:repeating_careers:career_talent_${level}_${talent}_name change:repeating_careers:career_talent_${level}_${talent}_init change:repeating_careers:career_talent_${level}_${talent}_advances`)
     });
 
     [1,2,3,4,5,6,7,8,9,10].forEach(skill => {
-        on(`change:repeating_careers:career_skill_${level}_${skill}_name 
-            change:repeating_careers:career_skill_${level}_${skill}_init 
-            change:repeating_careers:career_skill_${level}_${skill}_advances`, 
-            eventInfo => wfrpModule.calculateSkillAdvances());
+        advance_triggers.push(`change:repeating_careers:career_skill_${level}_${skill}_name change:repeating_careers:career_skill_${level}_${skill}_init change:repeating_careers:career_skill_${level}_${skill}_advances`);
     });
 });
 
 for (let index = 1; index <= 12; index++) {
-    on(`clicked:remove_skill_${index}`, eventInfo => setAttrs({[`species_skill_${index}_advances`]:"0"}));
+    advance_triggers.push(`clicked:remove_skill_${index}`);
 
-    on(`change:species_skill_${index}_advances`, eventInfo => wfrpModule.calculateSkillAdvances());
+    advance_triggers.push(`change:species_skill_${index}_advances`);
 } 
 
 for (let index = 1; index <= 10; index++) {
-    on(`change:species_talent_${index}_advances`, eventInfo => wfrpModule.calculateTalentAdvances())
+    advance_triggers.push(`change:species_talent_${index}_advances`);
 };
 
+on(advance_triggers.join(" "), eventInfo => setAttrs({advances_changed:"1"}));
+
 on(`clicked:combinexp`, eventInfo => wfrpModule.consolidateXP());
 
 on(`clicked:advance`, eventInfo => wfrpModule.advanceXP());
@@ -2090,7 +2146,7 @@ on(`change:repeating_careers`, eventInfo => wfrpModule.calculateInitColumns(even
 
 on(`change:repeating_armour remove:repeating_armour`, eventInfo => wfrpModule.calculateArmour());
 
-on(`change:repeating_trappings change:repeating_armour:armour_enc change:repeating_weapons:weapon_enc`, eventInfo => wfrpModule.calculateCurrentEncumbrance());
+on(`change:repeating_trappings change:repeating_armour:armour_enc change:repeating_armour:armour_worn change:repeating_weapons:weapon_enc`, eventInfo => wfrpModule.calculateCurrentEncumbrance());
 
 on(`change:repeating_weapons:weapon_damage_flat change:repeating_weapons:weapon_damage_bonus`, eventInfo => wfrpModule.updateWeaponDamage(eventInfo.sourceAttribute));
 
@@ -2122,11 +2178,9 @@ on(`change:repeating_attacks:attack_name change:repeating_attacks:attack_type`,
 
 on(`change:weapon_skill change:ballistic_skill`, eventInfo => wfrpModule.cascadeNPCAttacks());
 
-wfrpModule.wfrp.characteristics.forEach(characteristic => {
+[...wfrpModule.wfrp.characteristics, "initiative", "dodge", "endurance", "intuition", "perception", "cool"].forEach(characteristic => {
     on(`change:${characteristic} change:${characteristic}_bonus`, eventInfo => wfrpModule.updateNPCButtons())
 });
 
 on(`change:npc sheet:opened`, eventInfo => wfrpModule.updateNPCButtons());
 
-//# sourceURL=sheetworkers.js
-
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/pug/abstracts.pug b/Warhammer Fantasy Roleplay 4e Official/src/pug/abstracts.pug
index c8ec02ea5f..566922fda8 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/pug/abstracts.pug	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/pug/abstracts.pug	
@@ -8,11 +8,13 @@
             "name":"Species",
             "field":"select",
             "options":[
+                "",
                 "Human",
                 "Halfling",
                 "Dwarf",
                 "High Elf",
                 "Wood Elf",
+                "Gnome",
             ]
         },
         {
@@ -202,7 +204,7 @@
                 "characteristic":"willpower",
                 "type":"advanced",
                 "grouped":true,
-                "specialisations":["Aqshy","Chamon","Dhar","Ghur","Ghyran","Hysh","Shyish","Ulgu"],
+                "specialisations":["Azyr","Aqshy","Chamon","Dhar","Ghur","Ghyran","Hysh","Shyish","Ulgu","Custom"],
             },
             {
                 "name":"Evaluate",
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/pug/components/_component-index.pug b/Warhammer Fantasy Roleplay 4e Official/src/pug/components/_component-index.pug
index 7b4aef3d76..dbfaa88d74 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/pug/components/_component-index.pug	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/pug/components/_component-index.pug	
@@ -31,4 +31,5 @@ include npc-skill.pug
 include repeating/npc-attack-row.pug
 include repeating/npc-talent-row.pug
 include repeating/npc-trait-row.pug
-include repeating/npc-opttrait-row.pug
\ No newline at end of file
+include repeating/npc-opttrait-row.pug
+include repeating/npc-additional-skill.pug
\ No newline at end of file
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/pug/components/control.pug b/Warhammer Fantasy Roleplay 4e Official/src/pug/components/control.pug
index 664dc56b56..75dc6e9ebd 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/pug/components/control.pug	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/pug/components/control.pug	
@@ -1,7 +1,7 @@
-mixin display-toggle(attr, checked=false)
+mixin display-toggle(attr, checked=false, icon="y")
     label.wfrp-displaytoggle
         input.wfrp-displaytoggle__hide(checked=checked, name=`attr_${attr}`, type="checkbox", value="1")
-        span.wfrp-displaytoggle__span y
+        span.wfrp-displaytoggle__span=icon
 
 mixin trait-toggle(attr, display, checked=false)
     label.wfrp-traittoggle
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/pug/components/repeating/npc-additional-skill.pug b/Warhammer Fantasy Roleplay 4e Official/src/pug/components/repeating/npc-additional-skill.pug
new file mode 100644
index 0000000000..c9a61eb1e1
--- /dev/null
+++ b/Warhammer Fantasy Roleplay 4e Official/src/pug/components/repeating/npc-additional-skill.pug	
@@ -0,0 +1,13 @@
+mixin npc-additional-skill()    
+    .wfrp-npcsettings__skill
+        input.wfrp-npcsettings__input(data-i18n-placeholder="Skill Name (Specialisation)", name=`attr_npc_skillname`, type="text")
+        input.wfrp-npcsettings__input(name=`attr_npc_skill`, type="number")
+
+mixin npc-additional-skill-display() 
+        button.wfrp-npcskill(type="roll", value=rolls.npc_repeating_skill)
+            input(name=`attr_npc_skill`, type="hidden")
+            input(name=`attr_npc_skillname`, type="hidden")
+            .wfrp-npcskill__title
+                span(name=`attr_npc_skillname`)
+            .wfrp-npcskill__value
+                span(name=`attr_npc_skill`)
\ No newline at end of file
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/pug/components/repeating/spell-row.pug b/Warhammer Fantasy Roleplay 4e Official/src/pug/components/repeating/spell-row.pug
index 085beea23e..fa7bd4c6ea 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/pug/components/repeating/spell-row.pug	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/pug/components/repeating/spell-row.pug	
@@ -36,12 +36,12 @@ mixin spell-row
                 .wfrp-settings__label(data-i18n=`Name`) 
                 input.wfrp-settings__input(name=`attr_spell_name`, type="text")
         
-            input(name=`attr_spell_type`, type="hidden")
+            input(name=`attr_spell_type`, type="hidden", value="Spell")
             .wfrp-settings__row
                 .wfrp-settings__label(data-i18n=`Type`) 
                 select.wfrp-settings__input(name=`attr_spell_type`)
-                    option(value="Spell",data-i18n="Spell")
-                    option(value="Prayer",data-i18n="Prayer")
+                    option(value="Spell", data-i18n="Spell")
+                    option(value="Prayer", data-i18n="Prayer")
         
             .wfrp-settings__row.control__hide--Spell
                 .wfrp-settings__label(data-i18n=`Lore`) 
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/pug/components/skill-grouped.pug b/Warhammer Fantasy Roleplay 4e Official/src/pug/components/skill-grouped.pug
index a48810cf7c..4004f83c4e 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/pug/components/skill-grouped.pug	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/pug/components/skill-grouped.pug	
@@ -32,14 +32,23 @@ mixin skill-grouped(skill)
                 -const attr = specialisation.toLowerCase().replace(/ /g,"_");
                 input(name=`attr_${attr}_settings`, type="hidden")
                 input(name=`attr_${attr}_control`, type="hidden")
+                
                 .wfrp-skilltable__row--specialisation(class=`control__hide--${attr}`)
                     input(name=`attr_${attr}_characteristic`, type="hidden", value=char_attr)
 
                     .wfrp-skilltable__cell--settingstoggle
                         +display-toggle(`${attr}_settings`)
 
-                    .wfrp-skilltable__cell
-                        button(data-i18n=specialisation, name=`roll_${attr}`, type="roll", value=rolls.skills[attr])
+                    if (specialisation === "Custom")
+                    
+                        .wfrp-skilltable__cell
+                            button(name=`roll_${attr}`, type="roll", value=rolls.skills[attr])
+                                span(name=`attr_${attr}_name`)
+
+                    else
+                    
+                        .wfrp-skilltable__cell
+                            button(data-i18n=specialisation, name=`roll_${attr}`, type="roll", value=rolls.skills[attr])
 
                     .wfrp-skilltable__cell
                         +characteristic-select(characteristic,`${attr}_characteristic`, true)
@@ -58,6 +67,11 @@ mixin skill-grouped(skill)
                         span.display(name=`attr_${attr}`)
 
                     .wfrp-skilltable_row.wfrp-settings(class=`control__hide--${attr}_settings`)
+
+                        if (specialisation === "Custom")                        
+                            .wfrp-settings__row--span
+                                .wfrp-settings__label(data-i18n=`Name`) 
+                                input.wfrp-settings__input(name=`attr_${attr}_name`, type="text") 
                             
                         .wfrp-settings__row
                             .wfrp-settings__label(data-i18n=`Modifier`) 
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/pug/layout/npc.pug b/Warhammer Fantasy Roleplay 4e Official/src/pug/layout/npc.pug
index d6aad0df2c..ce31952bb4 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/pug/layout/npc.pug	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/pug/layout/npc.pug	
@@ -54,6 +54,9 @@
                                 .wfrp-npcsettings__label(data-i18n=`${skill.name} (${specialism})`) 
                                 input.wfrp-npcsettings__input(name=`attr_${specialism}`, type="number")
 
+            h2(data-i18n="Additional Skills")
+            .wfrp-npcsettings__skills--additional
+                +repeating-section("npc-skills","npc-additional-skill")
 
             h2(data-i18n="Settings")
             .wfrp-npcsettings__settings
@@ -105,6 +108,10 @@
                         option(value="2") 1d10+I
                         option(value="3") 1d10+IB+AgB
 
+                .wfrp-npcsettings__row
+                    .wfrp-npcsettings__label(data-i18n="Initiative Roll Bonus")
+                    input.wfrp-npcsettings__input(name=`attr_init_bonus`, type="number", value="0")
+
                 .wfrp-npcsettings__row
                     .wfrp-npcsettings__label(data-i18n="Maximum Advantage")
                     input.wfrp-npcsettings__input(name="attr_setting_max_advantage", type="number")
@@ -151,6 +158,10 @@
                     each skill in [...skills.basic, ...skills.advanced]
                         +npc-skill(skill)
 
+                .wfrp-npcskill__wrapper
+                    +repeating-section("npc-skills","npc-additional-skill-display")
+
+
             .wfrp-npccombat
                 h2.wfrp-npc__subtitle(data-i18n="Combat")
                 .wfrp-npcadvantage
@@ -160,15 +171,15 @@
                     .wfrp-npccontrols__button
                         button(data-i18n="Initiative", type="roll", value=`&{template:wfrp} {{name=@{character_name}}} {{roll_name=Initiative}} @{roll_init}`)
                     .wfrp-npccontrols__button
-                        button(data-i18n="Dodge", type="roll", value=rolls.combat.dodge)
+                        button(data-i18n="Dodge", type="roll", value=rolls.combat.npc_dodge)
                     .wfrp-npccontrols__button
-                        button(data-i18n="Endurance", type="roll", value=rolls.combat.endurance)
+                        button(data-i18n="Endurance", type="roll", value=rolls.combat.npc_endurance)
                     .wfrp-npccontrols__button
-                        button(data-i18n="Intuition", type="roll", value=rolls.combat.intuition)
+                        button(data-i18n="Intuition", type="roll", value=rolls.combat.npc_intuition)
                     .wfrp-npccontrols__button
-                        button(data-i18n="Perception", type="roll", value=rolls.combat.perception)
+                        button(data-i18n="Perception", type="roll", value=rolls.combat.npc_perception)
                     .wfrp-npccontrols__button
-                        button(data-i18n="Cool", type="roll", value=rolls.combat.cool)
+                        button(data-i18n="Cool", type="roll", value=rolls.combat.npc_cool)
 
             .wfrp-npcattack
                 h2.wfrp-npc__subtitle(data-i18n="Attacks")
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/pug/layout/pc.pug b/Warhammer Fantasy Roleplay 4e Official/src/pug/layout/pc.pug
index 4616448fdd..8e0463287c 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/pug/layout/pc.pug	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/pug/layout/pc.pug	
@@ -316,6 +316,12 @@ input(name="attr_setting_button_hide", type="hidden")
         +species("spells","spell-row")
 
 .wfrp-experience--alt.page__advances--flex
+
+    input(name="attr_advances_changed", type="hidden")
+    .wfrp-panel.wfrp-advancenotify
+        span.wfrp-advancenotify__message(data-i18n="This sheet has pending advance changes. Click below to save these changes.")
+        button.wfrp-advancenotify__button(data-i18n="Update", name="act_update_advances", type="action") 
+            
     .wfrp-panel
         h1.wfrp-panel__header(data-i18n="Experience")
         each field in experience 
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/pug/layout/settings.pug b/Warhammer Fantasy Roleplay 4e Official/src/pug/layout/settings.pug
index 41a9753b61..38b3f2773b 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/pug/layout/settings.pug	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/pug/layout/settings.pug	
@@ -32,10 +32,10 @@
                 input.wfrp-settingstable__select(name=`attr_encumbrance_mod`, type="number", value="0")
 
             .wfrp-settingstable__row
-                .wfrp-settingstable__label(data-i18n="Hide Control Buttons")
+                .wfrp-settingstable__label(data-i18n="Control Buttons")
                 select.wfrp-settingstable__select(name="attr_setting_button_hide")
-                    option(data-i18n="Off", value="1")
-                    option(data-i18n="On", value="2")
+                    option(data-i18n="Show", value="1")
+                    option(data-i18n="Hide", value="2")
 
     .wfrp-settingspanel.wfrp-panel.page__settings
         h1.wfrp-panel__header(data-i18n="Roll Options")
@@ -68,6 +68,10 @@
                     option(value="2") 1d10+I
                     option(value="3") 1d10+IB+AgB
 
+            .wfrp-settingstable__row
+                .wfrp-settingstable__label(data-i18n="Initiative Roll Bonus")
+                input.wfrp-settingstable__select(name=`attr_init_bonus`, type="number", value="0")
+
             .wfrp-settingstable__row
                 .wfrp-settingstable__label(data-i18n="Whisper to GM")
                 select.wfrp-settingstable__select(name="attr_setting_whisper")
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/pug/rolls.pug b/Warhammer Fantasy Roleplay 4e Official/src/pug/rolls.pug
index c7344653af..8ca6ef3010 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/pug/rolls.pug	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/pug/rolls.pug	
@@ -34,8 +34,6 @@
         }
 
         Object.entries(roll).forEach(([key,val]) => roll_array.push(`{{${key}=${val}}}`));
-
-        roll_array.push(`{{name=@{character_name}}}`);
         
         return roll_array.join(" ");
     }
@@ -77,10 +75,13 @@
     [skills.basic[18], skills.advanced[2], skills.advanced[5], skills.advanced[11]].forEach(skill => {
 
         skill.specialisations.forEach(specialisation => {
+
             const attr = specialisation.toLowerCase().replace(/ /g,"_");
 
+            const rollName = (specialisation === "Custom") ? "@{custom_name}" : specialisation;
+
             const roll_values = {
-                roll_name: `${skill.name} - ${specialisation}`,
+                roll_name: `${skill.name} - ${rollName}`,
                 roll_type: `Specialisation`,
                 roll_notes: `@{${attr}_notes}`
             }
@@ -100,6 +101,16 @@
         }
         rolls.repeating_skill = makeRoll(roll_values, attr);
     }
+    
+    {
+        const attr = "npc_skill";
+
+        const roll_values = {
+            roll_name: `@{npc_skillname}`,
+            roll_type: `Skill`
+        }
+        rolls.npc_repeating_skill = makeRoll(roll_values, attr);
+    }
 
     rolls.repeating = {};
 
@@ -220,4 +231,20 @@
 
         rolls.combat[attr] = makeRoll(roll_values, attr, true, "combat")
 
+    });
+
+    rolls.npc_combat = {};
+
+    ["Dodge","Endurance","Intuition","Perception","Cool"].forEach(button => {
+        
+        const attr = button.toLowerCase();
+
+        const roll_values = {
+            roll_name: button,
+            roll_type: `Skill`,
+            roll_notes: `@{${attr}_notes}`
+        }
+
+        rolls.combat[`npc_${attr}`] = makeRoll(roll_values, `npc_${attr}`, true, "combat");
+
     });
\ No newline at end of file
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/pug/rolltemplates.pug b/Warhammer Fantasy Roleplay 4e Official/src/pug/rolltemplates.pug
index 86f3472340..aa52603c6c 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/pug/rolltemplates.pug	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/pug/rolltemplates.pug	
@@ -18,34 +18,38 @@
         {
             label: "Bonus",
             value: "bonus",
+            type: "number",
         },
         {
             label: "Advantage",
-            value: "advantage",
+            value: "roll_advantage",
+            type: "number",
         },
         {
             label: "SL Bonus",
-            value: "slbonus",
+            value: "sl_bonus",
+            type: "number",
         },
         {
             label: "CN",
-            value: "cn",
+            value: "roll_cn",
+            type: "number",
         },
         {
             label: "Range",
-            value: "range",
+            value: "roll_range",
         },
         {
             label: "Damage",
-            value: "damage",
+            value: "roll_damage",
         },
         {
             label: "Target",
-            value: "target",
+            value: "roll_target",
         },
         {
             label: "Duration",
-            value: "duration",
+            value: "roll_duration",
         }
     ];
 
@@ -265,10 +269,12 @@ rolltemplate.sheet-rolltemplate-wfrp
         +success-fail()
 
         each field in roll_fields
-            +tags([`roll_${field.value}`])
-                .wfrp-roll__row
+            - const className = (field.type) ? `sheet-wfrp-roll__row--${field.type}` : ``;
+
+            +tags([field.value])
+                .wfrp-roll__row(class=className)
                     .wfrp-roll__label(data-i18n=field.label)
-                    .wfrp-roll__value {{roll_#{field.value}}}
+                    .wfrp-roll__value {{#{field.value}}}
                     
         +tags(["roll_hit_location"])
             .wfrp-roll__row
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/pug/wfrp4.pug b/Warhammer Fantasy Roleplay 4e Official/src/pug/wfrp4.pug
index 32899480df..bc056a9a44 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/pug/wfrp4.pug	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/pug/wfrp4.pug	
@@ -3,7 +3,7 @@ include rolls.pug
 
 include components/_component-index.pug
 
-input(name="attr_sheet_version", type="hidden", value="1.0.3")
+input(name="attr_sheet_version", type="hidden", value="1.0.4")
 input(name="attr_npc", type="hidden", value="0")
 input(name="attr_nav", type="hidden", value="main")
 input(name="attr_difficulty_query", type="hidden", value="?{Difficulty|Average (+20), 20|Very Easy (+60), 60|Easy (+40), 40|Average (+20), 20|Challenging (0), 0|Difficult (-10), -10|Hard (-20), -20|Very Hard (-30), -30}")
@@ -12,7 +12,7 @@ input(name="attr_roll_query", type="hidden", value="?{Bonus|0}")
 input(name="attr_roll_slbonus", type="hidden", value="{{roll_slbonus=?{SL Bonus|0}}}")
 input(name="attr_roll_cf", type="hidden", value="96")
 input(name="attr_roll_cs", type="hidden", value="5")
-input(name="attr_roll_init", type="hidden", value="{{init=[[@{initiative} &{tracker}]]}}")
+input(name="attr_roll_init", type="hidden", value="{{init=[[@{initiative}+@{initiative_bonus} &{tracker}]]}}")
 input(name="attr_roll_cs", type="hidden", value="5")
 input(name="attr_roll_whisper", type="hidden", value="")
     
@@ -51,4 +51,6 @@ script(type="text/worker")
     |
     include ../js/dragndrop.js
     |
-    include ../js/helperfunctions.js
\ No newline at end of file
+    include ../js/helperfunctions.js
+    |
+    | //# sourceURL=sheetworkers.js
\ No newline at end of file
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/scss/_abstracts.scss b/Warhammer Fantasy Roleplay 4e Official/src/scss/_abstracts.scss
index 18522630ed..95be79aa02 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/scss/_abstracts.scss	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/scss/_abstracts.scss	
@@ -93,6 +93,7 @@ $specialisations:
     "explosives",
     "sling",
     "throwing",
+    "azyr",
     "aqshy",
     "chamon",
     "dhar",
@@ -101,4 +102,5 @@ $specialisations:
     "hysh",
     "shyish",
     "ulgu",
-    "magick";
\ No newline at end of file
+    "magick",
+    "custom";
\ No newline at end of file
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/scss/_rolltemplates.scss b/Warhammer Fantasy Roleplay 4e Official/src/scss/_rolltemplates.scss
index 2516874071..06c391e365 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/scss/_rolltemplates.scss	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/scss/_rolltemplates.scss	
@@ -121,6 +121,10 @@
                 grid-template-columns: .75fr 1fr;
                 gap: .25rem;
 
+            &--number {
+                grid-template-columns: 1fr 3rem;
+            }
+
             &--full {
                 @extend .sheet-wfrp-roll__row;
                 grid-template-columns: 1fr;
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/scss/control/_hide.scss b/Warhammer Fantasy Roleplay 4e Official/src/scss/control/_hide.scss
index cf93ea381c..a798b5b4b9 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/scss/control/_hide.scss	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/scss/control/_hide.scss	
@@ -264,6 +264,18 @@ input[name*="settings"] {
     }
 }
 
+// Update Advances Control
+
+.sheet-wfrp-advancenotify {
+    display: none;
+}
+
+input[name*="advances_changed"] {
+    &[value="1"] + .sheet-wfrp-advancenotify {
+        display: block;
+    }
+}
+
 // NPC Settings Control
 
 .sheet-wfrp-npcsettings__wrapper {
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/scss/layout/_npc.scss b/Warhammer Fantasy Roleplay 4e Official/src/scss/layout/_npc.scss
index 9266d91f8e..ca4fae24ed 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/scss/layout/_npc.scss	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/scss/layout/_npc.scss	
@@ -102,11 +102,26 @@
                 grid-template-columns: 1fr 1fr 1fr;
                 gap: $margin-large $margin-large * 2;
             margin: 0 $margin-large * 3;
+
+            &--additional {
+                .repcontainer {
+                    display: grid;
+                        grid-template-columns: 1fr 1fr 1fr;
+                        gap: $margin-large $margin-large * 2;
+                    margin: 0 $margin-large * 3;
+                    
+                }
+
+                .repcontrol {
+                    margin-top: $margin-general;
+                }
+            }
         }
 
         &__skill {
             display: grid;
-                grid-template-columns: 1fr 1.5em;
+                grid-template-columns: 1fr 3rem;
+                grid-gap: $margin-small;
         }
 
         &__settings {
@@ -177,8 +192,14 @@
 
     &__skills {
 
-        input[type="hidden"][value="0"] + button.sheet-wfrp-npcskill {
-            display: none;
+        input[type="hidden"] {
+                &[value="0"],
+                &[value=""],
+                &:not([value]) { 
+                    & + button.sheet-wfrp-npcskill {
+                    display: none;
+                }
+            }
         }
     }
 
@@ -197,6 +218,10 @@
             display: flex;
             flex-wrap: wrap;
             margin: auto; 
+
+            .repcontrol {
+                display: none;
+            }
         }
 
         &__title {
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/scss/layout/pc/_pc.scss b/Warhammer Fantasy Roleplay 4e Official/src/scss/layout/pc/_pc.scss
index 530525042a..89eb91c89e 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/scss/layout/pc/_pc.scss	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/scss/layout/pc/_pc.scss	
@@ -69,7 +69,7 @@
 
         &-trappings {
             grid-column: 1 / span 2;
-            grid-row: span 6;
+            grid-row: span 5;
 
             display: flex;
                 flex-direction: column;
@@ -197,7 +197,7 @@
         }
 
         &-weapons {
-            grid-column: 3 / span 4;
+            grid-column: 1 / span 6;
         }
 
         &-spells {
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/scss/styling/_form_fields.scss b/Warhammer Fantasy Roleplay 4e Official/src/scss/styling/_form_fields.scss
index 3b8744e938..14143b50b8 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/scss/styling/_form_fields.scss	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/scss/styling/_form_fields.scss	
@@ -53,4 +53,21 @@
         text-shadow: none;
     }
 
+    button.sheet-wfrp-advancenotify__button {
+        display: block;
+        margin: 2px;
+        padding: $margin-general;
+
+        border-radius: 5px;
+
+        background-color: #28a745;
+        color: #fff;
+
+        font-family: "Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
+        font-size: 8pt;
+        font-weight: bold;
+        text-align: center;
+        
+    }
+
 }
\ No newline at end of file
diff --git a/Warhammer Fantasy Roleplay 4e Official/src/scss/styling/_panel.scss b/Warhammer Fantasy Roleplay 4e Official/src/scss/styling/_panel.scss
index 1419d2121a..a7a96525a2 100644
--- a/Warhammer Fantasy Roleplay 4e Official/src/scss/styling/_panel.scss	
+++ b/Warhammer Fantasy Roleplay 4e Official/src/scss/styling/_panel.scss	
@@ -3,7 +3,7 @@
 
     
     border: 3px solid transparent;
-    border-image: url('https://s3.amazonaws.com/files.d20.io/images/144604966/Zs6TlxfYvUa6o0tD1DmW2Q/max.png?1592590034') 4 round;
+    border-image: url("https://s3.amazonaws.com/files.d20.io/images/144604966/Zs6TlxfYvUa6o0tD1DmW2Q/max.png?1592590034") 8 / 2 / 0 repeat;
     
     h1 {
         border-bottom: $grid-border;
diff --git a/Warhammer Fantasy Roleplay 4e Official/translation.json b/Warhammer Fantasy Roleplay 4e Official/translation.json
index cedab16ff5..e3b48e7f61 100644
--- a/Warhammer Fantasy Roleplay 4e Official/translation.json	
+++ b/Warhammer Fantasy Roleplay 4e Official/translation.json	
@@ -1,9 +1,11 @@
 {
+    "":"",
     "Name":"Name",
     "Species":"Species",
     "Human":"Human",
     "Halfling":"Halfling",
     "Dwarf":"Dwarf",
+    "Gnome":"Gnome",
     "Class":"Class",
     "Academic":"Academic",
     "Burgher":"Burgher",
@@ -55,6 +57,7 @@
     "Athletics":"Athletics",
     "Bribery":"Bribery",
     "Channelling":"Channelling",
+    "Azyr":"Azyr",
     "Aqshy":"Aqshy",
     "Chamon":"Chamon",
     "Dhar":"Dhar",
@@ -171,6 +174,7 @@
     "Adv.":"Adv.",
     "Total":"Total",
     "Custom":"Custom",
+    "Custom Name":"Custom Name",
     "Char.":"Char.",
     "Basic Skills":"Basic Skills",
     "Advanced Skills":"Advanced Skills",
@@ -286,6 +290,7 @@
     "Source":"Source",
     "XP":"XP",
     "Controls":"Controls",
+    "Control Buttons":"Control Buttons",
     "Critical Hit":"Critical Hit",
     "Advantage":"Advantage",
     "General":"General",
@@ -350,7 +355,9 @@
     "TB":"TB",
     "Combat":"Combat",
     "Channelling (Aqshy)":"Channelling (Aqshy)",
+    "Channelling (Azyr)":"Channelling (Azyr)",
     "Channelling (Chamon)":"Channelling (Chamon)",
+    "Channelling (Custom)":"Channelling (Custom)",
     "Channelling (Dhar)":"Channelling (Dhar)",
     "Channelling (Ghur)":"Channelling (Ghur)",
     "Channelling (Ghyran)":"Channelling (Ghyran)",
@@ -384,6 +391,13 @@
     "Advance Career Tier":"Advance Career Tier",
     "Change Career (Incomplete)":"Change Career (Incomplete)",
     "Change Career (Complete)":"Change Career (Complete)",
+    "Skill Name (Specialisation)":"Skill Name (Specialisation)",
+    "Additional Skills":"Additional Skills",
+    "This sheet has pending advance changes. Click below to save these changes.":"This sheet has pending advance changes. Click below to save these changes.",
+    "Update":"Update",
+    "Show":"Show",
+    "Hide":"Hide",
+    "Initiative Roll Bonus":"Initiative Roll Bonus",
     "settings_npc":"NPC",
     "settings_npc_desc":"The NPC option sets new characters to default to the NPC card style sheet. Useful if the player characters have already been created and all new character sheets added to the game will likely represent non player characters.",
     "setting_whisper":"Whisper Rolls to GM",
diff --git a/Warhammer Fantasy Roleplay 4e Official/wfrp4.css b/Warhammer Fantasy Roleplay 4e Official/wfrp4.css
index 01024530a8..150bf37831 100644
--- a/Warhammer Fantasy Roleplay 4e Official/wfrp4.css	
+++ b/Warhammer Fantasy Roleplay 4e Official/wfrp4.css	
@@ -170,7 +170,7 @@ input[type=number]::-webkit-outer-spin-button, input[type=number]::-webkit-inner
 }
 .sheet-wfrp-pc .sheet-wfrp-trappings {
   grid-column: 1/span 2;
-  grid-row: span 6;
+  grid-row: span 5;
   display: flex;
   flex-direction: column;
 }
@@ -254,7 +254,7 @@ input[type=number]::-webkit-outer-spin-button, input[type=number]::-webkit-inner
   margin: 0.5rem auto;
 }
 .sheet-wfrp-pc .sheet-wfrp-weapons {
-  grid-column: 3/span 4;
+  grid-column: 1/span 6;
 }
 .sheet-wfrp-pc .sheet-wfrp-spells {
   grid-column: 1/-1;
@@ -1055,6 +1055,18 @@ button.sheet-pictos[type=action]:hover {
 .sheet-wfrp-wrapper button {
   text-shadow: none;
 }
+.sheet-wfrp-wrapper button.sheet-wfrp-advancenotify__button {
+  display: block;
+  margin: 2px;
+  padding: 0.5rem;
+  border-radius: 5px;
+  background-color: #28a745;
+  color: #fff;
+  font-family: "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+  font-size: 8pt;
+  font-weight: bold;
+  text-align: center;
+}
 
 .charsheet .sheet-wfrp-wrapper button[type=roll] {
   margin: 0;
@@ -1212,7 +1224,7 @@ button.sheet-pictos[type=action]:hover {
 .sheet-wfrp-panel {
   background: url("https://s3.amazonaws.com/files.d20.io/images/144589463/lqxlbyKEgMXnVw8VajQTCQ/max.png?1592586044") #eff2f1 center/cover;
   border: 3px solid transparent;
-  border-image: url("https://s3.amazonaws.com/files.d20.io/images/144604966/Zs6TlxfYvUa6o0tD1DmW2Q/max.png?1592590034") 4 round;
+  border-image: url("https://s3.amazonaws.com/files.d20.io/images/144604966/Zs6TlxfYvUa6o0tD1DmW2Q/max.png?1592590034") 8/2/0 repeat;
 }
 .sheet-wfrp-panel h1 {
   border-bottom: 1px solid black;
@@ -1343,7 +1355,7 @@ button.sheet-pictos[type=action]:hover {
   display: block;
 }
 
-.sheet-wfrp-npcsettings__wrapper, .sheet-control__hide--npctalent_settings, .sheet-control__hide--npctrait_settings, .sheet-control__hide--npcattack_settings, .sheet-control__hide--Custom, .sheet-control__hide--Prayer, .sheet-control__hide--Spell, .sheet-control__hide--skill, .sheet-control__hide--characteristic, .sheet-wfrp-criticaltable__row .sheet-wfrp-criticaltable__cell--description, .sheet-wfrp-corruptiontable__row .sheet-wfrp-corruptiontable__cell--description, .sheet-wfrp-psychologytable__row .sheet-wfrp-psychologytable__cell--description, .sheet-wfrp-conditiontable__row .sheet-wfrp-conditiontable__cell--description, .sheet-wfrp-talenttable__row .sheet-wfrp-talenttable__cell--description, .sheet-control__hide--spell_settings, .sheet-control__hide--weapon_settings, .sheet-control__hide--armour_settings, .sheet-control__hide--trappings_settings, .sheet-control__hide--species_settings, .sheet-control__hide--career_settings, .sheet-control__hide--critical_settings, .sheet-control__hide--corruption_settings, .sheet-control__hide--psychology_settings, .sheet-control__hide--condition_settings, .sheet-control__hide--talent_settings, .sheet-control__hide--magick, .sheet-control__hide--ulgu, .sheet-control__hide--shyish, .sheet-control__hide--hysh, .sheet-control__hide--ghyran, .sheet-control__hide--ghur, .sheet-control__hide--dhar, .sheet-control__hide--chamon, .sheet-control__hide--aqshy, .sheet-control__hide--throwing, .sheet-control__hide--sling, .sheet-control__hide--explosives, .sheet-control__hide--entangling, .sheet-control__hide--engineering, .sheet-control__hide--crossbow, .sheet-control__hide--bow, .sheet-control__hide--blackpowder, .sheet-control__hide--two-handed, .sheet-control__hide--polearm, .sheet-control__hide--parry, .sheet-control__hide--flail, .sheet-control__hide--fencing, .sheet-control__hide--cavalry, .sheet-control__hide--brawling, .sheet-control__hide--basic, .sheet-control__hide--magick_settings, .sheet-control__hide--ulgu_settings, .sheet-control__hide--shyish_settings, .sheet-control__hide--hysh_settings, .sheet-control__hide--ghyran_settings, .sheet-control__hide--ghur_settings, .sheet-control__hide--dhar_settings, .sheet-control__hide--chamon_settings, .sheet-control__hide--aqshy_settings, .sheet-control__hide--throwing_settings, .sheet-control__hide--sling_settings, .sheet-control__hide--explosives_settings, .sheet-control__hide--entangling_settings, .sheet-control__hide--engineering_settings, .sheet-control__hide--crossbow_settings, .sheet-control__hide--bow_settings, .sheet-control__hide--blackpowder_settings, .sheet-control__hide--two-handed_settings, .sheet-control__hide--polearm_settings, .sheet-control__hide--parry_settings, .sheet-control__hide--flail_settings, .sheet-control__hide--fencing_settings, .sheet-control__hide--cavalry_settings, .sheet-control__hide--brawling_settings, .sheet-control__hide--basic_settings, .sheet-control__hide--stealth_settings, .sheet-control__hide--row_settings, .sheet-control__hide--ride_settings, .sheet-control__hide--perception_settings, .sheet-control__hide--outdoor-survival_settings, .sheet-control__hide--navigation_settings, .sheet-control__hide--melee_settings, .sheet-control__hide--leadership_settings, .sheet-control__hide--intuition_settings, .sheet-control__hide--intimidate_settings, .sheet-control__hide--haggle_settings, .sheet-control__hide--gossip_settings, .sheet-control__hide--gamble_settings, .sheet-control__hide--entertain_settings, .sheet-control__hide--endurance_settings, .sheet-control__hide--drive_settings, .sheet-control__hide--dodge_settings, .sheet-control__hide--cool_settings, .sheet-control__hide--consume-alcohol_settings, .sheet-control__hide--climb_settings, .sheet-control__hide--charm-animal_settings, .sheet-control__hide--charm_settings, .sheet-control__hide--bribery_settings, .sheet-control__hide--athletics_settings, .sheet-control__hide--art_settings, .sheet-control__hide--trade_settings, .sheet-control__hide--track_settings, .sheet-control__hide--swim_settings, .sheet-control__hide--sleight-of-hand_settings, .sheet-control__hide--set-trap_settings, .sheet-control__hide--secret-signs_settings, .sheet-control__hide--sail_settings, .sheet-control__hide--research_settings, .sheet-control__hide--ranged_settings, .sheet-control__hide--pray_settings, .sheet-control__hide--play_settings, .sheet-control__hide--pick-lock_settings, .sheet-control__hide--perform_settings, .sheet-control__hide--lore_settings, .sheet-control__hide--language_settings, .sheet-control__hide--heal_settings, .sheet-control__hide--eva1uate_settings, .sheet-control__hide--channelling_settings, .sheet-control__hide--animal-training_settings, .sheet-control__hide--settings, .sheet-control__hide--animal-care_settings, .sheet-control__hide--fellowship, .sheet-control__hide--willpower, .sheet-control__hide--intelligence, .sheet-control__hide--dexterity, .sheet-control__hide--agility, .sheet-control__hide--initiative, .sheet-control__hide--toughness, .sheet-control__hide--strength, .sheet-control__hide--ballistic_skill, .sheet-control__hide--weapon_skill {
+.sheet-wfrp-npcsettings__wrapper, .sheet-control__hide--npctalent_settings, .sheet-control__hide--npctrait_settings, .sheet-control__hide--npcattack_settings, .sheet-control__hide--Custom, .sheet-control__hide--Prayer, .sheet-control__hide--Spell, .sheet-control__hide--skill, .sheet-control__hide--characteristic, .sheet-wfrp-criticaltable__row .sheet-wfrp-criticaltable__cell--description, .sheet-wfrp-corruptiontable__row .sheet-wfrp-corruptiontable__cell--description, .sheet-wfrp-psychologytable__row .sheet-wfrp-psychologytable__cell--description, .sheet-wfrp-conditiontable__row .sheet-wfrp-conditiontable__cell--description, .sheet-wfrp-talenttable__row .sheet-wfrp-talenttable__cell--description, .sheet-control__hide--spell_settings, .sheet-control__hide--weapon_settings, .sheet-control__hide--armour_settings, .sheet-control__hide--trappings_settings, .sheet-control__hide--species_settings, .sheet-control__hide--career_settings, .sheet-control__hide--critical_settings, .sheet-control__hide--corruption_settings, .sheet-control__hide--psychology_settings, .sheet-control__hide--condition_settings, .sheet-control__hide--talent_settings, .sheet-control__hide--custom, .sheet-control__hide--magick, .sheet-control__hide--ulgu, .sheet-control__hide--shyish, .sheet-control__hide--hysh, .sheet-control__hide--ghyran, .sheet-control__hide--ghur, .sheet-control__hide--dhar, .sheet-control__hide--chamon, .sheet-control__hide--aqshy, .sheet-control__hide--azyr, .sheet-control__hide--throwing, .sheet-control__hide--sling, .sheet-control__hide--explosives, .sheet-control__hide--entangling, .sheet-control__hide--engineering, .sheet-control__hide--crossbow, .sheet-control__hide--bow, .sheet-control__hide--blackpowder, .sheet-control__hide--two-handed, .sheet-control__hide--polearm, .sheet-control__hide--parry, .sheet-control__hide--flail, .sheet-control__hide--fencing, .sheet-control__hide--cavalry, .sheet-control__hide--brawling, .sheet-control__hide--basic, .sheet-control__hide--custom_settings, .sheet-control__hide--magick_settings, .sheet-control__hide--ulgu_settings, .sheet-control__hide--shyish_settings, .sheet-control__hide--hysh_settings, .sheet-control__hide--ghyran_settings, .sheet-control__hide--ghur_settings, .sheet-control__hide--dhar_settings, .sheet-control__hide--chamon_settings, .sheet-control__hide--aqshy_settings, .sheet-control__hide--azyr_settings, .sheet-control__hide--throwing_settings, .sheet-control__hide--sling_settings, .sheet-control__hide--explosives_settings, .sheet-control__hide--entangling_settings, .sheet-control__hide--engineering_settings, .sheet-control__hide--crossbow_settings, .sheet-control__hide--bow_settings, .sheet-control__hide--blackpowder_settings, .sheet-control__hide--two-handed_settings, .sheet-control__hide--polearm_settings, .sheet-control__hide--parry_settings, .sheet-control__hide--flail_settings, .sheet-control__hide--fencing_settings, .sheet-control__hide--cavalry_settings, .sheet-control__hide--brawling_settings, .sheet-control__hide--basic_settings, .sheet-control__hide--stealth_settings, .sheet-control__hide--row_settings, .sheet-control__hide--ride_settings, .sheet-control__hide--perception_settings, .sheet-control__hide--outdoor-survival_settings, .sheet-control__hide--navigation_settings, .sheet-control__hide--melee_settings, .sheet-control__hide--leadership_settings, .sheet-control__hide--intuition_settings, .sheet-control__hide--intimidate_settings, .sheet-control__hide--haggle_settings, .sheet-control__hide--gossip_settings, .sheet-control__hide--gamble_settings, .sheet-control__hide--entertain_settings, .sheet-control__hide--endurance_settings, .sheet-control__hide--drive_settings, .sheet-control__hide--dodge_settings, .sheet-control__hide--cool_settings, .sheet-control__hide--consume-alcohol_settings, .sheet-control__hide--climb_settings, .sheet-control__hide--charm-animal_settings, .sheet-control__hide--charm_settings, .sheet-control__hide--bribery_settings, .sheet-control__hide--athletics_settings, .sheet-control__hide--art_settings, .sheet-control__hide--trade_settings, .sheet-control__hide--track_settings, .sheet-control__hide--swim_settings, .sheet-control__hide--sleight-of-hand_settings, .sheet-control__hide--set-trap_settings, .sheet-control__hide--secret-signs_settings, .sheet-control__hide--sail_settings, .sheet-control__hide--research_settings, .sheet-control__hide--ranged_settings, .sheet-control__hide--pray_settings, .sheet-control__hide--play_settings, .sheet-control__hide--pick-lock_settings, .sheet-control__hide--perform_settings, .sheet-control__hide--lore_settings, .sheet-control__hide--language_settings, .sheet-control__hide--heal_settings, .sheet-control__hide--eva1uate_settings, .sheet-control__hide--channelling_settings, .sheet-control__hide--animal-training_settings, .sheet-control__hide--settings, .sheet-control__hide--animal-care_settings, .sheet-control__hide--fellowship, .sheet-control__hide--willpower, .sheet-control__hide--intelligence, .sheet-control__hide--dexterity, .sheet-control__hide--agility, .sheet-control__hide--initiative, .sheet-control__hide--toughness, .sheet-control__hide--strength, .sheet-control__hide--ballistic_skill, .sheet-control__hide--weapon_skill {
   display: none;
 }
 
@@ -1351,7 +1363,7 @@ input[name*=characteristic][value=fellowship] ~ .sheet-control__hide--fellowship
   display: block;
 }
 
-input[name*=npc_settings][value=on] + .sheet-wfrp-npcsettings__wrapper, input[name*=settings][value="1"] + div > .sheet-control__hide--npctalent_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--npctrait_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--npcattack_settings, input[name*=type][value=Custom] ~ .sheet-control__hide--Custom, input[name*=type][value=Prayer] ~ .sheet-control__hide--Prayer, input[name*=type][value=Spell] ~ .sheet-control__hide--Spell, input[name=attr_talent_test_type][value=skill] ~ .sheet-control__hide--skill, input[name=attr_talent_test_type][value=characteristic] ~ .sheet-control__hide--characteristic, .sheet-wfrp-criticaltable__row input[name=attr_critical_toggle][value="1"] + .sheet-wfrp-criticaltable__cell--description, .sheet-wfrp-corruptiontable__row input[name=attr_corruption_toggle][value="1"] + .sheet-wfrp-corruptiontable__cell--description, .sheet-wfrp-psychologytable__row input[name=attr_psychology_toggle][value="1"] + .sheet-wfrp-psychologytable__cell--description, .sheet-wfrp-conditiontable__row input[name=attr_condition_toggle][value="1"] + .sheet-wfrp-conditiontable__cell--description, .sheet-wfrp-talenttable__row input[name=attr_talent_toggle][value="1"] + .sheet-wfrp-talenttable__cell--description, input[name*=settings][value="1"] + div > .sheet-control__hide--spell_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--weapon_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--armour_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--trappings_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--species_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--career_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--critical_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--corruption_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--psychology_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--condition_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--talent_settings, input[name*=control][value=on] + .sheet-control__hide--magick, input[name*=control][value=on] + .sheet-control__hide--ulgu, input[name*=control][value=on] + .sheet-control__hide--shyish, input[name*=control][value=on] + .sheet-control__hide--hysh, input[name*=control][value=on] + .sheet-control__hide--ghyran, input[name*=control][value=on] + .sheet-control__hide--ghur, input[name*=control][value=on] + .sheet-control__hide--dhar, input[name*=control][value=on] + .sheet-control__hide--chamon, input[name*=control][value=on] + .sheet-control__hide--aqshy, input[name*=control][value=on] + .sheet-control__hide--throwing, input[name*=control][value=on] + .sheet-control__hide--sling, input[name*=control][value=on] + .sheet-control__hide--explosives, input[name*=control][value=on] + .sheet-control__hide--entangling, input[name*=control][value=on] + .sheet-control__hide--engineering, input[name*=control][value=on] + .sheet-control__hide--crossbow, input[name*=control][value=on] + .sheet-control__hide--bow, input[name*=control][value=on] + .sheet-control__hide--blackpowder, input[name*=control][value=on] + .sheet-control__hide--two-handed, input[name*=control][value=on] + .sheet-control__hide--polearm, input[name*=control][value=on] + .sheet-control__hide--parry, input[name*=control][value=on] + .sheet-control__hide--flail, input[name*=control][value=on] + .sheet-control__hide--fencing, input[name*=control][value=on] + .sheet-control__hide--cavalry, input[name*=control][value=on] + .sheet-control__hide--brawling, input[name*=control][value=on] + .sheet-control__hide--basic, input[name*=settings][value="1"] ~ div > .sheet-control__hide--magick_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--ulgu_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--shyish_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--hysh_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--ghyran_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--ghur_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--dhar_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--chamon_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--aqshy_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--throwing_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--sling_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--explosives_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--entangling_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--engineering_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--crossbow_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--bow_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--blackpowder_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--two-handed_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--polearm_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--parry_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--flail_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--fencing_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--cavalry_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--brawling_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--basic_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--stealth_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--row_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--ride_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--perception_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--outdoor-survival_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--navigation_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--melee_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--leadership_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--intuition_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--intimidate_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--haggle_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--gossip_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--gamble_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--entertain_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--endurance_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--drive_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--dodge_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--cool_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--consume-alcohol_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--climb_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--charm-animal_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--charm_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--bribery_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--athletics_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--art_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--trade_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--track_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--swim_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--sleight-of-hand_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--set-trap_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--secret-signs_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--sail_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--research_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--ranged_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--pray_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--play_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--pick-lock_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--perform_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--lore_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--language_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--heal_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--eva1uate_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--channelling_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--animal-training_settings, input[name*=settings][value="1"] ~ div > div[class*=settings], input[name*=settings][value="1"] ~ div > .sheet-control__hide--animal-care_settings {
+input[name*=npc_settings][value=on] + .sheet-wfrp-npcsettings__wrapper, input[name*=settings][value="1"] + div > .sheet-control__hide--npctalent_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--npctrait_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--npcattack_settings, input[name*=type][value=Custom] ~ .sheet-control__hide--Custom, input[name*=type][value=Prayer] ~ .sheet-control__hide--Prayer, input[name*=type][value=Spell] ~ .sheet-control__hide--Spell, input[name=attr_talent_test_type][value=skill] ~ .sheet-control__hide--skill, input[name=attr_talent_test_type][value=characteristic] ~ .sheet-control__hide--characteristic, .sheet-wfrp-criticaltable__row input[name=attr_critical_toggle][value="1"] + .sheet-wfrp-criticaltable__cell--description, .sheet-wfrp-corruptiontable__row input[name=attr_corruption_toggle][value="1"] + .sheet-wfrp-corruptiontable__cell--description, .sheet-wfrp-psychologytable__row input[name=attr_psychology_toggle][value="1"] + .sheet-wfrp-psychologytable__cell--description, .sheet-wfrp-conditiontable__row input[name=attr_condition_toggle][value="1"] + .sheet-wfrp-conditiontable__cell--description, .sheet-wfrp-talenttable__row input[name=attr_talent_toggle][value="1"] + .sheet-wfrp-talenttable__cell--description, input[name*=settings][value="1"] + div > .sheet-control__hide--spell_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--weapon_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--armour_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--trappings_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--species_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--career_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--critical_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--corruption_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--psychology_settings, input[name*=settings][value="1"] + div > .sheet-control__hide--condition_settings, input[name*=settings][value="1"] + div > div[class*=settings], input[name*=settings][value="1"] + div > .sheet-control__hide--talent_settings, input[name*=control][value=on] + .sheet-control__hide--custom, input[name*=control][value=on] + .sheet-control__hide--magick, input[name*=control][value=on] + .sheet-control__hide--ulgu, input[name*=control][value=on] + .sheet-control__hide--shyish, input[name*=control][value=on] + .sheet-control__hide--hysh, input[name*=control][value=on] + .sheet-control__hide--ghyran, input[name*=control][value=on] + .sheet-control__hide--ghur, input[name*=control][value=on] + .sheet-control__hide--dhar, input[name*=control][value=on] + .sheet-control__hide--chamon, input[name*=control][value=on] + .sheet-control__hide--aqshy, input[name*=control][value=on] + .sheet-control__hide--azyr, input[name*=control][value=on] + .sheet-control__hide--throwing, input[name*=control][value=on] + .sheet-control__hide--sling, input[name*=control][value=on] + .sheet-control__hide--explosives, input[name*=control][value=on] + .sheet-control__hide--entangling, input[name*=control][value=on] + .sheet-control__hide--engineering, input[name*=control][value=on] + .sheet-control__hide--crossbow, input[name*=control][value=on] + .sheet-control__hide--bow, input[name*=control][value=on] + .sheet-control__hide--blackpowder, input[name*=control][value=on] + .sheet-control__hide--two-handed, input[name*=control][value=on] + .sheet-control__hide--polearm, input[name*=control][value=on] + .sheet-control__hide--parry, input[name*=control][value=on] + .sheet-control__hide--flail, input[name*=control][value=on] + .sheet-control__hide--fencing, input[name*=control][value=on] + .sheet-control__hide--cavalry, input[name*=control][value=on] + .sheet-control__hide--brawling, input[name*=control][value=on] + .sheet-control__hide--basic, input[name*=settings][value="1"] ~ div > .sheet-control__hide--custom_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--magick_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--ulgu_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--shyish_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--hysh_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--ghyran_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--ghur_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--dhar_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--chamon_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--aqshy_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--azyr_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--throwing_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--sling_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--explosives_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--entangling_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--engineering_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--crossbow_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--bow_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--blackpowder_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--two-handed_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--polearm_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--parry_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--flail_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--fencing_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--cavalry_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--brawling_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--basic_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--stealth_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--row_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--ride_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--perception_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--outdoor-survival_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--navigation_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--melee_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--leadership_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--intuition_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--intimidate_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--haggle_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--gossip_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--gamble_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--entertain_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--endurance_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--drive_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--dodge_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--cool_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--consume-alcohol_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--climb_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--charm-animal_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--charm_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--bribery_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--athletics_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--art_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--trade_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--track_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--swim_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--sleight-of-hand_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--set-trap_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--secret-signs_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--sail_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--research_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--ranged_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--pray_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--play_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--pick-lock_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--perform_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--lore_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--language_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--heal_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--eva1uate_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--channelling_settings, input[name*=settings][value="1"] ~ div > .sheet-control__hide--animal-training_settings, input[name*=settings][value="1"] ~ div > div[class*=settings], input[name*=settings][value="1"] ~ div > .sheet-control__hide--animal-care_settings {
   display: grid;
 }
 
@@ -1444,6 +1456,14 @@ input[name*=settings][value="1"] + div > .sheet-wfrp-npctalenttable__cell--descr
   display: none !important;
 }
 
+.sheet-wfrp-advancenotify {
+  display: none;
+}
+
+input[name*=advances_changed][value="1"] + .sheet-wfrp-advancenotify {
+  display: block;
+}
+
 .sheet-wfrp-npc__skills,
 .sheet-wfrp-npctrappings {
   display: none;
@@ -1620,9 +1640,19 @@ input[type=hidden][name=attr_npc][value=on] ~ * .sheet-wfrp-npc, input[type=hidd
   gap: 1rem 2rem;
   margin: 0 3rem;
 }
+.sheet-wfrp-npcsettings__skills--additional .repcontainer {
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  gap: 1rem 2rem;
+  margin: 0 3rem;
+}
+.sheet-wfrp-npcsettings__skills--additional .repcontrol {
+  margin-top: 0.5rem;
+}
 .sheet-wfrp-npcsettings__skill {
   display: grid;
-  grid-template-columns: 1fr 1.5em;
+  grid-template-columns: 1fr 3rem;
+  grid-gap: 0.25rem;
 }
 .sheet-wfrp-npcsettings__settings {
   display: grid;
@@ -1667,7 +1697,7 @@ input[type=hidden][name=attr_npc][value=on] ~ * .sheet-wfrp-npc, input[type=hidd
   content: "";
   height: 100%;
 }
-.sheet-wfrp-npc__skills input[type=hidden][value="0"] + button.sheet-wfrp-npcskill {
+.sheet-wfrp-npc__skills input[type=hidden][value="0"] + button.sheet-wfrp-npcskill, .sheet-wfrp-npc__skills input[type=hidden][value=""] + button.sheet-wfrp-npcskill, .sheet-wfrp-npc__skills input[type=hidden]:not([value]) + button.sheet-wfrp-npcskill {
   display: none;
 }
 .sheet-wfrp-npc button[type=roll].sheet-wfrp-npcskill {
@@ -1682,6 +1712,9 @@ input[type=hidden][name=attr_npc][value=on] ~ * .sheet-wfrp-npc, input[type=hidd
   flex-wrap: wrap;
   margin: auto;
 }
+.sheet-wfrp-npcskill__wrapper .repcontrol {
+  display: none;
+}
 .sheet-wfrp-npcskill__title {
   display: inline;
   margin-right: 0.5rem;
@@ -1918,6 +1951,9 @@ input[type=hidden][name=attr_npc][value=on] ~ * .sheet-wfrp-npc, input[type=hidd
   grid-template-columns: 0.75fr 1fr;
   gap: 0.25rem;
 }
+.sheet-rolltemplate-wfrp .sheet-wfrp-roll__row--number {
+  grid-template-columns: 1fr 3rem;
+}
 .sheet-rolltemplate-wfrp .sheet-wfrp-roll__row--full {
   grid-template-columns: 1fr;
   grid-column: 1/-1;
diff --git a/Warhammer Fantasy Roleplay 4e Official/wfrp4.html b/Warhammer Fantasy Roleplay 4e Official/wfrp4.html
index a592c70301..4ffceaae09 100644
--- a/Warhammer Fantasy Roleplay 4e Official/wfrp4.html	
+++ b/Warhammer Fantasy Roleplay 4e Official/wfrp4.html	
@@ -1,5 +1,5 @@
 
-<input name="attr_sheet_version" type="hidden" value="1.0.3"/>
+<input name="attr_sheet_version" type="hidden" value="1.0.4"/>
 <input name="attr_npc" type="hidden" value="0"/>
 <input name="attr_nav" type="hidden" value="main"/>
 <input name="attr_difficulty_query" type="hidden" value="?{Difficulty|Average (+20), 20|Very Easy (+60), 60|Easy (+40), 40|Average (+20), 20|Challenging (0), 0|Difficult (-10), -10|Hard (-20), -20|Very Hard (-30), -30}"/>
@@ -8,7 +8,7 @@
 <input name="attr_roll_slbonus" type="hidden" value="{{roll_slbonus=?{SL Bonus|0}}}"/>
 <input name="attr_roll_cf" type="hidden" value="96"/>
 <input name="attr_roll_cs" type="hidden" value="5"/>
-<input name="attr_roll_init" type="hidden" value="{{init=[[@{initiative} &amp;{tracker}]]}}"/>
+<input name="attr_roll_init" type="hidden" value="{{init=[[@{initiative}+@{initiative_bonus} &amp;{tracker}]]}}"/>
 <input name="attr_roll_cs" type="hidden" value="5"/>
 <input name="attr_roll_whisper" type="hidden" value=""/>
 <input name="attr_bar1_v" type="hidden"/>
@@ -41,11 +41,13 @@
           <div class="wfrp-header__title" data-i18n="Species"></div>
           <input class="sheet-control__custom" name="attr_species" type="hidden"/>
           <select class="wfrp-header__select sheet-control__custom" name="attr_species">
+            <option data-i18n="" value=""></option>
             <option data-i18n="Human" value="Human"></option>
             <option data-i18n="Halfling" value="Halfling"></option>
             <option data-i18n="Dwarf" value="Dwarf"></option>
             <option data-i18n="High Elf" value="High Elf"></option>
             <option data-i18n="Wood Elf" value="Wood Elf"></option>
+            <option data-i18n="Gnome" value="Gnome"></option>
             <option data-i18n="Custom" value="Custom"></option>
           </select>
           <div class="wfrp-header__customwrapper sheet-control__custom">
@@ -141,7 +143,7 @@
         <div class="wfrp-chartable__cell--left" data-i18n="Current"></div>
         <div class="wfrp-chartable__cell--left" data-i18n="Bonus"></div>
         <div class="wfrp-chartable__cell--head">
-          <button data-i18n="WS" name="roll_weapon_skill" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{weapon_skill}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Weapon Skill}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+          <button data-i18n="WS" name="roll_weapon_skill" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{weapon_skill}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Weapon Skill}} {{roll_type=Characteristic}}"></button>
         </div>
         <div class="wfrp-chartable__cell">
           <input name="attr_weapon_skill_initial" type="number" value="0"/>
@@ -160,7 +162,7 @@
           <input name="attr_weapon_skill_bonus" type="hidden" value="0"/><span class="display" name="attr_weapon_skill_bonus"></span>
         </div>
         <div class="wfrp-chartable__cell--head">
-          <button data-i18n="BS" name="roll_ballistic_skill" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{ballistic_skill}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ballistic Skill}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+          <button data-i18n="BS" name="roll_ballistic_skill" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{ballistic_skill}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ballistic Skill}} {{roll_type=Characteristic}}"></button>
         </div>
         <div class="wfrp-chartable__cell">
           <input name="attr_ballistic_skill_initial" type="number" value="0"/>
@@ -179,7 +181,7 @@
           <input name="attr_ballistic_skill_bonus" type="hidden" value="0"/><span class="display" name="attr_ballistic_skill_bonus"></span>
         </div>
         <div class="wfrp-chartable__cell--head">
-          <button data-i18n="S" name="roll_strength" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{strength}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Strength}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+          <button data-i18n="S" name="roll_strength" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{strength}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Strength}} {{roll_type=Characteristic}}"></button>
         </div>
         <div class="wfrp-chartable__cell">
           <input name="attr_strength_initial" type="number" value="0"/>
@@ -198,7 +200,7 @@
           <input name="attr_strength_bonus" type="hidden" value="0"/><span class="display" name="attr_strength_bonus"></span>
         </div>
         <div class="wfrp-chartable__cell--head">
-          <button data-i18n="T" name="roll_toughness" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{toughness}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Toughness}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+          <button data-i18n="T" name="roll_toughness" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{toughness}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Toughness}} {{roll_type=Characteristic}}"></button>
         </div>
         <div class="wfrp-chartable__cell">
           <input name="attr_toughness_initial" type="number" value="0"/>
@@ -217,7 +219,7 @@
           <input name="attr_toughness_bonus" type="hidden" value="0"/><span class="display" name="attr_toughness_bonus"></span>
         </div>
         <div class="wfrp-chartable__cell--head">
-          <button data-i18n="I" name="roll_initiative" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{initiative}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Initiative}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+          <button data-i18n="I" name="roll_initiative" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{initiative}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Initiative}} {{roll_type=Characteristic}}"></button>
         </div>
         <div class="wfrp-chartable__cell">
           <input name="attr_initiative_initial" type="number" value="0"/>
@@ -236,7 +238,7 @@
           <input name="attr_initiative_bonus" type="hidden" value="0"/><span class="display" name="attr_initiative_bonus"></span>
         </div>
         <div class="wfrp-chartable__cell--head">
-          <button data-i18n="Ag" name="roll_agility" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{agility}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Agility}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+          <button data-i18n="Ag" name="roll_agility" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{agility}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Agility}} {{roll_type=Characteristic}}"></button>
         </div>
         <div class="wfrp-chartable__cell">
           <input name="attr_agility_initial" type="number" value="0"/>
@@ -255,7 +257,7 @@
           <input name="attr_agility_bonus" type="hidden" value="0"/><span class="display" name="attr_agility_bonus"></span>
         </div>
         <div class="wfrp-chartable__cell--head">
-          <button data-i18n="Dex" name="roll_dexterity" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{dexterity}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Dexterity}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+          <button data-i18n="Dex" name="roll_dexterity" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{dexterity}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Dexterity}} {{roll_type=Characteristic}}"></button>
         </div>
         <div class="wfrp-chartable__cell">
           <input name="attr_dexterity_initial" type="number" value="0"/>
@@ -274,7 +276,7 @@
           <input name="attr_dexterity_bonus" type="hidden" value="0"/><span class="display" name="attr_dexterity_bonus"></span>
         </div>
         <div class="wfrp-chartable__cell--head">
-          <button data-i18n="Int" name="roll_intelligence" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{intelligence}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Intelligence}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+          <button data-i18n="Int" name="roll_intelligence" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{intelligence}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Intelligence}} {{roll_type=Characteristic}}"></button>
         </div>
         <div class="wfrp-chartable__cell">
           <input name="attr_intelligence_initial" type="number" value="0"/>
@@ -293,7 +295,7 @@
           <input name="attr_intelligence_bonus" type="hidden" value="0"/><span class="display" name="attr_intelligence_bonus"></span>
         </div>
         <div class="wfrp-chartable__cell--head">
-          <button data-i18n="WP" name="roll_willpower" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{willpower}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Willpower}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+          <button data-i18n="WP" name="roll_willpower" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{willpower}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Willpower}} {{roll_type=Characteristic}}"></button>
         </div>
         <div class="wfrp-chartable__cell">
           <input name="attr_willpower_initial" type="number" value="0"/>
@@ -312,7 +314,7 @@
           <input name="attr_willpower_bonus" type="hidden" value="0"/><span class="display" name="attr_willpower_bonus"></span>
         </div>
         <div class="wfrp-chartable__cell--head">
-          <button data-i18n="Fel" name="roll_fellowship" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{fellowship}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Fellowship}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+          <button data-i18n="Fel" name="roll_fellowship" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{fellowship}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Fellowship}} {{roll_type=Characteristic}}"></button>
         </div>
         <div class="wfrp-chartable__cell">
           <input name="attr_fellowship_initial" type="number" value="0"/>
@@ -407,7 +409,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}} {{name=@{character_name}}}"><span name="attr_specialisation_name"></span></button>
+              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}}"><span name="attr_specialisation_name"></span></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_specialisation_characteristic">
@@ -458,7 +460,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Athletics" name="roll_athletics" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{athletics}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Athletics}} {{roll_type=Skill}} {{roll_notes=@{athletics_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Athletics" name="roll_athletics" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{athletics}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Athletics}} {{roll_type=Skill}} {{roll_notes=@{athletics_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_athletics_characteristic">
@@ -516,7 +518,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Bribery" name="roll_bribery" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{bribery}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Bribery}} {{roll_type=Skill}} {{roll_notes=@{bribery_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Bribery" name="roll_bribery" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{bribery}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Bribery}} {{roll_type=Skill}} {{roll_notes=@{bribery_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_bribery_characteristic">
@@ -574,7 +576,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Charm" name="roll_charm" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{charm}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Charm}} {{roll_type=Skill}} {{roll_notes=@{charm_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Charm" name="roll_charm" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{charm}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Charm}} {{roll_type=Skill}} {{roll_notes=@{charm_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_charm_characteristic">
@@ -632,7 +634,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Charm Animal" name="roll_charm-animal" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{charm-animal}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Charm Animal}} {{roll_type=Skill}} {{roll_notes=@{charm-animal_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Charm Animal" name="roll_charm-animal" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{charm-animal}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Charm Animal}} {{roll_type=Skill}} {{roll_notes=@{charm-animal_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_charm-animal_characteristic">
@@ -690,7 +692,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Climb" name="roll_climb" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{climb}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Climb}} {{roll_type=Skill}} {{roll_notes=@{climb_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Climb" name="roll_climb" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{climb}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Climb}} {{roll_type=Skill}} {{roll_notes=@{climb_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_climb_characteristic">
@@ -748,7 +750,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Consume Alcohol" name="roll_consume-alcohol" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{consume-alcohol}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Consume Alcohol}} {{roll_type=Skill}} {{roll_notes=@{consume-alcohol_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Consume Alcohol" name="roll_consume-alcohol" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{consume-alcohol}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Consume Alcohol}} {{roll_type=Skill}} {{roll_notes=@{consume-alcohol_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_consume-alcohol_characteristic">
@@ -806,7 +808,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Cool" name="roll_cool" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{cool}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Cool}} {{roll_type=Skill}} {{roll_notes=@{cool_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Cool" name="roll_cool" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{cool}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Cool}} {{roll_type=Skill}} {{roll_notes=@{cool_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_cool_characteristic">
@@ -864,7 +866,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Dodge" name="roll_dodge" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{dodge}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Dodge}} {{roll_type=Skill}} {{roll_notes=@{dodge_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Dodge" name="roll_dodge" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{dodge}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Dodge}} {{roll_type=Skill}} {{roll_notes=@{dodge_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_dodge_characteristic">
@@ -922,7 +924,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Drive" name="roll_drive" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{drive}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Drive}} {{roll_type=Skill}} {{roll_notes=@{drive_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Drive" name="roll_drive" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{drive}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Drive}} {{roll_type=Skill}} {{roll_notes=@{drive_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_drive_characteristic">
@@ -980,7 +982,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Endurance" name="roll_endurance" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{endurance}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Endurance}} {{roll_type=Skill}} {{roll_notes=@{endurance_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Endurance" name="roll_endurance" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{endurance}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Endurance}} {{roll_type=Skill}} {{roll_notes=@{endurance_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_endurance_characteristic">
@@ -1046,7 +1048,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}} {{name=@{character_name}}}"><span name="attr_specialisation_name"></span></button>
+              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}}"><span name="attr_specialisation_name"></span></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_specialisation_characteristic">
@@ -1097,7 +1099,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Gamble" name="roll_gamble" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{gamble}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Gamble}} {{roll_type=Skill}} {{roll_notes=@{gamble_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Gamble" name="roll_gamble" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{gamble}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Gamble}} {{roll_type=Skill}} {{roll_notes=@{gamble_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_gamble_characteristic">
@@ -1155,7 +1157,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Gossip" name="roll_gossip" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{gossip}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Gossip}} {{roll_type=Skill}} {{roll_notes=@{gossip_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Gossip" name="roll_gossip" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{gossip}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Gossip}} {{roll_type=Skill}} {{roll_notes=@{gossip_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_gossip_characteristic">
@@ -1213,7 +1215,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Haggle" name="roll_haggle" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{haggle}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Haggle}} {{roll_type=Skill}} {{roll_notes=@{haggle_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Haggle" name="roll_haggle" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{haggle}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Haggle}} {{roll_type=Skill}} {{roll_notes=@{haggle_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_haggle_characteristic">
@@ -1271,7 +1273,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Intimidate" name="roll_intimidate" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{intimidate}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Intimidate}} {{roll_type=Skill}} {{roll_notes=@{intimidate_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Intimidate" name="roll_intimidate" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{intimidate}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Intimidate}} {{roll_type=Skill}} {{roll_notes=@{intimidate_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_intimidate_characteristic">
@@ -1329,7 +1331,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Intuition" name="roll_intuition" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{intuition}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Intuition}} {{roll_type=Skill}} {{roll_notes=@{intuition_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Intuition" name="roll_intuition" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{intuition}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Intuition}} {{roll_type=Skill}} {{roll_notes=@{intuition_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_intuition_characteristic">
@@ -1387,7 +1389,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Leadership" name="roll_leadership" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{leadership}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Leadership}} {{roll_type=Skill}} {{roll_notes=@{leadership_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Leadership" name="roll_leadership" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{leadership}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Leadership}} {{roll_type=Skill}} {{roll_notes=@{leadership_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_leadership_characteristic">
@@ -1493,7 +1495,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Basic" name="roll_basic" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{basic}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Melee - Basic}} {{roll_type=Specialisation}} {{roll_notes=@{basic_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Basic" name="roll_basic" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{basic}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Melee - Basic}} {{roll_type=Specialisation}} {{roll_notes=@{basic_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_basic_characteristic">
@@ -1570,7 +1572,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Brawling" name="roll_brawling" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{brawling}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Melee - Brawling}} {{roll_type=Specialisation}} {{roll_notes=@{brawling_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Brawling" name="roll_brawling" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{brawling}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Melee - Brawling}} {{roll_type=Specialisation}} {{roll_notes=@{brawling_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_brawling_characteristic">
@@ -1647,7 +1649,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Cavalry" name="roll_cavalry" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{cavalry}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Melee - Cavalry}} {{roll_type=Specialisation}} {{roll_notes=@{cavalry_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Cavalry" name="roll_cavalry" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{cavalry}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Melee - Cavalry}} {{roll_type=Specialisation}} {{roll_notes=@{cavalry_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_cavalry_characteristic">
@@ -1724,7 +1726,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Fencing" name="roll_fencing" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{fencing}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Melee - Fencing}} {{roll_type=Specialisation}} {{roll_notes=@{fencing_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Fencing" name="roll_fencing" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{fencing}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Melee - Fencing}} {{roll_type=Specialisation}} {{roll_notes=@{fencing_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_fencing_characteristic">
@@ -1801,7 +1803,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Flail" name="roll_flail" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{flail}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Melee - Flail}} {{roll_type=Specialisation}} {{roll_notes=@{flail_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Flail" name="roll_flail" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{flail}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Melee - Flail}} {{roll_type=Specialisation}} {{roll_notes=@{flail_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_flail_characteristic">
@@ -1878,7 +1880,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Parry" name="roll_parry" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{parry}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Melee - Parry}} {{roll_type=Specialisation}} {{roll_notes=@{parry_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Parry" name="roll_parry" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{parry}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Melee - Parry}} {{roll_type=Specialisation}} {{roll_notes=@{parry_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_parry_characteristic">
@@ -1955,7 +1957,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Polearm" name="roll_polearm" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{polearm}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Melee - Polearm}} {{roll_type=Specialisation}} {{roll_notes=@{polearm_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Polearm" name="roll_polearm" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{polearm}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Melee - Polearm}} {{roll_type=Specialisation}} {{roll_notes=@{polearm_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_polearm_characteristic">
@@ -2032,7 +2034,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Two-Handed" name="roll_two-handed" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{two-handed}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Melee - Two-Handed}} {{roll_type=Specialisation}} {{roll_notes=@{two-handed_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Two-Handed" name="roll_two-handed" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{two-handed}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Melee - Two-Handed}} {{roll_type=Specialisation}} {{roll_notes=@{two-handed_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_two-handed_characteristic">
@@ -2108,7 +2110,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Navigation" name="roll_navigation" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{navigation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Navigation}} {{roll_type=Skill}} {{roll_notes=@{navigation_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Navigation" name="roll_navigation" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{navigation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Navigation}} {{roll_type=Skill}} {{roll_notes=@{navigation_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_navigation_characteristic">
@@ -2166,7 +2168,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Outdoor Survival" name="roll_outdoor-survival" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{outdoor-survival}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Outdoor Survival}} {{roll_type=Skill}} {{roll_notes=@{outdoor-survival_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Outdoor Survival" name="roll_outdoor-survival" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{outdoor-survival}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Outdoor Survival}} {{roll_type=Skill}} {{roll_notes=@{outdoor-survival_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_outdoor-survival_characteristic">
@@ -2224,7 +2226,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Perception" name="roll_perception" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{perception}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Perception}} {{roll_type=Skill}} {{roll_notes=@{perception_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Perception" name="roll_perception" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{perception}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Perception}} {{roll_type=Skill}} {{roll_notes=@{perception_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_perception_characteristic">
@@ -2290,7 +2292,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}} {{name=@{character_name}}}"><span name="attr_specialisation_name"></span></button>
+              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}}"><span name="attr_specialisation_name"></span></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_specialisation_characteristic">
@@ -2341,7 +2343,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Row" name="roll_row" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{row}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Row}} {{roll_type=Skill}} {{roll_notes=@{row_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Row" name="roll_row" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{row}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Row}} {{roll_type=Skill}} {{roll_notes=@{row_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_row_characteristic">
@@ -2407,7 +2409,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}} {{name=@{character_name}}}"><span name="attr_specialisation_name"></span></button>
+              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}}"><span name="attr_specialisation_name"></span></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_specialisation_characteristic">
@@ -2469,7 +2471,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Animal Care" name="roll_animal-care" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{animal-care}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Animal Care}} {{roll_type=Skill}} {{roll_notes=@{animal-care_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Animal Care" name="roll_animal-care" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{animal-care}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Animal Care}} {{roll_type=Skill}} {{roll_notes=@{animal-care_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_animal-care_characteristic">
@@ -2535,7 +2537,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}} {{name=@{character_name}}}"><span name="attr_specialisation_name"></span></button>
+              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}}"><span name="attr_specialisation_name"></span></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_specialisation_characteristic">
@@ -2588,6 +2590,10 @@
             <div class="wfrp-skilltable__cell--grouped"><span data-i18n="Channelling"></span></div>
             <div class="wfrp-skilltable_row wfrp-settings control__hide--channelling_settings">
               <h2 data-i18n="specialisation display"></h2>
+              <div class="wfrp-settings__row"> 
+                <div class="wfrp-settings__label" data-i18n="Azyr"></div>
+                <input class="wfrp-settings__checkbox" name="attr_azyr_control" type="checkbox"/>
+              </div>
               <div class="wfrp-settings__row"> 
                 <div class="wfrp-settings__label" data-i18n="Aqshy"></div>
                 <input class="wfrp-settings__checkbox" name="attr_aqshy_control" type="checkbox"/>
@@ -2620,6 +2626,87 @@
                 <div class="wfrp-settings__label" data-i18n="Ulgu"></div>
                 <input class="wfrp-settings__checkbox" name="attr_ulgu_control" type="checkbox"/>
               </div>
+              <div class="wfrp-settings__row"> 
+                <div class="wfrp-settings__label" data-i18n="Custom"></div>
+                <input class="wfrp-settings__checkbox" name="attr_custom_control" type="checkbox"/>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="specialisation_wrapper">
+          <input name="attr_azyr_settings" type="hidden"/>
+          <input name="attr_azyr_control" type="hidden"/>
+          <div class="wfrp-skilltable__row--specialisation control__hide--azyr">
+            <input name="attr_azyr_characteristic" type="hidden" value="willpower"/>
+            <div class="wfrp-skilltable__cell--settingstoggle">
+              <label class="wfrp-displaytoggle">
+                <input class="wfrp-displaytoggle__hide" name="attr_azyr_settings" type="checkbox" value="1"/><span class="wfrp-displaytoggle__span">y</span>
+              </label>
+            </div>
+            <div class="wfrp-skilltable__cell">
+              <button data-i18n="Azyr" name="roll_azyr" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{azyr}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Azyr}} {{roll_type=Specialisation}} {{roll_notes=@{azyr_notes}}}"></button>
+            </div>
+            <div class="wfrp-skilltable__cell">
+              <select name="attr_azyr_characteristic">
+                <option data-i18n="WS" value="weapon_skill"></option>
+                <option data-i18n="BS" value="ballistic_skill"></option>
+                <option data-i18n="S" value="strength"></option>
+                <option data-i18n="T" value="toughness"></option>
+                <option data-i18n="I" value="initiative"></option>
+                <option data-i18n="Ag" value="agility"></option>
+                <option data-i18n="Dex" value="dexterity"></option>
+                <option data-i18n="Int" value="intelligence"></option>
+                <option selected="willpower" data-i18n="WP" value="willpower"></option>
+                <option data-i18n="Fel" value="fellowship"></option>
+              </select>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--weapon_skill"><span class="display" name="attr_weapon_skill"></span>
+              <input name="attr_weapon_skill" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--ballistic_skill"><span class="display" name="attr_ballistic_skill"></span>
+              <input name="attr_ballistic_skill" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--strength"><span class="display" name="attr_strength"></span>
+              <input name="attr_strength" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--toughness"><span class="display" name="attr_toughness"></span>
+              <input name="attr_toughness" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--initiative"><span class="display" name="attr_initiative"></span>
+              <input name="attr_initiative" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--agility"><span class="display" name="attr_agility"></span>
+              <input name="attr_agility" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--dexterity"><span class="display" name="attr_dexterity"></span>
+              <input name="attr_dexterity" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--intelligence"><span class="display" name="attr_intelligence"></span>
+              <input name="attr_intelligence" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--willpower"><span class="display" name="attr_willpower"></span>
+              <input name="attr_willpower" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--fellowship"><span class="display" name="attr_fellowship"></span>
+              <input name="attr_fellowship" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell">
+              <input name="attr_azyr_advances" type="hidden" value="0"/><span class="display" name="attr_azyr_advances"></span>
+            </div>
+            <div class="wfrp-skilltable__cell--last wfrp-skilltable__cell--highlight"><span class="display" name="attr_azyr"></span></div>
+            <div class="wfrp-skilltable_row wfrp-settings control__hide--azyr_settings">
+              <div class="wfrp-settings__row">
+                <div class="wfrp-settings__label" data-i18n="Modifier"> </div><span class="display" name="attr_azyr_modifier"></span>
+                <input name="attr_azyr_modifier" type="hidden" value="0"/>
+              </div>
+              <div class="wfrp-settings__row">
+                <div class="wfrp-settings__label" data-i18n="Bonus"> </div>
+                <input class="wfrp-settings__input" name="attr_azyr_bonus" type="text"/>
+              </div>
+              <div class="wfrp-settings__row--span">
+                <div class="wfrp-settings__label" data-i18n="Roll Notes"> </div>
+                <input class="wfrp-settings__input" name="attr_azyr_notes" type="text"/>
+              </div>
             </div>
           </div>
         </div>
@@ -2634,7 +2721,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Aqshy" name="roll_aqshy" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{aqshy}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Aqshy}} {{roll_type=Specialisation}} {{roll_notes=@{aqshy_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Aqshy" name="roll_aqshy" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{aqshy}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Aqshy}} {{roll_type=Specialisation}} {{roll_notes=@{aqshy_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_aqshy_characteristic">
@@ -2711,7 +2798,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Chamon" name="roll_chamon" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{chamon}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Chamon}} {{roll_type=Specialisation}} {{roll_notes=@{chamon_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Chamon" name="roll_chamon" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{chamon}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Chamon}} {{roll_type=Specialisation}} {{roll_notes=@{chamon_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_chamon_characteristic">
@@ -2788,7 +2875,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Dhar" name="roll_dhar" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{dhar}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Dhar}} {{roll_type=Specialisation}} {{roll_notes=@{dhar_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Dhar" name="roll_dhar" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{dhar}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Dhar}} {{roll_type=Specialisation}} {{roll_notes=@{dhar_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_dhar_characteristic">
@@ -2865,7 +2952,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Ghur" name="roll_ghur" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{ghur}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Ghur}} {{roll_type=Specialisation}} {{roll_notes=@{ghur_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Ghur" name="roll_ghur" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{ghur}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Ghur}} {{roll_type=Specialisation}} {{roll_notes=@{ghur_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_ghur_characteristic">
@@ -2942,7 +3029,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Ghyran" name="roll_ghyran" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{ghyran}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Ghyran}} {{roll_type=Specialisation}} {{roll_notes=@{ghyran_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Ghyran" name="roll_ghyran" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{ghyran}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Ghyran}} {{roll_type=Specialisation}} {{roll_notes=@{ghyran_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_ghyran_characteristic">
@@ -3019,7 +3106,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Hysh" name="roll_hysh" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{hysh}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Hysh}} {{roll_type=Specialisation}} {{roll_notes=@{hysh_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Hysh" name="roll_hysh" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{hysh}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Hysh}} {{roll_type=Specialisation}} {{roll_notes=@{hysh_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_hysh_characteristic">
@@ -3096,7 +3183,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Shyish" name="roll_shyish" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{shyish}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Shyish}} {{roll_type=Specialisation}} {{roll_notes=@{shyish_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Shyish" name="roll_shyish" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{shyish}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Shyish}} {{roll_type=Specialisation}} {{roll_notes=@{shyish_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_shyish_characteristic">
@@ -3173,7 +3260,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Ulgu" name="roll_ulgu" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{ulgu}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Ulgu}} {{roll_type=Specialisation}} {{roll_notes=@{ulgu_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Ulgu" name="roll_ulgu" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{ulgu}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - Ulgu}} {{roll_type=Specialisation}} {{roll_notes=@{ulgu_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_ulgu_characteristic">
@@ -3239,6 +3326,87 @@
             </div>
           </div>
         </div>
+        <div class="specialisation_wrapper">
+          <input name="attr_custom_settings" type="hidden"/>
+          <input name="attr_custom_control" type="hidden"/>
+          <div class="wfrp-skilltable__row--specialisation control__hide--custom">
+            <input name="attr_custom_characteristic" type="hidden" value="willpower"/>
+            <div class="wfrp-skilltable__cell--settingstoggle">
+              <label class="wfrp-displaytoggle">
+                <input class="wfrp-displaytoggle__hide" name="attr_custom_settings" type="checkbox" value="1"/><span class="wfrp-displaytoggle__span">y</span>
+              </label>
+            </div>
+            <div class="wfrp-skilltable__cell">
+              <button name="roll_custom" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{custom}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Channelling - @{custom_name}}} {{roll_type=Specialisation}} {{roll_notes=@{custom_notes}}}"><span name="attr_custom_name"></span></button>
+            </div>
+            <div class="wfrp-skilltable__cell">
+              <select name="attr_custom_characteristic">
+                <option data-i18n="WS" value="weapon_skill"></option>
+                <option data-i18n="BS" value="ballistic_skill"></option>
+                <option data-i18n="S" value="strength"></option>
+                <option data-i18n="T" value="toughness"></option>
+                <option data-i18n="I" value="initiative"></option>
+                <option data-i18n="Ag" value="agility"></option>
+                <option data-i18n="Dex" value="dexterity"></option>
+                <option data-i18n="Int" value="intelligence"></option>
+                <option selected="willpower" data-i18n="WP" value="willpower"></option>
+                <option data-i18n="Fel" value="fellowship"></option>
+              </select>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--weapon_skill"><span class="display" name="attr_weapon_skill"></span>
+              <input name="attr_weapon_skill" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--ballistic_skill"><span class="display" name="attr_ballistic_skill"></span>
+              <input name="attr_ballistic_skill" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--strength"><span class="display" name="attr_strength"></span>
+              <input name="attr_strength" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--toughness"><span class="display" name="attr_toughness"></span>
+              <input name="attr_toughness" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--initiative"><span class="display" name="attr_initiative"></span>
+              <input name="attr_initiative" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--agility"><span class="display" name="attr_agility"></span>
+              <input name="attr_agility" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--dexterity"><span class="display" name="attr_dexterity"></span>
+              <input name="attr_dexterity" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--intelligence"><span class="display" name="attr_intelligence"></span>
+              <input name="attr_intelligence" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--willpower"><span class="display" name="attr_willpower"></span>
+              <input name="attr_willpower" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell control__hide--fellowship"><span class="display" name="attr_fellowship"></span>
+              <input name="attr_fellowship" type="hidden" value="0"/>
+            </div>
+            <div class="wfrp-skilltable__cell">
+              <input name="attr_custom_advances" type="hidden" value="0"/><span class="display" name="attr_custom_advances"></span>
+            </div>
+            <div class="wfrp-skilltable__cell--last wfrp-skilltable__cell--highlight"><span class="display" name="attr_custom"></span></div>
+            <div class="wfrp-skilltable_row wfrp-settings control__hide--custom_settings">
+              <div class="wfrp-settings__row--span">
+                <div class="wfrp-settings__label" data-i18n="Name"> </div>
+                <input class="wfrp-settings__input" name="attr_custom_name" type="text"/>
+              </div>
+              <div class="wfrp-settings__row">
+                <div class="wfrp-settings__label" data-i18n="Modifier"> </div><span class="display" name="attr_custom_modifier"></span>
+                <input name="attr_custom_modifier" type="hidden" value="0"/>
+              </div>
+              <div class="wfrp-settings__row">
+                <div class="wfrp-settings__label" data-i18n="Bonus"> </div>
+                <input class="wfrp-settings__input" name="attr_custom_bonus" type="text"/>
+              </div>
+              <div class="wfrp-settings__row--span">
+                <div class="wfrp-settings__label" data-i18n="Roll Notes"> </div>
+                <input class="wfrp-settings__input" name="attr_custom_notes" type="text"/>
+              </div>
+            </div>
+          </div>
+        </div>
         <div class="wfrp-skillwrapper">   
           <input name="attr_evaluate_settings" type="hidden"/>
           <div class="wfrp-skilltable__row">       
@@ -3249,7 +3417,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Evaluate" name="roll_evaluate" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{evaluate}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Evaluate}} {{roll_type=Skill}} {{roll_notes=@{evaluate_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Evaluate" name="roll_evaluate" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{evaluate}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Evaluate}} {{roll_type=Skill}} {{roll_notes=@{evaluate_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_evaluate_characteristic">
@@ -3307,7 +3475,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Heal" name="roll_heal" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{heal}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Heal}} {{roll_type=Skill}} {{roll_notes=@{heal_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Heal" name="roll_heal" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{heal}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Heal}} {{roll_type=Skill}} {{roll_notes=@{heal_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_heal_characteristic">
@@ -3385,7 +3553,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Magick" name="roll_magick" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{magick}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Language - Magick}} {{roll_type=Specialisation}} {{roll_notes=@{magick_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Magick" name="roll_magick" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{magick}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Language - Magick}} {{roll_type=Specialisation}} {{roll_notes=@{magick_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_magick_characteristic">
@@ -3460,7 +3628,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}} {{name=@{character_name}}}"><span name="attr_specialisation_name"></span></button>
+              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}}"><span name="attr_specialisation_name"></span></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_specialisation_characteristic">
@@ -3519,7 +3687,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}} {{name=@{character_name}}}"><span name="attr_specialisation_name"></span></button>
+              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}}"><span name="attr_specialisation_name"></span></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_specialisation_characteristic">
@@ -3578,7 +3746,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}} {{name=@{character_name}}}"><span name="attr_specialisation_name"></span></button>
+              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}}"><span name="attr_specialisation_name"></span></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_specialisation_characteristic">
@@ -3629,7 +3797,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Pick Lock" name="roll_pick-lock" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{pick-lock}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Pick Lock}} {{roll_type=Skill}} {{roll_notes=@{pick-lock_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Pick Lock" name="roll_pick-lock" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{pick-lock}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Pick Lock}} {{roll_type=Skill}} {{roll_notes=@{pick-lock_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_pick-lock_characteristic">
@@ -3695,7 +3863,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}} {{name=@{character_name}}}"><span name="attr_specialisation_name"></span></button>
+              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}}"><span name="attr_specialisation_name"></span></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_specialisation_characteristic">
@@ -3746,7 +3914,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Pray" name="roll_pray" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{pray}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Pray}} {{roll_type=Skill}} {{roll_notes=@{pray_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Pray" name="roll_pray" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{pray}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Pray}} {{roll_type=Skill}} {{roll_notes=@{pray_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_pray_characteristic">
@@ -3852,7 +4020,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Blackpowder" name="roll_blackpowder" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{blackpowder}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ranged - Blackpowder}} {{roll_type=Specialisation}} {{roll_notes=@{blackpowder_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Blackpowder" name="roll_blackpowder" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{blackpowder}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ranged - Blackpowder}} {{roll_type=Specialisation}} {{roll_notes=@{blackpowder_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_blackpowder_characteristic">
@@ -3929,7 +4097,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Bow" name="roll_bow" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{bow}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ranged - Bow}} {{roll_type=Specialisation}} {{roll_notes=@{bow_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Bow" name="roll_bow" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{bow}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ranged - Bow}} {{roll_type=Specialisation}} {{roll_notes=@{bow_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_bow_characteristic">
@@ -4006,7 +4174,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Crossbow" name="roll_crossbow" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{crossbow}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ranged - Crossbow}} {{roll_type=Specialisation}} {{roll_notes=@{crossbow_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Crossbow" name="roll_crossbow" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{crossbow}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ranged - Crossbow}} {{roll_type=Specialisation}} {{roll_notes=@{crossbow_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_crossbow_characteristic">
@@ -4083,7 +4251,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Engineering" name="roll_engineering" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{engineering}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ranged - Engineering}} {{roll_type=Specialisation}} {{roll_notes=@{engineering_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Engineering" name="roll_engineering" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{engineering}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ranged - Engineering}} {{roll_type=Specialisation}} {{roll_notes=@{engineering_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_engineering_characteristic">
@@ -4160,7 +4328,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Entangling" name="roll_entangling" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{entangling}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ranged - Entangling}} {{roll_type=Specialisation}} {{roll_notes=@{entangling_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Entangling" name="roll_entangling" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{entangling}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ranged - Entangling}} {{roll_type=Specialisation}} {{roll_notes=@{entangling_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_entangling_characteristic">
@@ -4237,7 +4405,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Explosives" name="roll_explosives" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{explosives}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ranged - Explosives}} {{roll_type=Specialisation}} {{roll_notes=@{explosives_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Explosives" name="roll_explosives" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{explosives}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ranged - Explosives}} {{roll_type=Specialisation}} {{roll_notes=@{explosives_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_explosives_characteristic">
@@ -4314,7 +4482,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Sling" name="roll_sling" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{sling}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ranged - Sling}} {{roll_type=Specialisation}} {{roll_notes=@{sling_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Sling" name="roll_sling" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{sling}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ranged - Sling}} {{roll_type=Specialisation}} {{roll_notes=@{sling_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_sling_characteristic">
@@ -4391,7 +4559,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Throwing" name="roll_throwing" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{throwing}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ranged - Throwing}} {{roll_type=Specialisation}} {{roll_notes=@{throwing_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Throwing" name="roll_throwing" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{throwing}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ranged - Throwing}} {{roll_type=Specialisation}} {{roll_notes=@{throwing_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_throwing_characteristic">
@@ -4467,7 +4635,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Research" name="roll_research" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{research}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Research}} {{roll_type=Skill}} {{roll_notes=@{research_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Research" name="roll_research" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{research}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Research}} {{roll_type=Skill}} {{roll_notes=@{research_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_research_characteristic">
@@ -4533,7 +4701,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}} {{name=@{character_name}}}"><span name="attr_specialisation_name"></span></button>
+              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}}"><span name="attr_specialisation_name"></span></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_specialisation_characteristic">
@@ -4592,7 +4760,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}} {{name=@{character_name}}}"><span name="attr_specialisation_name"></span></button>
+              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}}"><span name="attr_specialisation_name"></span></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_specialisation_characteristic">
@@ -4643,7 +4811,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Set Trap" name="roll_set-trap" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{set-trap}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Set Trap}} {{roll_type=Skill}} {{roll_notes=@{set-trap_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Set Trap" name="roll_set-trap" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{set-trap}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Set Trap}} {{roll_type=Skill}} {{roll_notes=@{set-trap_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_set-trap_characteristic">
@@ -4701,7 +4869,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Sleight of Hand" name="roll_sleight-of-hand" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{sleight-of-hand}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Sleight of Hand}} {{roll_type=Skill}} {{roll_notes=@{sleight-of-hand_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Sleight of Hand" name="roll_sleight-of-hand" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{sleight-of-hand}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Sleight of Hand}} {{roll_type=Skill}} {{roll_notes=@{sleight-of-hand_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_sleight-of-hand_characteristic">
@@ -4759,7 +4927,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Swim" name="roll_swim" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{swim}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Swim}} {{roll_type=Skill}} {{roll_notes=@{swim_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Swim" name="roll_swim" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{swim}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Swim}} {{roll_type=Skill}} {{roll_notes=@{swim_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_swim_characteristic">
@@ -4817,7 +4985,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button data-i18n="Track" name="roll_track" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{track}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Track}} {{roll_type=Skill}} {{roll_notes=@{track_notes}}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Track" name="roll_track" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{track}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Track}} {{roll_type=Skill}} {{roll_notes=@{track_notes}}}"></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_track_characteristic">
@@ -4883,7 +5051,7 @@
               </label>
             </div>
             <div class="wfrp-skilltable__cell">
-              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}} {{name=@{character_name}}}"><span name="attr_specialisation_name"></span></button>
+              <button class="wfrp-skilltable__roll" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{specialisation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{specialisation_name}}} {{roll_type=Skill Specialisation}} {{roll_notes=@{specialisation_notes}}}"><span name="attr_specialisation_name"></span></button>
             </div>
             <div class="wfrp-skilltable__cell">
               <select name="attr_specialisation_characteristic">
@@ -4949,7 +5117,7 @@
             </div>
             <div class="wfrp-talenttable__cell"><span name="attr_talent_ranks"></span></div>
             <div class="wfrp-talenttable__cell--vocalise">
-              <button class="wfrp-vocalise" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll_name=@{talent_name}}} {{roll_type=Talent}} {{roll_text=@{talent_description}}} {{name=@{character_name}}}">w</button>
+              <button class="wfrp-vocalise" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll_name=@{talent_name}}} {{roll_type=Talent}} {{roll_text=@{talent_description}}}">w</button>
             </div>
             <input name="attr_talent_toggle" type="hidden"/>
             <div class="wfrp-talenttable__cell--description"><span name="attr_talent_description"></span></div>
@@ -5053,7 +5221,7 @@
             </div>
             <div class="wfrp-conditiontable__cell"><span name="attr_condition_ranks"></span></div>
             <div class="wfrp-conditiontable__cell--vocalise">
-              <button class="wfrp-vocalise" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll_name=@{condition_name}}} {{roll_type=Condition}} {{roll_text=@{condition_description}}} {{name=@{character_name}}}">w</button>
+              <button class="wfrp-vocalise" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll_name=@{condition_name}}} {{roll_type=Condition}} {{roll_text=@{condition_description}}}">w</button>
             </div>
             <input name="attr_condition_toggle" type="hidden"/>
             <div class="wfrp-conditiontable__cell--description"><span name="attr_condition_description"></span></div>
@@ -5104,7 +5272,7 @@
               </label>&nbsp;(<span name="attr_psychology_target"></span>)
             </div>
             <div class="wfrp-psychologytable__cell--vocalise">
-              <button class="wfrp-vocalise" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll_name=@{psychology_name}}} {{roll_type=Psychology}} {{roll_text=@{psychology_description}}} {{name=@{character_name}}}">w</button>
+              <button class="wfrp-vocalise" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll_name=@{psychology_name}}} {{roll_type=Psychology}} {{roll_text=@{psychology_description}}}">w</button>
             </div>
             <input name="attr_psychology_toggle" type="hidden"/>
             <div class="wfrp-psychologytable__cell--description"><span name="attr_psychology_description"></span></div>
@@ -5154,7 +5322,7 @@
               </label>
             </div>
             <div class="wfrp-corruptiontable__cell--vocalise">
-              <button class="wfrp-vocalise" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll_name=@{corruption_name}}} {{roll_type=Corruption}} {{roll_text=@{corruption_description}}} {{name=@{character_name}}}">w</button>
+              <button class="wfrp-vocalise" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll_name=@{corruption_name}}} {{roll_type=Corruption}} {{roll_text=@{corruption_description}}}">w</button>
             </div>
             <input name="attr_corruption_toggle" type="hidden"/>
             <div class="wfrp-corruptiontable__cell--description"><span name="attr_corruption_description"></span></div>
@@ -5349,19 +5517,19 @@
           <button data-i18n="Initiative" type="roll" value="&amp;{template:wfrp} {{name=@{character_name}}} {{roll_name=Initiative}} @{roll_init}"></button>
         </div>
         <div class="wfrp-controls__button">
-          <button data-i18n="Dodge" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{dodge}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Dodge}} {{roll_type=Skill}} {{roll_notes=@{dodge_notes}}} {{name=@{character_name}}}"></button>
+          <button data-i18n="Dodge" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{dodge}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Dodge}} {{roll_type=Skill}} {{roll_notes=@{dodge_notes}}}"></button>
         </div>
         <div class="wfrp-controls__button">
-          <button data-i18n="Endurance" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{endurance}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Endurance}} {{roll_type=Skill}} {{roll_notes=@{endurance_notes}}} {{name=@{character_name}}}"></button>
+          <button data-i18n="Endurance" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{endurance}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Endurance}} {{roll_type=Skill}} {{roll_notes=@{endurance_notes}}}"></button>
         </div>
         <div class="wfrp-controls__button">
-          <button data-i18n="Intuition" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{intuition}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Intuition}} {{roll_type=Skill}} {{roll_notes=@{intuition_notes}}} {{name=@{character_name}}}"></button>
+          <button data-i18n="Intuition" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{intuition}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Intuition}} {{roll_type=Skill}} {{roll_notes=@{intuition_notes}}}"></button>
         </div>
         <div class="wfrp-controls__button">
-          <button data-i18n="Perception" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{perception}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Perception}} {{roll_type=Skill}} {{roll_notes=@{perception_notes}}} {{name=@{character_name}}}"></button>
+          <button data-i18n="Perception" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{perception}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Perception}} {{roll_type=Skill}} {{roll_notes=@{perception_notes}}}"></button>
         </div>
         <div class="wfrp-controls__button">
-          <button data-i18n="Cool" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{cool}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Cool}} {{roll_type=Skill}} {{roll_notes=@{cool_notes}}} {{name=@{character_name}}}"></button>
+          <button data-i18n="Cool" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{cool}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Cool}} {{roll_type=Skill}} {{roll_notes=@{cool_notes}}}"></button>
         </div>
         <!--.wfrp-controls__buttonbutton(data-i18n="Critical Hit", type="roll", value=rolls.crit)
         -->
@@ -5518,7 +5686,7 @@
               </label>
             </div>
             <div class="wfrp-weapontable__cell">
-              <button name="roll_undefined" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{weapon_target}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=@{weapon_name}}} {{roll_type=@{weapon_group} Attack}} {{roll_notes=@{weapon_notes}}} {{roll_qualities=@{weapon_qualities}}} {{roll_damage=[[@{weapon_damage}]] + Opposed SL}} {{roll_range=@{weapon_range}}} {{roll_text=@{weapon_description}}} {{roll_hit_location=1}} {{roll_crit_location=[[1d100]]}} {{name=@{character_name}}}"><span name="attr_weapon_name"></span></button>
+              <button name="roll_undefined" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{weapon_target}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=@{weapon_name}}} {{roll_type=@{weapon_group} Attack}} {{roll_notes=@{weapon_notes}}} {{roll_qualities=@{weapon_qualities}}} {{roll_damage=[[@{weapon_damage}]] + Opposed SL}} {{roll_range=@{weapon_range}}} {{roll_text=@{weapon_description}}} {{roll_hit_location=1}} {{roll_crit_location=[[1d100]]}}"><span name="attr_weapon_name"></span></button>
             </div>
             <div class="wfrp-weapontable__cell"><span name="attr_weapon_group"></span></div>
             <div class="wfrp-weapontable__cell"><span name="attr_weapon_target_display"></span>
@@ -5616,7 +5784,7 @@
               </label>
             </div>
             <div class="wfrp-spelltable__cell">
-              <button type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{spell_total}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=@{spell_name}}} {{roll_type=@{spell_type}}} {{roll_target=@{spell_target}}} {{roll_duration=@{spell_duration}}} {{roll_range=@{spell_range}}} {{roll_cn=[[@{spell_cn}-?{Channeling|0}]]}} {{roll_text=@{spell_description}}} {{roll_spell=1}} {{name=@{character_name}}}"><span name="attr_spell_name"></span></button>
+              <button type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{spell_total}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=@{spell_name}}} {{roll_type=@{spell_type}}} {{roll_target=@{spell_target}}} {{roll_duration=@{spell_duration}}} {{roll_range=@{spell_range}}} {{roll_cn=[[@{spell_cn}-?{Channeling|0}]]}} {{roll_text=@{spell_description}}} {{roll_spell=1}}"><span name="attr_spell_name"></span></button>
             </div>
             <div class="wfrp-spelltable__cell"><span name="attr_spell_deity"></span><span name="attr_spell_lore"></span></div>
             <div class="wfrp-spelltable__cell"><span name="attr_spell_display"></span>
@@ -5632,7 +5800,7 @@
                 <div class="wfrp-settings__label" data-i18n="Name"> </div>
                 <input class="wfrp-settings__input" name="attr_spell_name" type="text"/>
               </div>
-              <input name="attr_spell_type" type="hidden"/>
+              <input name="attr_spell_type" type="hidden" value="Spell"/>
               <div class="wfrp-settings__row">
                 <div class="wfrp-settings__label" data-i18n="Type"> </div>
                 <select class="wfrp-settings__input" name="attr_spell_type">
@@ -6344,11 +6512,13 @@
               <div class="wfrp-settings__wrapper">
                 <input class="sheet-control__custom" name="attr_species" type="hidden"/>
                 <select class="wfrp-settings__select sheet-control__custom" name="attr_species">
+                  <option data-i18n="" value=""></option>
                   <option data-i18n="Human" value="Human"></option>
                   <option data-i18n="Halfling" value="Halfling"></option>
                   <option data-i18n="Dwarf" value="Dwarf"></option>
                   <option data-i18n="High Elf" value="High Elf"></option>
                   <option data-i18n="Wood Elf" value="Wood Elf"></option>
+                  <option data-i18n="Gnome" value="Gnome"></option>
                   <option data-i18n="Custom" value="Custom"></option>
                 </select>
                 <div class="wfrp-header__customwrapper sheet-control__custom">
@@ -6490,6 +6660,10 @@
       </div>
     </div>
     <div class="wfrp-experience--alt page__advances--flex">
+      <input name="attr_advances_changed" type="hidden"/>
+      <div class="wfrp-panel wfrp-advancenotify"><span class="wfrp-advancenotify__message" data-i18n="This sheet has pending advance changes. Click below to save these changes."></span>
+        <button class="wfrp-advancenotify__button" data-i18n="Update" name="act_update_advances" type="action"> </button>
+      </div>
       <div class="wfrp-panel">
         <h1 class="wfrp-panel__header" data-i18n="Experience"></h1>
         <div class="wfrp-field--grid2-1"><span class="wfrp-field__header" data-i18n="Current XP"></span><span class="wfrp-field__span" name="attr_current_xp"></span>
@@ -6573,10 +6747,10 @@
             <input class="wfrp-settingstable__select" name="attr_encumbrance_mod" type="number" value="0"/>
           </div>
           <div class="wfrp-settingstable__row">
-            <div class="wfrp-settingstable__label" data-i18n="Hide Control Buttons"></div>
+            <div class="wfrp-settingstable__label" data-i18n="Control Buttons"></div>
             <select class="wfrp-settingstable__select" name="attr_setting_button_hide">
-              <option data-i18n="Off" value="1"></option>
-              <option data-i18n="On" value="2"></option>
+              <option data-i18n="Show" value="1"></option>
+              <option data-i18n="Hide" value="2"></option>
             </select>
           </div>
         </div>
@@ -6614,6 +6788,10 @@
               <option value="3">1d10+IB+AgB</option>
             </select>
           </div>
+          <div class="wfrp-settingstable__row">
+            <div class="wfrp-settingstable__label" data-i18n="Initiative Roll Bonus"></div>
+            <input class="wfrp-settingstable__select" name="attr_init_bonus" type="number" value="0"/>
+          </div>
           <div class="wfrp-settingstable__row">
             <div class="wfrp-settingstable__label" data-i18n="Whisper to GM"></div>
             <select class="wfrp-settingstable__select" name="attr_setting_whisper">
@@ -6832,6 +7010,10 @@
               <div class="wfrp-npcsettings__label" data-i18n="Bribery"></div>
               <input class="wfrp-npcsettings__input" name="attr_bribery" type="number"/>
             </div>
+            <div class="wfrp-npcsettings__skill">
+              <div class="wfrp-npcsettings__label" data-i18n="Channelling (Azyr)"> </div>
+              <input class="wfrp-npcsettings__input" name="attr_Azyr" type="number"/>
+            </div>
             <div class="wfrp-npcsettings__skill">
               <div class="wfrp-npcsettings__label" data-i18n="Channelling (Aqshy)"> </div>
               <input class="wfrp-npcsettings__input" name="attr_Aqshy" type="number"/>
@@ -6864,6 +7046,10 @@
               <div class="wfrp-npcsettings__label" data-i18n="Channelling (Ulgu)"> </div>
               <input class="wfrp-npcsettings__input" name="attr_Ulgu" type="number"/>
             </div>
+            <div class="wfrp-npcsettings__skill">
+              <div class="wfrp-npcsettings__label" data-i18n="Channelling (Custom)"> </div>
+              <input class="wfrp-npcsettings__input" name="attr_Custom" type="number"/>
+            </div>
             <div class="wfrp-npcsettings__skill">
               <div class="wfrp-npcsettings__label" data-i18n="Charm"></div>
               <input class="wfrp-npcsettings__input" name="attr_charm" type="number"/>
@@ -7041,6 +7227,15 @@
               <input class="wfrp-npcsettings__input" name="attr_track" type="number"/>
             </div>
           </div>
+          <h2 data-i18n="Additional Skills"></h2>
+          <div class="wfrp-npcsettings__skills--additional">
+            <fieldset class="repeating_npc-skills">
+              <div class="wfrp-npcsettings__skill">
+                <input class="wfrp-npcsettings__input" data-i18n-placeholder="Skill Name (Specialisation)" name="attr_npc_skillname" type="text"/>
+                <input class="wfrp-npcsettings__input" name="attr_npc_skill" type="number"/>
+              </div>
+            </fieldset>
+          </div>
           <h2 data-i18n="Settings"></h2>
           <div class="wfrp-npcsettings__settings">
             <div class="wfrp-npcsettings__row">
@@ -7096,6 +7291,10 @@
                 <option value="3">1d10+IB+AgB</option>
               </select>
             </div>
+            <div class="wfrp-npcsettings__row">
+              <div class="wfrp-npcsettings__label" data-i18n="Initiative Roll Bonus"></div>
+              <input class="wfrp-npcsettings__input" name="attr_init_bonus" type="number" value="0"/>
+            </div>
             <div class="wfrp-npcsettings__row">
               <div class="wfrp-npcsettings__label" data-i18n="Maximum Advantage"></div>
               <input class="wfrp-npcsettings__input" name="attr_setting_max_advantage" type="number"/>
@@ -7133,61 +7332,61 @@
           </div>
           <div class="wfrp-npccharacteristic__col">
             <div class="wfrp-npccharacteristic__cell--head">
-              <button data-i18n="WS" name="roll_weapon_skill" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{weapon_skill}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Weapon Skill}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+              <button data-i18n="WS" name="roll_weapon_skill" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{weapon_skill}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Weapon Skill}} {{roll_type=Characteristic}}"></button>
             </div>
             <div class="wfrp-npccharacteristic__cell"><span name="attr_weapon_skill"></span></div>
           </div>
           <div class="wfrp-npccharacteristic__col">
             <div class="wfrp-npccharacteristic__cell--head">
-              <button data-i18n="BS" name="roll_ballistic_skill" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{ballistic_skill}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ballistic Skill}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+              <button data-i18n="BS" name="roll_ballistic_skill" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{ballistic_skill}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Ballistic Skill}} {{roll_type=Characteristic}}"></button>
             </div>
             <div class="wfrp-npccharacteristic__cell"><span name="attr_ballistic_skill"></span></div>
           </div>
           <div class="wfrp-npccharacteristic__col">
             <div class="wfrp-npccharacteristic__cell--head">
-              <button data-i18n="S" name="roll_strength" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{strength}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Strength}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+              <button data-i18n="S" name="roll_strength" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{strength}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Strength}} {{roll_type=Characteristic}}"></button>
             </div>
             <div class="wfrp-npccharacteristic__cell"><span name="attr_strength"></span></div>
           </div>
           <div class="wfrp-npccharacteristic__col">
             <div class="wfrp-npccharacteristic__cell--head">
-              <button data-i18n="T" name="roll_toughness" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{toughness}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Toughness}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+              <button data-i18n="T" name="roll_toughness" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{toughness}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Toughness}} {{roll_type=Characteristic}}"></button>
             </div>
             <div class="wfrp-npccharacteristic__cell"><span name="attr_toughness"></span></div>
           </div>
           <div class="wfrp-npccharacteristic__col">
             <div class="wfrp-npccharacteristic__cell--head">
-              <button data-i18n="I" name="roll_initiative" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{initiative}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Initiative}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+              <button data-i18n="I" name="roll_initiative" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{initiative}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Initiative}} {{roll_type=Characteristic}}"></button>
             </div>
             <div class="wfrp-npccharacteristic__cell"><span name="attr_initiative"></span></div>
           </div>
           <div class="wfrp-npccharacteristic__col">
             <div class="wfrp-npccharacteristic__cell--head">
-              <button data-i18n="Ag" name="roll_agility" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{agility}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Agility}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Ag" name="roll_agility" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{agility}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Agility}} {{roll_type=Characteristic}}"></button>
             </div>
             <div class="wfrp-npccharacteristic__cell"><span name="attr_agility"></span></div>
           </div>
           <div class="wfrp-npccharacteristic__col">
             <div class="wfrp-npccharacteristic__cell--head">
-              <button data-i18n="Dex" name="roll_dexterity" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{dexterity}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Dexterity}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Dex" name="roll_dexterity" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{dexterity}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Dexterity}} {{roll_type=Characteristic}}"></button>
             </div>
             <div class="wfrp-npccharacteristic__cell"><span name="attr_dexterity"></span></div>
           </div>
           <div class="wfrp-npccharacteristic__col">
             <div class="wfrp-npccharacteristic__cell--head">
-              <button data-i18n="Int" name="roll_intelligence" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{intelligence}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Intelligence}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Int" name="roll_intelligence" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{intelligence}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Intelligence}} {{roll_type=Characteristic}}"></button>
             </div>
             <div class="wfrp-npccharacteristic__cell"><span name="attr_intelligence"></span></div>
           </div>
           <div class="wfrp-npccharacteristic__col">
             <div class="wfrp-npccharacteristic__cell--head">
-              <button data-i18n="WP" name="roll_willpower" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{willpower}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Willpower}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+              <button data-i18n="WP" name="roll_willpower" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{willpower}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Willpower}} {{roll_type=Characteristic}}"></button>
             </div>
             <div class="wfrp-npccharacteristic__cell"><span name="attr_willpower"></span></div>
           </div>
           <div class="wfrp-npccharacteristic__col">
             <div class="wfrp-npccharacteristic__cell--head">
-              <button data-i18n="Fel" name="roll_fellowship" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{fellowship}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Fellowship}} {{roll_type=Characteristic}} {{name=@{character_name}}}"></button>
+              <button data-i18n="Fel" name="roll_fellowship" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{fellowship}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Fellowship}} {{roll_type=Characteristic}}"></button>
             </div>
             <div class="wfrp-npccharacteristic__cell"><span name="attr_fellowship"></span></div>
           </div>
@@ -7206,156 +7405,166 @@
             <h2 class="wfrp-npc__subtitle" data-i18n="Skills"></h2>
             <div class="wfrp-npcskill__wrapper">
               <input name="attr_athletics" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_athletics" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{athletics}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Athletics}} {{roll_type=Skill}} {{roll_notes=@{athletics_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_athletics" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{athletics}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Athletics}} {{roll_type=Skill}} {{roll_notes=@{athletics_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Athletics"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_athletics"></span></div>
               </button>
               <input name="attr_bribery" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_bribery" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{bribery}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Bribery}} {{roll_type=Skill}} {{roll_notes=@{bribery_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_bribery" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{bribery}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Bribery}} {{roll_type=Skill}} {{roll_notes=@{bribery_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Bribery"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_bribery"></span></div>
               </button>
               <input name="attr_charm" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_charm" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{charm}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Charm}} {{roll_type=Skill}} {{roll_notes=@{charm_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_charm" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{charm}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Charm}} {{roll_type=Skill}} {{roll_notes=@{charm_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Charm"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_charm"></span></div>
               </button>
               <input name="attr_charm-animal" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_charm-animal" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{charm-animal}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Charm Animal}} {{roll_type=Skill}} {{roll_notes=@{charm-animal_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_charm-animal" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{charm-animal}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Charm Animal}} {{roll_type=Skill}} {{roll_notes=@{charm-animal_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Charm Animal"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_charm-animal"></span></div>
               </button>
               <input name="attr_climb" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_climb" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{climb}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Climb}} {{roll_type=Skill}} {{roll_notes=@{climb_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_climb" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{climb}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Climb}} {{roll_type=Skill}} {{roll_notes=@{climb_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Climb"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_climb"></span></div>
               </button>
               <input name="attr_consume-alcohol" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_consume-alcohol" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{consume-alcohol}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Consume Alcohol}} {{roll_type=Skill}} {{roll_notes=@{consume-alcohol_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_consume-alcohol" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{consume-alcohol}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Consume Alcohol}} {{roll_type=Skill}} {{roll_notes=@{consume-alcohol_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Consume Alcohol"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_consume-alcohol"></span></div>
               </button>
               <input name="attr_cool" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_cool" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{cool}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Cool}} {{roll_type=Skill}} {{roll_notes=@{cool_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_cool" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{cool}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Cool}} {{roll_type=Skill}} {{roll_notes=@{cool_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Cool"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_cool"></span></div>
               </button>
               <input name="attr_dodge" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_dodge" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{dodge}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Dodge}} {{roll_type=Skill}} {{roll_notes=@{dodge_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_dodge" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{dodge}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Dodge}} {{roll_type=Skill}} {{roll_notes=@{dodge_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Dodge"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_dodge"></span></div>
               </button>
               <input name="attr_drive" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_drive" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{drive}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Drive}} {{roll_type=Skill}} {{roll_notes=@{drive_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_drive" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{drive}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Drive}} {{roll_type=Skill}} {{roll_notes=@{drive_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Drive"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_drive"></span></div>
               </button>
               <input name="attr_endurance" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_endurance" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{endurance}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Endurance}} {{roll_type=Skill}} {{roll_notes=@{endurance_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_endurance" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{endurance}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Endurance}} {{roll_type=Skill}} {{roll_notes=@{endurance_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Endurance"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_endurance"></span></div>
               </button>
               <input name="attr_gamble" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_gamble" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{gamble}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Gamble}} {{roll_type=Skill}} {{roll_notes=@{gamble_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_gamble" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{gamble}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Gamble}} {{roll_type=Skill}} {{roll_notes=@{gamble_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Gamble"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_gamble"></span></div>
               </button>
               <input name="attr_gossip" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_gossip" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{gossip}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Gossip}} {{roll_type=Skill}} {{roll_notes=@{gossip_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_gossip" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{gossip}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Gossip}} {{roll_type=Skill}} {{roll_notes=@{gossip_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Gossip"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_gossip"></span></div>
               </button>
               <input name="attr_haggle" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_haggle" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{haggle}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Haggle}} {{roll_type=Skill}} {{roll_notes=@{haggle_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_haggle" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{haggle}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Haggle}} {{roll_type=Skill}} {{roll_notes=@{haggle_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Haggle"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_haggle"></span></div>
               </button>
               <input name="attr_intimidate" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_intimidate" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{intimidate}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Intimidate}} {{roll_type=Skill}} {{roll_notes=@{intimidate_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_intimidate" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{intimidate}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Intimidate}} {{roll_type=Skill}} {{roll_notes=@{intimidate_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Intimidate"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_intimidate"></span></div>
               </button>
               <input name="attr_intuition" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_intuition" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{intuition}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Intuition}} {{roll_type=Skill}} {{roll_notes=@{intuition_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_intuition" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{intuition}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Intuition}} {{roll_type=Skill}} {{roll_notes=@{intuition_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Intuition"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_intuition"></span></div>
               </button>
               <input name="attr_leadership" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_leadership" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{leadership}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Leadership}} {{roll_type=Skill}} {{roll_notes=@{leadership_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_leadership" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{leadership}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Leadership}} {{roll_type=Skill}} {{roll_notes=@{leadership_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Leadership"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_leadership"></span></div>
               </button>
               <input name="attr_navigation" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_navigation" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{navigation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Navigation}} {{roll_type=Skill}} {{roll_notes=@{navigation_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_navigation" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{navigation}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Navigation}} {{roll_type=Skill}} {{roll_notes=@{navigation_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Navigation"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_navigation"></span></div>
               </button>
               <input name="attr_outdoor-survival" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_outdoor-survival" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{outdoor-survival}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Outdoor Survival}} {{roll_type=Skill}} {{roll_notes=@{outdoor-survival_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_outdoor-survival" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{outdoor-survival}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Outdoor Survival}} {{roll_type=Skill}} {{roll_notes=@{outdoor-survival_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Outdoor Survival"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_outdoor-survival"></span></div>
               </button>
               <input name="attr_perception" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_perception" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{perception}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Perception}} {{roll_type=Skill}} {{roll_notes=@{perception_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_perception" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{perception}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Perception}} {{roll_type=Skill}} {{roll_notes=@{perception_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Perception"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_perception"></span></div>
               </button>
               <input name="attr_row" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_row" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{row}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Row}} {{roll_type=Skill}} {{roll_notes=@{row_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_row" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{row}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Row}} {{roll_type=Skill}} {{roll_notes=@{row_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Row"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_row"></span></div>
               </button>
               <input name="attr_animal-care" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_animal-care" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{animal-care}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Animal Care}} {{roll_type=Skill}} {{roll_notes=@{animal-care_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_animal-care" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{animal-care}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Animal Care}} {{roll_type=Skill}} {{roll_notes=@{animal-care_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Animal Care"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_animal-care"></span></div>
               </button>
               <input name="attr_evaluate" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_evaluate" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{evaluate}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Evaluate}} {{roll_type=Skill}} {{roll_notes=@{evaluate_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_evaluate" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{evaluate}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Evaluate}} {{roll_type=Skill}} {{roll_notes=@{evaluate_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Evaluate"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_evaluate"></span></div>
               </button>
               <input name="attr_heal" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_heal" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{heal}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Heal}} {{roll_type=Skill}} {{roll_notes=@{heal_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_heal" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{heal}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Heal}} {{roll_type=Skill}} {{roll_notes=@{heal_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Heal"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_heal"></span></div>
               </button>
               <input name="attr_pick-lock" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_pick-lock" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{pick-lock}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Pick Lock}} {{roll_type=Skill}} {{roll_notes=@{pick-lock_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_pick-lock" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{pick-lock}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Pick Lock}} {{roll_type=Skill}} {{roll_notes=@{pick-lock_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Pick Lock"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_pick-lock"></span></div>
               </button>
               <input name="attr_pray" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_pray" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{pray}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Pray}} {{roll_type=Skill}} {{roll_notes=@{pray_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_pray" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{pray}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Pray}} {{roll_type=Skill}} {{roll_notes=@{pray_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Pray"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_pray"></span></div>
               </button>
               <input name="attr_research" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_research" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{research}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Research}} {{roll_type=Skill}} {{roll_notes=@{research_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_research" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{research}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Research}} {{roll_type=Skill}} {{roll_notes=@{research_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Research"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_research"></span></div>
               </button>
               <input name="attr_set-trap" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_set-trap" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{set-trap}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Set Trap}} {{roll_type=Skill}} {{roll_notes=@{set-trap_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_set-trap" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{set-trap}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Set Trap}} {{roll_type=Skill}} {{roll_notes=@{set-trap_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Set Trap"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_set-trap"></span></div>
               </button>
               <input name="attr_sleight-of-hand" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_sleight-of-hand" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{sleight-of-hand}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Sleight of Hand}} {{roll_type=Skill}} {{roll_notes=@{sleight-of-hand_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_sleight-of-hand" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{sleight-of-hand}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Sleight of Hand}} {{roll_type=Skill}} {{roll_notes=@{sleight-of-hand_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Sleight of Hand"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_sleight-of-hand"></span></div>
               </button>
               <input name="attr_swim" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_swim" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{swim}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Swim}} {{roll_type=Skill}} {{roll_notes=@{swim_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_swim" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{swim}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Swim}} {{roll_type=Skill}} {{roll_notes=@{swim_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Swim"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_swim"></span></div>
               </button>
               <input name="attr_track" type="hidden"/>
-              <button class="wfrp-npcskill" name="roll_track" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{track}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Track}} {{roll_type=Skill}} {{roll_notes=@{track_notes}}} {{name=@{character_name}}}">
+              <button class="wfrp-npcskill" name="roll_track" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{track}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=Track}} {{roll_type=Skill}} {{roll_notes=@{track_notes}}}">
                 <div class="wfrp-npcskill__title" data-i18n="Track"></div>
                 <div class="wfrp-npcskill__value"><span name="attr_track"></span></div>
               </button>
             </div>
+            <div class="wfrp-npcskill__wrapper">
+              <fieldset class="repeating_npc-skills">
+                <button class="wfrp-npcskill" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{npc_skill}+@{difficulty_query}+@{roll_query}]]}} {{roll_name=@{npc_skillname}}} {{roll_type=Skill}}">
+                  <input name="attr_npc_skill" type="hidden"/>
+                  <input name="attr_npc_skillname" type="hidden"/>
+                  <div class="wfrp-npcskill__title"><span name="attr_npc_skillname"></span></div>
+                  <div class="wfrp-npcskill__value"><span name="attr_npc_skill"></span></div>
+                </button>
+              </fieldset>
+            </div>
           </div>
           <div class="wfrp-npccombat">
             <h2 class="wfrp-npc__subtitle" data-i18n="Combat"></h2>
@@ -7373,19 +7582,19 @@
                 <button data-i18n="Initiative" type="roll" value="&amp;{template:wfrp} {{name=@{character_name}}} {{roll_name=Initiative}} @{roll_init}"></button>
               </div>
               <div class="wfrp-npccontrols__button">
-                <button data-i18n="Dodge" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{dodge}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Dodge}} {{roll_type=Skill}} {{roll_notes=@{dodge_notes}}} {{name=@{character_name}}}"></button>
+                <button data-i18n="Dodge" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{npc_dodge}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Dodge}} {{roll_type=Skill}} {{roll_notes=@{dodge_notes}}}"></button>
               </div>
               <div class="wfrp-npccontrols__button">
-                <button data-i18n="Endurance" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{endurance}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Endurance}} {{roll_type=Skill}} {{roll_notes=@{endurance_notes}}} {{name=@{character_name}}}"></button>
+                <button data-i18n="Endurance" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{npc_endurance}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Endurance}} {{roll_type=Skill}} {{roll_notes=@{endurance_notes}}}"></button>
               </div>
               <div class="wfrp-npccontrols__button">
-                <button data-i18n="Intuition" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{intuition}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Intuition}} {{roll_type=Skill}} {{roll_notes=@{intuition_notes}}} {{name=@{character_name}}}"></button>
+                <button data-i18n="Intuition" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{npc_intuition}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Intuition}} {{roll_type=Skill}} {{roll_notes=@{intuition_notes}}}"></button>
               </div>
               <div class="wfrp-npccontrols__button">
-                <button data-i18n="Perception" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{perception}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Perception}} {{roll_type=Skill}} {{roll_notes=@{perception_notes}}} {{name=@{character_name}}}"></button>
+                <button data-i18n="Perception" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{npc_perception}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Perception}} {{roll_type=Skill}} {{roll_notes=@{perception_notes}}}"></button>
               </div>
               <div class="wfrp-npccontrols__button">
-                <button data-i18n="Cool" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{cool}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Cool}} {{roll_type=Skill}} {{roll_notes=@{cool_notes}}} {{name=@{character_name}}}"></button>
+                <button data-i18n="Cool" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{npc_cool}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=Cool}} {{roll_type=Skill}} {{roll_notes=@{cool_notes}}}"></button>
               </div>
             </div>
           </div>
@@ -7400,7 +7609,7 @@
                   </label>
                 </div>
                 <div class="wfrp-npcattack__cell--title">
-                  <button name="roll_undefined" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{attack_target}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=@{attack_name}}} {{roll_type=@{attack_type}}} {{roll_target=@{attack_target}}} {{roll_range=@{attack_range}}} {{roll_text=@{attack_description}}} {{roll_damage=[[@{attack_damage}]] + Opposed SL}} {{roll_hit_location=1}} {{roll_crit_location=[[1d100]]}} {{name=@{character_name}}}"><span name="attr_attack_name"></span></button>
+                  <button name="roll_undefined" type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll=[[1d100cs&lt;@{roll_cs}cf&gt;@{roll_cf}]]}} {{difficulty=[[@{difficulty_query_combat}]]}} {{bonus=[[@{roll_query}]]}} @{roll_slbonus} {{target=[[@{attack_target}+@{difficulty_query}+@{roll_query}+(@{advantage}*10)]]}} {{roll_advantage=[[(@{advantage}*10)]]}} {{roll_name=@{attack_name}}} {{roll_type=@{attack_type}}} {{roll_target=@{attack_target}}} {{roll_range=@{attack_range}}} {{roll_text=@{attack_description}}} {{roll_damage=[[@{attack_damage}]] + Opposed SL}} {{roll_hit_location=1}} {{roll_crit_location=[[1d100]]}}"><span name="attr_attack_name"></span></button>
                 </div>
                 <div class="wfrp-npcattack__cell"><span class="wfrp-npcattack__label" data-i18n="Attacks"></span><span name="attr_attack_attacks"></span></div>
                 <div class="wfrp-npcattack__cell"><span class="wfrp-npcattack__label" data-i18n="Target"></span><span name="attr_attack_target"></span>
@@ -7481,7 +7690,7 @@
                   </label>
                 </div>
                 <div class="wfrp-npctrait__cell--title">
-                  <button type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll_name=@{trait_name}}} {{roll_type=Trait}} {{roll_text=@{trait_description}}} {{name=@{character_name}}}"><span name="attr_trait_name"></span><span name="attr_trait_enabled_display"></span></button>
+                  <button type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll_name=@{trait_name}}} {{roll_type=Trait}} {{roll_text=@{trait_description}}}"><span name="attr_trait_name"></span><span name="attr_trait_enabled_display"></span></button>
                 </div>
                 <div class="wfrp-npctrait__cell--description"><span name="attr_trait_description"></span></div>
                 <div class="wfrp-settings control__hide--npctrait_settings">
@@ -7513,7 +7722,7 @@
                   </label>
                 </div>
                 <div class="wfrp-npctalent__cell--title">
-                  <button type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll_name=@{talent_name}}} {{roll_type=Talent}} {{roll_text=@{talent_description}}} {{name=@{character_name}}}"><span name="attr_talent_name"></span><span name="attr_talent_enabled_display"></span><span class="wfrp-npctalent__ranks" name="attr_talent_ranks"></span></button>
+                  <button type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll_name=@{talent_name}}} {{roll_type=Talent}} {{roll_text=@{talent_description}}}"><span name="attr_talent_name"></span><span name="attr_talent_enabled_display"></span><span class="wfrp-npctalent__ranks" name="attr_talent_ranks"></span></button>
                 </div>
                 <div class="wfrp-npctalent__cell--description"><span name="attr_talent_description"></span></div>
                 <div class="wfrp-settings control__hide--npctalent_settings">
@@ -7552,7 +7761,7 @@
                   </label>
                 </div>
                 <div class="wfrp-npctrait__cell--title">
-                  <button type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll_name=@{trait_name}}} {{roll_type=Trait}} {{roll_text=@{trait_description}}} {{name=@{character_name}}}"><span name="attr_trait_name"></span><span name="attr_trait_enabled_display"></span></button>
+                  <button type="roll" value="@{roll_whisper} &amp;{template:wfrp} {{name=@{character_name}}} {{roll_name=@{trait_name}}} {{roll_type=Trait}} {{roll_text=@{trait_description}}}"><span name="attr_trait_name"></span><span name="attr_trait_enabled_display"></span></button>
                 </div>
                 <div class="wfrp-settings control__hide--npctrait_settings">
                   <div class="wfrp-settings__row--span">
@@ -7608,20 +7817,20 @@
     <div class="wfrp-roll__success">{{#^rollTotal() roll 11}}{{#^rollTotal() roll 22}}{{#^rollTotal() roll 33}}{{#^rollTotal() roll 44}}{{#^rollTotal() roll 55}}{{#^rollTotal() roll 66}}{{#^rollTotal() roll 77}}{{#^rollTotal() roll 88}}{{#^rollTotal() roll 99}}{{#rollBetween() target 0 9}}{{#rollBetween() roll 0 9}}<span>Marginal</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Marginal</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Marginal</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Marginal</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Marginal</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Marginal</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Marginal</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Marginal</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Marginal</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Marginal</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Marginal</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 0 9}}{{#rollBetween() target 10 19}}{{#rollBetween() roll 0 9}}<span>Marginal</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Marginal</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Marginal</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Marginal</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Marginal</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Marginal</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Marginal</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Marginal</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Marginal</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Marginal</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Marginal</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 10 19}}{{#rollBetween() target 20 29}}{{#rollBetween() roll 0 9}}<span></span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Marginal</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Marginal</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Marginal</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Marginal</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Marginal</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Marginal</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Marginal</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Marginal</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Marginal</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Marginal</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 20 29}}{{#rollBetween() target 30 39}}{{#rollBetween() roll 0 9}}<span></span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span></span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Marginal</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Marginal</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Marginal</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Marginal</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Marginal</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Marginal</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Marginal</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Marginal</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Marginal</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 30 39}}{{#rollBetween() target 40 49}}{{#rollBetween() roll 0 9}}<span>Impressive</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span></span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span></span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Marginal</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Marginal</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Marginal</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Marginal</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Marginal</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Marginal</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Marginal</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Marginal</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 40 49}}{{#rollBetween() target 50 59}}{{#rollBetween() roll 0 9}}<span>Impressive</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Impressive</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span></span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span></span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Marginal</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Marginal</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Marginal</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Marginal</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Marginal</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Marginal</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Marginal</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 50 59}}{{#rollBetween() target 60 69}}{{#rollBetween() roll 0 9}}<span>Astounding</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Impressive</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Impressive</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span></span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span></span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Marginal</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Marginal</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Marginal</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Marginal</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Marginal</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Marginal</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 60 69}}{{#rollBetween() target 70 79}}{{#rollBetween() roll 0 9}}<span>Astounding</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Astounding</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Impressive</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Impressive</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span></span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span></span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Marginal</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Marginal</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Marginal</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Marginal</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Marginal</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 70 79}}{{#rollBetween() target 80 89}}{{#rollBetween() roll 0 9}}<span>Astounding</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Astounding</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Astounding</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Impressive</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Impressive</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span></span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span></span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Marginal</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Marginal</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Marginal</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Marginal</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 80 89}}{{#rollBetween() target 90 99}}{{#rollBetween() roll 0 9}}<span>Astounding</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Astounding</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Astounding</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Astounding</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Impressive</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Impressive</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span></span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span></span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Marginal</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Marginal</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Marginal</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 90 99}}{{#rollBetween() target 100 109}}{{#rollBetween() roll 0 9}}<span>Astounding</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Astounding</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Astounding</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Astounding</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Astounding</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Impressive</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Impressive</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span></span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span></span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Marginal</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Marginal</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 100 109}}{{/^rollTotal() roll 99}}{{/^rollTotal() roll 88}}{{/^rollTotal() roll 77}}{{/^rollTotal() roll 66}}{{/^rollTotal() roll 55}}{{/^rollTotal() roll 44}}{{/^rollTotal() roll 33}}{{/^rollTotal() roll 22}}{{/^rollTotal() roll 11}}{{#rollTotal() roll 11}}<span data-i18n="Critical"></span>{{/rollTotal() roll 11}}{{#rollTotal() roll 22}}<span data-i18n="Critical"></span>{{/rollTotal() roll 22}}{{#rollTotal() roll 33}}<span data-i18n="Critical"></span>{{/rollTotal() roll 33}}{{#rollTotal() roll 44}}<span data-i18n="Critical"></span>{{/rollTotal() roll 44}}{{#rollTotal() roll 55}}<span data-i18n="Critical"></span>{{/rollTotal() roll 55}}{{#rollTotal() roll 66}}<span data-i18n="Critical"></span>{{/rollTotal() roll 66}}{{#rollTotal() roll 77}}<span data-i18n="Critical"></span>{{/rollTotal() roll 77}}{{#rollTotal() roll 88}}<span data-i18n="Critical"></span>{{/rollTotal() roll 88}}{{#rollTotal() roll 99}}<span data-i18n="Critical"></span>{{/rollTotal() roll 99}}<span data-i18n="Success"></span>{{#rollBetween() target 0 9}}{{#rollBetween() roll 0 9}}<span>(+0)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(+-1)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(+-2)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(+-3)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(+-4)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(+-5)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(+-6)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(+-7)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(+-8)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(+-9)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(+-10)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 0 9}}{{#rollBetween() target 10 19}}{{#rollBetween() roll 0 9}}<span>(+1)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(+0)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(+-1)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(+-2)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(+-3)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(+-4)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(+-5)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(+-6)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(+-7)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(+-8)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(+-9)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 10 19}}{{#rollBetween() target 20 29}}{{#rollBetween() roll 0 9}}<span>(+2)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(+1)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(+0)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(+-1)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(+-2)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(+-3)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(+-4)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(+-5)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(+-6)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(+-7)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(+-8)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 20 29}}{{#rollBetween() target 30 39}}{{#rollBetween() roll 0 9}}<span>(+3)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(+2)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(+1)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(+0)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(+-1)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(+-2)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(+-3)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(+-4)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(+-5)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(+-6)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(+-7)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 30 39}}{{#rollBetween() target 40 49}}{{#rollBetween() roll 0 9}}<span>(+4)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(+3)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(+2)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(+1)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(+0)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(+-1)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(+-2)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(+-3)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(+-4)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(+-5)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(+-6)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 40 49}}{{#rollBetween() target 50 59}}{{#rollBetween() roll 0 9}}<span>(+5)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(+4)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(+3)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(+2)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(+1)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(+0)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(+-1)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(+-2)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(+-3)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(+-4)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(+-5)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 50 59}}{{#rollBetween() target 60 69}}{{#rollBetween() roll 0 9}}<span>(+6)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(+5)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(+4)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(+3)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(+2)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(+1)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(+0)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(+-1)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(+-2)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(+-3)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(+-4)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 60 69}}{{#rollBetween() target 70 79}}{{#rollBetween() roll 0 9}}<span>(+7)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(+6)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(+5)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(+4)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(+3)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(+2)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(+1)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(+0)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(+-1)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(+-2)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(+-3)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 70 79}}{{#rollBetween() target 80 89}}{{#rollBetween() roll 0 9}}<span>(+8)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(+7)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(+6)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(+5)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(+4)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(+3)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(+2)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(+1)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(+0)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(+-1)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(+-2)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 80 89}}{{#rollBetween() target 90 99}}{{#rollBetween() roll 0 9}}<span>(+9)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(+8)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(+7)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(+6)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(+5)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(+4)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(+3)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(+2)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(+1)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(+0)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(+-1)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 90 99}}{{#rollBetween() target 100 109}}{{#rollBetween() roll 0 9}}<span>(+10)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(+9)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(+8)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(+7)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(+6)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(+5)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(+4)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(+3)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(+2)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(+1)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(+0)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 100 109}}{{#rollBetween() target 110 119}}{{#rollBetween() roll 0 9}}<span>(+11)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(+10)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(+9)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(+8)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(+7)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(+6)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(+5)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(+4)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(+3)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(+2)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(+1)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 110 119}}{{#rollBetween() target 120 129}}{{#rollBetween() roll 0 9}}<span>(+12)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(+11)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(+10)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(+9)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(+8)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(+7)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(+6)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(+5)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(+4)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(+3)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(+2)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 120 129}}{{#rollBetween() target 130 139}}{{#rollBetween() roll 0 9}}<span>(+13)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(+12)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(+11)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(+10)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(+9)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(+8)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(+7)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(+6)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(+5)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(+4)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(+3)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 130 139}}{{#rollBetween() target 140 149}}{{#rollBetween() roll 0 9}}<span>(+14)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(+13)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(+12)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(+11)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(+10)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(+9)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(+8)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(+7)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(+6)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(+5)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(+4)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 140 149}}{{#rollBetween() target 150 159}}{{#rollBetween() roll 0 9}}<span>(+15)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(+14)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(+13)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(+12)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(+11)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(+10)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(+9)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(+8)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(+7)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(+6)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(+5)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 150 159}}
     </div>{{/^rollGreater() roll target}}{{/^rollWasFumble() roll}}{{#^rollTotal() roll target}}{{#^rollWasCrit() roll}}{{#^rollLess() roll target}}
     <div class="wfrp-roll__fail">{{#^rollTotal() roll 99}}{{#^rollTotal() roll 88}}{{#^rollTotal() roll 77}}{{#^rollTotal() roll 66}}{{#^rollTotal() roll 55}}{{#^rollTotal() roll 44}}{{#^rollTotal() roll 33}}{{#^rollTotal() roll 22}}{{#^rollTotal() roll 11}}{{#rollBetween() target 0 9}}{{#rollBetween() roll 0 9}}<span>Marginal</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Marginal</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span></span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span></span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Impressive</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Impressive</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Astounding</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Astounding</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Astounding</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Astounding</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Astounding</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 0 9}}{{#rollBetween() target 10 19}}{{#rollBetween() roll 0 9}}<span>Marginal</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Marginal</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Marginal</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span></span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span></span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Impressive</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Impressive</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Astounding</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Astounding</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Astounding</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Astounding</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 10 19}}{{#rollBetween() target 20 29}}{{#rollBetween() roll 0 9}}<span>Marginal</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Marginal</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Marginal</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Marginal</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span></span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span></span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Impressive</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Impressive</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Astounding</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Astounding</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Astounding</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 20 29}}{{#rollBetween() target 30 39}}{{#rollBetween() roll 0 9}}<span>Marginal</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Marginal</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Marginal</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Marginal</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Marginal</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span></span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span></span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Impressive</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Impressive</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Astounding</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Astounding</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 30 39}}{{#rollBetween() target 40 49}}{{#rollBetween() roll 0 9}}<span>Marginal</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Marginal</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Marginal</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Marginal</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Marginal</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Marginal</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span></span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span></span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Impressive</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Impressive</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Astounding</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 40 49}}{{#rollBetween() target 50 59}}{{#rollBetween() roll 0 9}}<span>Marginal</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Marginal</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Marginal</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Marginal</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Marginal</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Marginal</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Marginal</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span></span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span></span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Impressive</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Impressive</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 50 59}}{{#rollBetween() target 60 69}}{{#rollBetween() roll 0 9}}<span>Marginal</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Marginal</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Marginal</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Marginal</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Marginal</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Marginal</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Marginal</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Marginal</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span></span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span></span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Impressive</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 60 69}}{{#rollBetween() target 70 79}}{{#rollBetween() roll 0 9}}<span>Marginal</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Marginal</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Marginal</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Marginal</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Marginal</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Marginal</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Marginal</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Marginal</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Marginal</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span></span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span></span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 70 79}}{{#rollBetween() target 80 89}}{{#rollBetween() roll 0 9}}<span>Marginal</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Marginal</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Marginal</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Marginal</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Marginal</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Marginal</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Marginal</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Marginal</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Marginal</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Marginal</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span></span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 80 89}}{{#rollBetween() target 90 99}}{{#rollBetween() roll 0 9}}<span>Marginal</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Marginal</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Marginal</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Marginal</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Marginal</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Marginal</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Marginal</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Marginal</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Marginal</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Marginal</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Marginal</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 90 99}}{{#rollBetween() target 100 109}}{{#rollBetween() roll 0 9}}<span>Marginal</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>Marginal</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>Marginal</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>Marginal</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>Marginal</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>Marginal</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>Marginal</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>Marginal</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>Marginal</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>Marginal</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>Marginal</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 100 109}}{{/^rollTotal() roll 11}}{{/^rollTotal() roll 22}}{{/^rollTotal() roll 33}}{{/^rollTotal() roll 44}}{{/^rollTotal() roll 55}}{{/^rollTotal() roll 66}}{{/^rollTotal() roll 77}}{{/^rollTotal() roll 88}}{{/^rollTotal() roll 99}}{{#rollTotal() roll 11}}<span data-i18n="Critical"></span>{{/rollTotal() roll 11}}{{#rollTotal() roll 22}}<span data-i18n="Critical"></span>{{/rollTotal() roll 22}}{{#rollTotal() roll 33}}<span data-i18n="Critical"></span>{{/rollTotal() roll 33}}{{#rollTotal() roll 44}}<span data-i18n="Critical"></span>{{/rollTotal() roll 44}}{{#rollTotal() roll 55}}<span data-i18n="Critical"></span>{{/rollTotal() roll 55}}{{#rollTotal() roll 66}}<span data-i18n="Critical"></span>{{/rollTotal() roll 66}}{{#rollTotal() roll 77}}<span data-i18n="Critical"></span>{{/rollTotal() roll 77}}{{#rollTotal() roll 88}}<span data-i18n="Critical"></span>{{/rollTotal() roll 88}}{{#rollTotal() roll 99}}<span data-i18n="Critical"></span>{{/rollTotal() roll 99}}<span data-i18n="Failure"></span>{{#rollBetween() target 0 9}}{{#rollBetween() roll 0 9}}<span>(0)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(-1)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(-2)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(-3)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(-4)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(-5)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(-6)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(-7)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(-8)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(-9)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(-10)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 0 9}}{{#rollBetween() target 10 19}}{{#rollBetween() roll 0 9}}<span>(1)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(0)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(-1)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(-2)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(-3)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(-4)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(-5)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(-6)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(-7)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(-8)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(-9)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 10 19}}{{#rollBetween() target 20 29}}{{#rollBetween() roll 0 9}}<span>(2)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(1)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(0)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(-1)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(-2)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(-3)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(-4)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(-5)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(-6)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(-7)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(-8)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 20 29}}{{#rollBetween() target 30 39}}{{#rollBetween() roll 0 9}}<span>(3)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(2)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(1)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(0)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(-1)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(-2)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(-3)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(-4)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(-5)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(-6)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(-7)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 30 39}}{{#rollBetween() target 40 49}}{{#rollBetween() roll 0 9}}<span>(4)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(3)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(2)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(1)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(0)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(-1)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(-2)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(-3)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(-4)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(-5)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(-6)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 40 49}}{{#rollBetween() target 50 59}}{{#rollBetween() roll 0 9}}<span>(5)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(4)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(3)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(2)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(1)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(0)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(-1)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(-2)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(-3)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(-4)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(-5)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 50 59}}{{#rollBetween() target 60 69}}{{#rollBetween() roll 0 9}}<span>(6)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(5)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(4)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(3)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(2)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(1)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(0)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(-1)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(-2)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(-3)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(-4)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 60 69}}{{#rollBetween() target 70 79}}{{#rollBetween() roll 0 9}}<span>(7)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(6)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(5)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(4)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(3)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(2)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(1)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(0)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(-1)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(-2)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(-3)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 70 79}}{{#rollBetween() target 80 89}}{{#rollBetween() roll 0 9}}<span>(8)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(7)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(6)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(5)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(4)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(3)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(2)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(1)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(0)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(-1)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(-2)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 80 89}}{{#rollBetween() target 90 99}}{{#rollBetween() roll 0 9}}<span>(9)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(8)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(7)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(6)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(5)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(4)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(3)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(2)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(1)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(0)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(-1)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 90 99}}{{#rollBetween() target 100 109}}{{#rollBetween() roll 0 9}}<span>(10)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(9)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(8)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(7)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(6)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(5)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(4)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(3)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(2)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(1)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(0)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 100 109}}{{#rollBetween() target 110 119}}{{#rollBetween() roll 0 9}}<span>(11)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(10)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(9)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(8)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(7)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(6)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(5)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(4)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(3)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(2)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(1)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 110 119}}{{#rollBetween() target 120 129}}{{#rollBetween() roll 0 9}}<span>(12)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(11)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(10)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(9)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(8)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(7)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(6)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(5)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(4)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(3)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(2)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 120 129}}{{#rollBetween() target 130 139}}{{#rollBetween() roll 0 9}}<span>(13)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(12)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(11)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(10)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(9)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(8)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(7)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(6)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(5)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(4)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(3)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 130 139}}{{#rollBetween() target 140 149}}{{#rollBetween() roll 0 9}}<span>(14)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(13)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(12)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(11)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(10)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(9)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(8)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(7)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(6)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(5)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(4)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 140 149}}{{#rollBetween() target 150 159}}{{#rollBetween() roll 0 9}}<span>(15)</span>{{/rollBetween() roll 0 9}}{{#rollBetween() roll 10 19}}<span>(14)</span>{{/rollBetween() roll 10 19}}{{#rollBetween() roll 20 29}}<span>(13)</span>{{/rollBetween() roll 20 29}}{{#rollBetween() roll 30 39}}<span>(12)</span>{{/rollBetween() roll 30 39}}{{#rollBetween() roll 40 49}}<span>(11)</span>{{/rollBetween() roll 40 49}}{{#rollBetween() roll 50 59}}<span>(10)</span>{{/rollBetween() roll 50 59}}{{#rollBetween() roll 60 69}}<span>(9)</span>{{/rollBetween() roll 60 69}}{{#rollBetween() roll 70 79}}<span>(8)</span>{{/rollBetween() roll 70 79}}{{#rollBetween() roll 80 89}}<span>(7)</span>{{/rollBetween() roll 80 89}}{{#rollBetween() roll 90 99}}<span>(6)</span>{{/rollBetween() roll 90 99}}{{#rollBetween() roll 100 109}}<span>(5)</span>{{/rollBetween() roll 100 109}}{{/rollBetween() target 150 159}}
-    </div>{{/^rollLess() roll target}}{{/^rollWasCrit() roll}}{{/^rollTotal() roll target}}{{#roll_bonus}}
-    <div class="wfrp-roll__row">
+    </div>{{/^rollLess() roll target}}{{/^rollWasCrit() roll}}{{/^rollTotal() roll target}}{{#bonus}}
+    <div class="wfrp-roll__row sheet-wfrp-roll__row--number">
       <div class="wfrp-roll__label" data-i18n="Bonus"></div>
-      <div class="wfrp-roll__value">{{roll_bonus}}</div>
-    </div>{{/roll_bonus}}{{#roll_advantage}}
-    <div class="wfrp-roll__row">
+      <div class="wfrp-roll__value">{{bonus}}</div>
+    </div>{{/bonus}}{{#roll_advantage}}
+    <div class="wfrp-roll__row sheet-wfrp-roll__row--number">
       <div class="wfrp-roll__label" data-i18n="Advantage"></div>
       <div class="wfrp-roll__value">{{roll_advantage}}</div>
-    </div>{{/roll_advantage}}{{#roll_slbonus}}
-    <div class="wfrp-roll__row">
+    </div>{{/roll_advantage}}{{#sl_bonus}}
+    <div class="wfrp-roll__row sheet-wfrp-roll__row--number">
       <div class="wfrp-roll__label" data-i18n="SL Bonus"></div>
-      <div class="wfrp-roll__value">{{roll_slbonus}}</div>
-    </div>{{/roll_slbonus}}{{#roll_cn}}
-    <div class="wfrp-roll__row">
+      <div class="wfrp-roll__value">{{sl_bonus}}</div>
+    </div>{{/sl_bonus}}{{#roll_cn}}
+    <div class="wfrp-roll__row sheet-wfrp-roll__row--number">
       <div class="wfrp-roll__label" data-i18n="CN"></div>
       <div class="wfrp-roll__value">{{roll_cn}}</div>
     </div>{{/roll_cn}}{{#roll_range}}
@@ -8668,7 +8877,7 @@
     // Global Variables
 
     const wfrp = {
-        sheet_version: "1.0.3",
+        sheet_version: "1.0.4",
 
         characteristics: [
             "weapon_skill",
@@ -8761,6 +8970,7 @@
             "explosives",
             "sling",
             "throwing",
+            "azyr",
             "aqshy",
             "chamon",
             "dhar",
@@ -8769,7 +8979,8 @@
             "hysh",
             "shyish",
             "ulgu",
-            "magick"
+            "magick",
+            "custom"
         ],
 
         repeating_skills: [
@@ -8802,7 +9013,10 @@
 
     const initSheet = () => {
 
-        wfrp.characteristics.forEach(char => calculateCharacteristic(char));
+        wfrp.characteristics.forEach(char => {
+            calculateCharacteristic(char)
+            recalculateAttribute(`${char}_modifier`, char);
+        });
 
         wfrp.skills.forEach(skill => calculateSkill(skill));
 
@@ -8853,7 +9067,7 @@
         let slbonus = "";
 
         if (new_value === "1") {
-            query = "?{Bonus|0}";
+            query = "?{Target Bonus|0}";
             slbonus = "{{sl_bonus=?{SL Bonus|0}}}"
         }
         
@@ -8882,10 +9096,10 @@
     }
 
     const toggleInitOption = (new_value) => {
-        const init = (new_value === "1") ? `{{init=[[@{initiative} &{tracker}]]}}` :
-                     (new_value === "2") ? `{{init=[[@{initiative}+1d10 &{tracker}]]}}` :
-                     (new_value === "3") ? `{{init=[[@{agility_bonus}+@{initiative_bonus}+1d10 &{tracker}]]}}` :
-                     `{{init=[[@{initiative}]]}}`;
+        const init = (new_value === "1") ? `{{init=[[@{initiative}+@{init_bonus} &{tracker}]]}}` :
+                     (new_value === "2") ? `{{init=[[@{initiative}+1d10+@{init_bonus} &{tracker}]]}}` :
+                     (new_value === "3") ? `{{init=[[@{agility_bonus}+@{initiatve_bonus}+1d10+@{init_bonus} &{tracker}]]}}` :
+                     `{{init=[[@{initiative}+@{init_bonus}]]}}`;
 
         setAttrs({roll_init:init});
     }
@@ -8931,7 +9145,7 @@
     }
 
     const recalculateAttribute = (attribute, query) => {
-        const attrs = [...wfrp.characteristics, ...wfrp.characteristics.map(item => `${item}_bonus`)];
+        const attrs = [...wfrp.characteristics, ...wfrp.characteristics.map(item => `${item}_bonus`), ...wfrp.characteristics.map(item => `${item}_custom_mod`)];
         let match_array = [query];
         const parsed_query = query.replace(/ /g, "_");
 
@@ -9011,6 +9225,8 @@
                         }
                     });
 
+                    if (wfrp.characteristics.includes(query)) mod_array.push(+values[`${parsed_query}_custom_mod`]);
+
                     const new_value = mod_array.reduce((a,b) => a+b, 0);
 
                     setAttrs({[attribute]:new_value});
@@ -9032,6 +9248,9 @@
             size: 0
         }
 
+        if (new_value === "") {
+            return;
+        }
         if (new_value === "human") {
             update["fate"] = 2;
             update["resilience"] = 1;
@@ -9062,6 +9281,12 @@
             update["movement"] = 5;
             update["size"] = "average";
         }
+        if (new_value === "gnome") {
+            update["fate"] = 2;
+            update["resilience"] = 0;
+            update["movement"] = 3;
+            update["size"] = "small";
+        }
 
         if (new_value !== "custom") {
 
@@ -9069,15 +9294,14 @@
                 const skills = helperFunctions.parseJSON(page.data.Skills);
                 const talents = helperFunctions.parseJSON(page.data.Talents);
     
-                let skills_fixed = [];
-                let talents_fixed = [];
+                const skills_fixed = skills.Fixed.split(",").map(item=>item.trim()) || [];
+                const talents_fixed = talents.Fixed.split(",").map(item=>item.trim()) || [];
+    
                 let talents_choices = [];
     
                 let skill_index = 1;
                 let talent_index = 1;
                 
-                if (skills.Fixed) skills_fixed = skills.Fixed.split(",").map(item=>item.trim());
-                if (talents.Fixed) talents_fixed = talents.Fixed.split(",").map(item=>item.trim());
                 if (talents.Choices) talents.Choices.forEach(choice => talents_choices = [...talents_choices, ...choice]);
     
                 for (let index = 1; index <= 12; index++) {
@@ -9107,8 +9331,10 @@
                     update[`species_talent_${talent_index}_advances`] = "0";
                     talent_index++;
                 }
+
+                update["advances_changed"] = 1;
     
-                setAttrs(update, {silent:true}, callback => calculateTalentAdvances());
+                setAttrs(update, {silent:true});
             });
 
         } else {
@@ -9162,7 +9388,7 @@
             const initial = parseInt(values[`${characteristic}_initial`]) || 0;
             const advances = parseInt(values[`${characteristic}_advances`]) || 0;
             const modifier = parseInt(values[`${characteristic}_modifier`]) || 0;
-            const custom_mod = parseInt(values[`${characteristic}_custom_mod`]) || 0;
+            // const custom_mod = parseInt(values[`${characteristic}_custom_mod`]) || 0;
             const bonusmod = parseInt(values[`${characteristic}_bonusmod`]) || 0;
 
             if (values["npc"] === "on") {
@@ -9178,7 +9404,7 @@
                 return;
             } else {
 
-                const current = initial + advances + modifier + custom_mod;
+                const current = initial + advances + modifier;
     
                 const bonus = Math.floor(current / 10) + bonusmod;
     
@@ -9832,7 +10058,7 @@
         });   
     }
 
-    const calculateSkillAdvances = (skill) => {
+    const calculateSkillAdvances = () => {
         getSectionIDs("careers", id_array => {
 
             getSectionIDs("noncareer-skills", id_array_2 => {
@@ -10011,7 +10237,7 @@
 
                                 const key_array = Object.keys(values).filter(item => item !== "");
 
-                                let page_name = key.split("(")[0].trim() || key;
+                                let page_name = key.trim() || key;
 
                                 if (value_array_test.includes(page_name.toLowerCase())) {
                                     const index = value_array_test.indexOf(page_name.toLowerCase());
@@ -10054,7 +10280,7 @@
     const calculateInitColumns = (source_attribute, new_value) => {
         const attrs = [];
         const source_type = (source_attribute.match(/talent/g)) ? "talent" :
-                            (source_attribute.match(/skill/g)) ? "skill" :
+                            (source_attribute.match(/career_skill/g)) ? "skill" :
                             false;
         const source_id = helperFunctions.extractRepeatingId(source_attribute, "careers");
         const is_init = source_attribute.match(/init/);
@@ -10075,6 +10301,7 @@
 
         getAttrs(attrs, values => {
             const spent = Object.values(values).filter(item => item !== "").map(item => parseInt(item));
+            if (spent.length === 0) return;
             const total = spent.reduce((a,b) => a+b) || 0;
             const maximum_allowed = (source_type === "skill") ? 40 : 1;
             
@@ -10088,6 +10315,14 @@
 
     }
 
+    const updateAdvances = () => {
+        wfrp.characteristics.forEach(characteristic => calculateCharacteristicAdvances(characteristic));
+        calculateSkillAdvances();
+        calculateTalentAdvances();
+
+        setAttrs({advances_changed:0});
+    }
+
     // Trappings, Weapons & Armor Functions
 
     const calculateArmour = () => {
@@ -10213,9 +10448,9 @@
                         armour_array.forEach(id => {
                             const worn = values[`repeating_armour_${id}_armour_worn`] || false;
                             const enc = parseInt(values[`repeating_armour_${id}_armour_enc`])
-                            const total = (worn === "on") ? enc - 1 : enc || 0
+                            const total = (enc > 0 && worn === "on") ? enc - 1 : enc || 0
 
-                            total_enc += total >= 0 ? total : 0;
+                            total_enc += total;
                         });
 
                         weapons_array.forEach(id => {
@@ -10230,9 +10465,9 @@
                             const worn = values[`repeating_trappings_${id}_trappings_worn`] || false;
                             const inenc = values[`repeating_trappings_${id}_trappings_inenc`] || "0";
 
-                            const total = (worn === "on") ? (enc - 1) * amount : enc * amount;
+                            const total = (enc > 0 && worn === "on") ? (enc - 1) * amount : enc * amount;
 
-                            if (inenc === "on") total_enc += total >= 0 ? total : 0;
+                            if (inenc === "on") total_enc += total;
                         });
 
                         setAttrs({encumbrance:total_enc})
@@ -10510,6 +10745,11 @@
             "intuition",
             "perception",
             "cool",
+            "npc_dodge",
+            "npc_endurance",
+            "npc_intuition",
+            "npc_perception",
+            "npc_cool",
             ...wfrp.characteristics
         ];
 
@@ -10517,11 +10757,31 @@
             if (values[`NPC`] === "0") return;
             const update = {};
 
-            if (!values[`dodge`]) update[`dodge`] = values[`agility`];
-            if (!values[`endurance`]) update[`endurance`] = values[`toughness`];
-            if (!values[`intuition`]) update[`intuition`] = values[`initiative`];
-            if (!values[`perception`]) update[`perception`] = values[`initiative`];
-            if (!values[`cool`]) update[`cool`] = values[`willpower`];
+            const dodge = (values["dodge"]) ? values["dodge"] :
+                            (values["npc_dodge"]) ? values["npc_dodge"] : 
+                            values["agility"];
+
+            const endurance = (values["endurance"]) ? values["endurance"] :
+                            (values["npc_endurance"]) ? values["npc_endurance"] : 
+                            values["toughness"];
+
+            const intuition = (values["intuition"]) ? values["intuition"] :
+                            (values["npc_intuition"]) ? values["npc_intuition"] : 
+                            values["initiative"];
+
+            const perception = (values["perception"]) ? values["perception"] :
+                            (values["npc_perception"]) ? values["npc_perception"] : 
+                            values["initiative"];
+
+            const cool = (values["cool"]) ? values["cool"] :
+                            (values["npc_cool"]) ? values["npc_cool"] : 
+                            values["willpower"];
+
+            update[`npc_dodge`] = dodge;
+            update[`npc_endurance`] = endurance;
+            update[`npc_intuition`] = intuition;
+            update[`npc_perception`] = perception;
+            update[`npc_cool`] = cool;
 
             setAttrs(update);
 
@@ -10542,6 +10802,7 @@
         toggleRollCrits:toggleRollCrits,
         toggleInitOption:toggleInitOption,
         toggleWhisper:toggleWhisper,
+        recalculateAttribute:recalculateAttribute,
         parseModField:parseModField,
 
         // Class and Species Controls
@@ -10556,7 +10817,6 @@
         // Skill Functions
         calculateSkill: calculateSkill,
         calculateSpecialisation: calculateSpecialisation,
-        //updateRepeatingSkillBase: updateRepeatingSkillBase,
         recalculateRepeatingSkill: recalculateRepeatingSkill,
         cascadeSkillChanges:cascadeSkillChanges,
 
@@ -10565,18 +10825,19 @@
         updateCurrentCareer: updateCurrentCareer,
         updateCurrentCareerLevel: updateCurrentCareerLevel,
         updateCareerNames: updateCareerNames,
-        updateFirstCareer:updateFirstCareer,
+        updateFirstCareer: updateFirstCareer,
 
         // Experience Functions
-        calculateTotalAdvances:calculateTotalAdvances,
-        recalculateEarnedXP:recalculateEarnedXP,
-        recalculateCurrentXP:recalculateCurrentXP,
-        recalculateSpentXP:recalculateSpentXP,
         calculateCharacteristicAdvances:calculateCharacteristicAdvances,
         calculateSkillAdvances:calculateSkillAdvances,
         calculateTalentAdvances:calculateTalentAdvances,
+        calculateTotalAdvances:calculateTotalAdvances,
         calculateInitColumns:calculateInitColumns,
         consolidateXP:consolidateXP,
+        recalculateEarnedXP:recalculateEarnedXP,
+        recalculateCurrentXP:recalculateCurrentXP,
+        recalculateSpentXP:recalculateSpentXP,
+        updateAdvances: updateAdvances,
 
         // Trappings, Weapons & Armor Functions
         calculateArmour:calculateArmour,
@@ -10625,7 +10886,11 @@ on(`change:setting_whisper`, eventInfo => wfrpModule.toggleWhisper(eventInfo.new
     "repeating_weapon:weapon_mods",
     "repeating_armour:armour_mods",
 ].forEach(modifier => {
-    on(`change:${modifier}`, eventInfo => wfrpModule.parseModField(eventInfo.newValue, eventInfo.previousValue))
+    on(`change:${modifier}`, eventInfo => wfrpModule.parseModField(eventInfo.newValue, eventInfo.previousValue));
+});
+
+wfrpModule.wfrp.characteristics.forEach(characteristic => {
+    on(`change:${characteristic}_custom_mod`, eventInfo => wfrpModule.recalculateAttribute(`${characteristic}_modifier`, characteristic));
 });
 
 // CLASS AND SPECIES CONTROLS
@@ -10677,6 +10942,8 @@ wfrpModule.wfrp.repeating_skills.forEach(section => {
 
 // CAREERS CHANGES
 
+on(`clicked:update_advances`, eventInfo => wfrpModule.updateAdvances());
+
 on(`change:repeating_careers change:_reporder:careers`, eventInfo => {
     if (eventInfo.sourceType === "player" && !eventInfo.sourceAttribute.match(/reporder/g)) wfrpModule.calculateTotalAdvances(eventInfo.sourceAttribute);
     wfrpModule.updateCareerPath();
@@ -10709,36 +10976,34 @@ on(`change:current_xp change:spent_xp change:total_xp remove:repeating_experienc
 
 on(`change:repeating_experience change:repeating_experiencespent change:experience_mod remove:repeating_experiencespent remove:repeating_experience`, eventInfo => wfrpModule.recalculateSpentXP());
 
+const advance_triggers = []
+
 wfrpModule.wfrp.characteristics.forEach(characteristic => {
-    on(`change:repeating_careers:career_${characteristic}_advances change:repeating_careers:career_${characteristic}_init`, eventInfo => wfrpModule.calculateCharacteristicAdvances(characteristic))
+    advance_triggers.push(`change:repeating_careers:career_${characteristic}_advances change:repeating_careers:career_${characteristic}_init`)
 });
 
 [1,2,3,4].forEach(level => {
     [1,2,3,4,5].forEach(talent => {
-        on(`change:repeating_careers:career_talent_${level}_${talent}_name 
-            change:repeating_careers:career_talent_${level}_${talent}_init 
-            change:repeating_careers:career_talent_${level}_${talent}_advances`, 
-            eventInfo => wfrpModule.calculateTalentAdvances());
+        advance_triggers.push(`change:repeating_careers:career_talent_${level}_${talent}_name change:repeating_careers:career_talent_${level}_${talent}_init change:repeating_careers:career_talent_${level}_${talent}_advances`)
     });
 
     [1,2,3,4,5,6,7,8,9,10].forEach(skill => {
-        on(`change:repeating_careers:career_skill_${level}_${skill}_name 
-            change:repeating_careers:career_skill_${level}_${skill}_init 
-            change:repeating_careers:career_skill_${level}_${skill}_advances`, 
-            eventInfo => wfrpModule.calculateSkillAdvances());
+        advance_triggers.push(`change:repeating_careers:career_skill_${level}_${skill}_name change:repeating_careers:career_skill_${level}_${skill}_init change:repeating_careers:career_skill_${level}_${skill}_advances`);
     });
 });
 
 for (let index = 1; index <= 12; index++) {
-    on(`clicked:remove_skill_${index}`, eventInfo => setAttrs({[`species_skill_${index}_advances`]:"0"}));
+    advance_triggers.push(`clicked:remove_skill_${index}`);
 
-    on(`change:species_skill_${index}_advances`, eventInfo => wfrpModule.calculateSkillAdvances());
+    advance_triggers.push(`change:species_skill_${index}_advances`);
 } 
 
 for (let index = 1; index <= 10; index++) {
-    on(`change:species_talent_${index}_advances`, eventInfo => wfrpModule.calculateTalentAdvances())
+    advance_triggers.push(`change:species_talent_${index}_advances`);
 };
 
+on(advance_triggers.join(" "), eventInfo => setAttrs({advances_changed:"1"}));
+
 on(`clicked:combinexp`, eventInfo => wfrpModule.consolidateXP());
 
 on(`clicked:advance`, eventInfo => wfrpModule.advanceXP());
@@ -10755,7 +11020,7 @@ on(`change:repeating_careers`, eventInfo => wfrpModule.calculateInitColumns(even
 
 on(`change:repeating_armour remove:repeating_armour`, eventInfo => wfrpModule.calculateArmour());
 
-on(`change:repeating_trappings change:repeating_armour:armour_enc change:repeating_weapons:weapon_enc`, eventInfo => wfrpModule.calculateCurrentEncumbrance());
+on(`change:repeating_trappings change:repeating_armour:armour_enc change:repeating_armour:armour_worn change:repeating_weapons:weapon_enc`, eventInfo => wfrpModule.calculateCurrentEncumbrance());
 
 on(`change:repeating_weapons:weapon_damage_flat change:repeating_weapons:weapon_damage_bonus`, eventInfo => wfrpModule.updateWeaponDamage(eventInfo.sourceAttribute));
 
@@ -10787,14 +11052,12 @@ on(`change:repeating_attacks:attack_name change:repeating_attacks:attack_type`,
 
 on(`change:weapon_skill change:ballistic_skill`, eventInfo => wfrpModule.cascadeNPCAttacks());
 
-wfrpModule.wfrp.characteristics.forEach(characteristic => {
+[...wfrpModule.wfrp.characteristics, "initiative", "dodge", "endurance", "intuition", "perception", "cool"].forEach(characteristic => {
     on(`change:${characteristic} change:${characteristic}_bonus`, eventInfo => wfrpModule.updateNPCButtons())
 });
 
 on(`change:npc sheet:opened`, eventInfo => wfrpModule.updateNPCButtons());
 
-//# sourceURL=sheetworkers.js
-
   
 const wfrpDragAndDrop = ( () => {
 
@@ -10979,8 +11242,6 @@ const wfrpDragAndDrop = ( () => {
             updateAttrs[`${characteristic.replace(/ /g,"_")}_bonus`] = Math.floor(characteristics[characteristic]/10);
         } 
 
-        console.log(updateAttrs);
-
         const trait_map = new Map();
 
         for (const trait of traits) {
@@ -11292,8 +11553,6 @@ const wfrpDragAndDrop = ( () => {
         }
 
         getAttrs(token_values, settings => {
-
-            console.log(settings)
             
             const default_attr = {
                 width: 70,
@@ -11308,8 +11567,6 @@ const wfrpDragAndDrop = ( () => {
 
             getAttrs(attrs, values => {
 
-                console.log(values)
-
                 for (const item in settings) {    
                     if (settings[item] !== "") {
                         default_attr[item] = settings[item];
@@ -11353,7 +11610,9 @@ on("change:drop_name", (eventInfo) => {
     getAttrs(["drop_name", "drop_content", "drop_data"], (values) => {
         wfrpDragAndDrop.handleDrop(values);        
     });
-});const helperFunctions = (() => {
+});
+
+const helperFunctions = (() => {
 
     const extractRepeatingId = (attribute, section) => {
         const prefix = `repeating_${section}`;
@@ -11426,4 +11685,5 @@ on("change:drop_name", (eventInfo) => {
     }
 
 })();
+  //# sourceURL=sheetworkers.js
 </script>
\ No newline at end of file