From 916872f9c849ee89b8b3076a1f9d5efcd4554dcc Mon Sep 17 00:00:00 2001
From: Kian Momtahan <kian.momtahan@forgerock.com>
Date: Thu, 23 Feb 2023 08:56:44 +0000
Subject: [PATCH] Added Whisper

---
 vampire-v5/README.md             |   3 +
 vampire-v5/VTM_Dice_Mechanics.js |  15 +-
 vampire-v5/sheet.json            |   2 +-
 vampire-v5/vampirev5.html        | 301 +++++++++++++++++--------------
 4 files changed, 178 insertions(+), 143 deletions(-)

diff --git a/vampire-v5/README.md b/vampire-v5/README.md
index b4413a2151..d857e10492 100644
--- a/vampire-v5/README.md
+++ b/vampire-v5/README.md
@@ -52,6 +52,9 @@ If you think anything is missing or you see any bugs, please message me via my [
 
 ## Versions
 
+### Version 2.5
+Added whispering and minor bug fix where two skills where the wrong way around. Added Cost and Duration fields to Disciplines
+
 ### Version 2.4
 Added ability to hide attributes of 6+
 
diff --git a/vampire-v5/VTM_Dice_Mechanics.js b/vampire-v5/VTM_Dice_Mechanics.js
index 342c211096..7987d3fe0a 100644
--- a/vampire-v5/VTM_Dice_Mechanics.js
+++ b/vampire-v5/VTM_Dice_Mechanics.js
@@ -1,4 +1,4 @@
-// Vampire the Masquerade 5e Dice Mechanics by Momtahan K (Version 1.3).
+// Vampire the Masquerade 5e Dice Mechanics by Momtahan K (Version 1.4).
 //
 // The following code is an adaptation of that produced by Roll20 user Konrad J. for "Hero Quest Dice Mechanics". 
 // Many thanks for providing this code free to use.
@@ -27,6 +27,8 @@
 // try to use it for commerical gain. This has been added to ensure the community benefits from it.
 
 // Versions
+// Version 1.4
+// Enabled GM Whisper rolls
 // Version 1.3
 // Bug fix. Macros previously may have caused issues, removing some error checking to fix this issue.
 // Version 1.2
@@ -115,7 +117,8 @@ var vtmGlobal = {
 	diceTestEnabled: false,
 	diceLogRolledOnOneLine: false,
 	luckydice: false,
-	reroll: ""
+	reroll: "",
+	whisper: ""
 };
 
 function rollVTMDice(diceQty, type, dc) {
@@ -303,7 +306,7 @@ function processVampireDiceScript(run, dc) {
 	}
 
 	let endTemplateSection = "}} ";
-	let outputMessage = "&{template:wod} {{name=" + user + endTemplateSection;
+	let outputMessage = vtmGlobal.whisper + "&{template:wod} {{name=" + user + endTemplateSection;
 
 	if (run.rollname) {
 		outputMessage += "{{Rollname=" + run.rollname + endTemplateSection;
@@ -728,6 +731,12 @@ function calculateVariables(argv, who) {
 			// The number of successes required (used for only certain rolls)
 			let value = parseInt(entry.substring(1), 10);
 			input.difficulty = value;
+		} else if (identifier === "g") {
+			i++;
+			let value = argv[i];
+			if (value != undefined) {
+				vtmGlobal.whisper= value.trim();
+			}
 		} else if (input.type === "remorse") {
 			log("remorse variable")
 			// Used for remorse rolls
diff --git a/vampire-v5/sheet.json b/vampire-v5/sheet.json
index 411de367f7..9a857865fd 100644
--- a/vampire-v5/sheet.json
+++ b/vampire-v5/sheet.json
@@ -4,7 +4,7 @@
   "authors": "Momtahan K., Martinez A., Obi",
   "roll20userid": "117780, 143652, 95940",
   "preview": "preview.png",
-  "version": 2.1,
+  "version": 2.5,
   "patreon": "https://www.justgiving.com/fundraising/vtm-5thed-character-sheet-red-cross",
   "tipeee:": "https://www.justgiving.com/fundraising/vtm-5thed-character-sheet-red-cross",
   "instructions": "Warning updating to Version 2.0 will cause powers to disappear as their formatting has changed. Please copy them before updating then transfer back! For setup instruction, details on how to install the API script and how to get the most of the guide please check out the [Sheet Guide](https://wiki.roll20.net/Vampire_The_Masquerade_5th_edition#Welcome_to_The_World_of_Darkness) or the Guide section of the sheet. \n\n If you have a Pro-account be sure to include the [VTM 5th Edition Dice Mechanics API Script](https://github.com/Roll20/roll20-api-scripts/tree/master/vampire-v5) available on the Roll20 API script repository. \n\n Known Issue: Having tilde (~) in a players name can cause issues if using the API script.",
diff --git a/vampire-v5/vampirev5.html b/vampire-v5/vampirev5.html
index 82b126d06a..f67f075d29 100644
--- a/vampire-v5/vampirev5.html
+++ b/vampire-v5/vampirev5.html
@@ -1,5 +1,5 @@
 <!--
-    Vampire the Masquerade 5e Alpha Character Sheet (Version 2.1)
+    Vampire the Masquerade 5e Alpha Character Sheet (Version 2.5)
 
     Author: Momtahan K. | UserID: 117780
     Design: Martinez A. | UserID: 143652
@@ -81,16 +81,12 @@
 
 
 <h4 style="display:inline-block">Whisper rolls to GM: </h4>
-<select name="attr_wtype">
-    <option value="" data-i18n="never-whisper-roll">Never Whisper Rolls</option>
-    <option value="?{Whisper?|Public Roll,|Whisper Roll,/w gm }" data-i18n="query-whisper-roll">Query Whisper</option>
-    <option value="/w gm " data-i18n="always-whisper-roll">Always Whisper Rolls</option>
+<select name="attr_wtype" style="display:inline-block; width:80px" >
+    <option value="">Never</option>
+    <option value="?{Whisper?|Public Roll,|Whisper Roll,/w gm }">Query</option>
+    <option value="/w gm ">Always</option>
 </select>
 
-<h4 style="display:inline-block">Whisper rolls(ST Pro-account only): </h4>
-<input type="checkbox" name="attr_ApiWhisper" class="sheet-roll-whsiper" value="1" title="Whisper rolls to GM."
-    style="display:inline-block; width:20px" /><Span class="sheet-block-text"></span>
-
 <table style="width:834px" class="sheet-auto-style8">
     <tr>
         <td class="auto-style3" colspan="6" style="height: 24px" valign="middle">
@@ -443,7 +439,7 @@
                     <span class="sheet-extraAttribute"></span>
                     <input type="radio" class="sheet-defaultRadioBox sheet-extraAttribute" name="attr_Strength" value="7" />
                     <span class="sheet-extraAttribute"></span>
-                    <button class="sheet-diebutton-api" type="roll" title="Rolls Strength" value='!vtm skill r@{Hunger} s@{Strength} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Strength ~ c~@{name} ~'
+                    <button class="sheet-diebutton-api" type="roll" title="Rolls Strength" value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Strength} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Strength ~ c~@{name} ~'
                         name="roll_StrengthApi">
                     </button>
                     <button class="sheet-diebutton-simple" type="roll" title="Non-API Strength Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Strength}} {{NormalSuccesses=[[ [[((([[ [[@{Strength}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Strength}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((@{hunger} + [[@{Strength}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Strength}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]d10>6]]}} {{NormalDice=[[((([[ [[@{Strength}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Strength}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]}} {{HungerDice=[[(((@{hunger} + [[@{Strength}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Strength}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]}}"
@@ -472,7 +468,7 @@
                     <span class="sheet-extraAttribute"></span>
                     <input type="radio" class="sheet-defaultRadioBox sheet-extraAttribute" name="attr_Charisma" value="7" />
                     <span class="sheet-extraAttribute"></span>
-                    <button class="sheet-diebutton-api" type="roll" title="Rolls Charisma" value='!vtm skill r@{Hunger} s@{Charisma} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Charisma ~ c~@{name} ~'
+                    <button class="sheet-diebutton-api" type="roll" title="Rolls Charisma" value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Charisma} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Charisma ~ c~@{name} ~'
                         name="roll_CharismaApi">
                     </button>
                     <button class="sheet-diebutton-simple" type="roll" title="Non-API Charisma Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Charisma}} {{NormalSuccesses=[[ [[((([[ [[@{Charisma}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Charisma}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((@{hunger} + [[@{Charisma}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Charisma}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]d10>6]]}} {{NormalDice=[[((([[ [[@{Charisma}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Charisma}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]}} {{HungerDice=[[(((@{hunger} + [[@{Charisma}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Charisma}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]}}"
@@ -500,14 +496,11 @@
                     <span class="sheet-extraAttribute"></span>
                     <input type="radio" class="sheet-defaultRadioBox sheet-extraAttribute" name="attr_Intelligence" value="7" />
                     <span class="sheet-extraAttribute"></span>
-                    <button class="sheet-diebutton-api" type="roll" title="Rolls Intelligence" value='!vtm skill r@{Hunger} s@{Intelligence} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Intelligence ~ c~@{name} ~'
+                    <button class="sheet-diebutton-api" type="roll" title="Rolls Intelligence" value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Intelligence} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Intelligence ~ c~@{name} ~'
                         name="roll_IntApi">
                     </button>
                     <button class="sheet-diebutton-simple" type="roll" title="Non-API Intelligence Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Intelligence}} {{NormalSuccesses=[[ [[((([[ [[@{Intelligence}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Intelligence}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((@{hunger} + [[@{Intelligence}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Intelligence}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]d10>6]]}} {{NormalDice=[[((([[ [[@{Intelligence}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Intelligence}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]}} {{HungerDice=[[(((@{hunger} + [[@{Intelligence}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Intelligence}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]}}"
                         name="roll_IntelligenceInlineDice"></button>
-
-
-
                 </div>
             </td>
         </tr>
@@ -533,7 +526,7 @@
                     <span class="sheet-extraAttribute"></span>
                     <input type="radio" class="sheet-defaultRadioBox sheet-extraAttribute" name="attr_Dexterity" value="7" />
                     <span class="sheet-extraAttribute"></span>
-                    <button class="sheet-diebutton-api" title="Rolls Dexterity" type='roll' name='roll_dexterity_onlyApi' value='!vtm skill r@{Hunger} s@{Dexterity} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Dexterity ~ c~@{name} ~'></button>
+                    <button class="sheet-diebutton-api" title="Rolls Dexterity" type='roll' name='roll_dexterity_onlyApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Dexterity} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Dexterity ~ c~@{name} ~'></button>
                     <button class="sheet-diebutton-simple" type="roll" title="Non-API Dexterity Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Dexterity}} {{NormalSuccesses=[[ [[((([[ [[@{Dexterity}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Dexterity}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((@{hunger} + [[@{Dexterity}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Dexterity}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]d10>6]]}} {{NormalDice=[[((([[ [[@{Dexterity}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Dexterity}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]}} {{HungerDice=[[(((@{hunger} + [[@{Dexterity}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Dexterity}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]}}"
                         name="roll_DexterityInlineDice"></button>
                 </div>
@@ -560,7 +553,7 @@
                     <span class="sheet-extraAttribute"></span>
                     <input type="radio" class="sheet-defaultRadioBox sheet-extraAttribute" name="attr_Manipulation" value="7" />
                     <span class="sheet-extraAttribute"></span>
-                    <button class="sheet-diebutton-api" title="Rolls Manipulation" type='roll' name='roll_manipulation_onlyApi' value='!vtm skill r@{Hunger} s@{Manipulation} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Manipulation ~ c~@{name} ~'></button>
+                    <button class="sheet-diebutton-api" title="Rolls Manipulation" type='roll' name='roll_manipulation_onlyApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Manipulation} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Manipulation ~ c~@{name} ~'></button>
                     <button class="sheet-diebutton-simple" type="roll" title="Non-API Manipulation Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Manipulation}} {{NormalSuccesses=[[ [[((([[ [[@{Manipulation}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Manipulation}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((@{hunger} + [[@{Manipulation}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Manipulation}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]d10>6]]}} {{NormalDice=[[((([[ [[@{Manipulation}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Manipulation}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]}} {{HungerDice=[[(((@{hunger} + [[@{Manipulation}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Manipulation}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]}}"
                         name="roll_ManipulationInlineDice"></button>
                 </div>
@@ -586,7 +579,7 @@
                     <span class="sheet-extraAttribute"></span>
                     <input type="radio" class="sheet-defaultRadioBox sheet-extraAttribute" name="attr_Wits" value="7" />
                     <span class="sheet-extraAttribute"></span>
-                    <button class="sheet-diebutton-api" title="Rolls Wits" type='roll' name='roll_wits_onlyApi' value='!vtm skill r@{Hunger} s@{Wits} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Wits ~ c~@{name} ~'></button>
+                    <button class="sheet-diebutton-api" title="Rolls Wits" type='roll' name='roll_wits_onlyApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Wits} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Wits ~ c~@{name} ~'></button>
                     <button class="sheet-diebutton-simple" type="roll" title="Non-API Wits Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Wits}} {{NormalSuccesses=[[ [[((([[ [[@{Wits}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Wits}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((@{hunger} + [[@{Wits}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Wits}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]d10>6]]}} {{NormalDice=[[((([[ [[@{Wits}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Wits}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]}} {{HungerDice=[[(((@{hunger} + [[@{Wits}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Wits}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]}}"
                         name="roll_WitsInlineDice"></button>
                 </div>
@@ -614,7 +607,7 @@
                     <span class="sheet-extraAttribute"></span>
                     <input type="radio" class="sheet-defaultRadioBox sheet-extraAttribute" name="attr_Stamina" value="7" />
                     <span class="sheet-extraAttribute"></span>
-                    <button class="sheet-diebutton-api" title="Rolls Stamina" type='roll' name='roll_stamina_onlyApi' value='!vtm skill r@{Hunger} s@{Stamina} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Stamina ~ c~@{name} ~'></button>
+                    <button class="sheet-diebutton-api" title="Rolls Stamina" type='roll' name='roll_stamina_onlyApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Stamina} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Stamina ~ c~@{name} ~'></button>
                     <button class="sheet-diebutton-simple" type="roll" title="Non-API Stamina Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Stamina}} {{NormalSuccesses=[[ [[((([[ [[@{Stamina}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Stamina}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((@{hunger} + [[@{Stamina}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Stamina}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]d10>6]]}} {{NormalDice=[[((([[ [[@{Stamina}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Stamina}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]}} {{HungerDice=[[(((@{hunger} + [[@{Stamina}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Stamina}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]}}"
                         name="roll_StaminaInlineDice"></button>
                 </div>
@@ -640,7 +633,7 @@
                     <span class="sheet-extraAttribute"></span>
                     <input type="radio" class="sheet-defaultRadioBox sheet-extraAttribute" name="attr_Composure" value="7" />
                     <span class="sheet-extraAttribute"></span>
-                    <button class="sheet-diebutton-api" title="Rolls Composure" type='roll' name='roll_composure_onlyApi' value='!vtm skill r@{Hunger} s@{Composure} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Composure ~ c~@{name} ~'></button>
+                    <button class="sheet-diebutton-api" title="Rolls Composure" type='roll' name='roll_composure_onlyApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Composure} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Composure ~ c~@{name} ~'></button>
                     <button class="sheet-diebutton-simple" type="roll" title="Non-API Composure Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Composure}} {{NormalSuccesses=[[ [[((([[ [[@{Composure}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Composure}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((@{hunger} + [[@{Composure}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Composure}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]d10>6]]}} {{NormalDice=[[((([[ [[@{Composure}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Composure}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]}} {{HungerDice=[[(((@{hunger} + [[@{Composure}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Composure}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]}}"
                         name="roll_ComposureInlineDice"></button>
                 </div>
@@ -666,7 +659,7 @@
                     <span class="sheet-extraAttribute"></span>
                     <input type="radio" class="sheet-defaultRadioBox sheet-extraAttribute" name="attr_Resolve" value="7" />
                     <span class="sheet-extraAttribute"></span>
-                    <button class="sheet-diebutton-api" title="Rolls Resolve" type='roll' name='roll_resolve_onlyApi' value='!vtm skill r@{Hunger} s@{Resolve} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Resolve ~ c~@{name} ~'></button>
+                    <button class="sheet-diebutton-api" title="Rolls Resolve" type='roll' name='roll_resolve_onlyApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Resolve} a?{Second Attribute|None,0|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Resolve ~ c~@{name} ~'></button>
                     <button class="sheet-diebutton-simple" type="roll" title="Non-API Resolve Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Resolve}} {{NormalSuccesses=[[ [[((([[ [[@{Resolve}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Resolve}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((@{hunger} + [[@{Resolve}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Resolve}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]d10>6]]}} {{NormalDice=[[((([[ [[@{Resolve}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] + 0) + abs([[ [[@{Resolve}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]] - 0)) / 2.0)]]}} {{HungerDice=[[(((@{hunger} + [[@{Resolve}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) - abs(@{hunger} - [[@{Resolve}+?{Second Attribute|None,0|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2)]]}}"
                         name="roll_ResolveInlineDice"></button>
                 </div>
@@ -1062,11 +1055,11 @@
                     <label style="display: inline-block; padding-right: 0px">Max WP:</label>
                     <input style="width: 40px;display: inline-block;text-align: center" type="number" name="attr_maxwp" />
                     <label style="width: 90px;display: inline-block; padding-right: 0px">WP Re-roll:</label>
-                    <button class="sheet-diebutton-api" title="Willpower Reroll" type='roll' name='roll_willpowerRerollApi' value='!vtm reroll w?{Re-roll Dice|3} t~Re-roll ~ c~@{name} ~'></button>
+                    <button class="sheet-diebutton-api" title="Willpower Reroll" type='roll' name='roll_willpowerRerollApi' value='!vtm reroll g~@{wtype} ~ w?{Re-roll Dice|3} t~Re-roll ~ c~@{name} ~'></button>
                     <button class="sheet-diebutton-simple" type="roll" title="Non-API Willpower Re-Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Willpower Re-Roll}} {{NormalSuccesses=[[ [[?{Re-Roll Dice|3}]]d10>6 ]]}} {{NormalDice=[[?{Re-Roll Dice|3}]]}}"
                         name="roll_rerollInlineDice"></button>
                     <label style="width: 80px;display: inline-block; padding-right: 0px">Willpower:</label>
-                    <button class="sheet-diebutton-api" title="Rolls Willpower" type='roll' name='roll_WillpowerRollApi' value='!vtm will p[[@{willpower-box1} + @{willpower-box2} + @{willpower-box3} + @{willpower-box4} + @{willpower-box5} + @{willpower-box6} + @{willpower-box7} + @{willpower-box8} + @{willpower-box9} + @{willpower-box10} + @{willpower-box11} + @{willpower-box12} + @{willpower-box13} + @{willpower-box14} + @{willpower-box15}]] a0 m?{Modifiers|0} t~Willpower ~ c~@{name} ~'></button>
+                    <button class="sheet-diebutton-api" title="Rolls Willpower" type='roll' name='roll_WillpowerRollApi' value='!vtm will g~@{wtype} ~ p[[@{willpower-box1} + @{willpower-box2} + @{willpower-box3} + @{willpower-box4} + @{willpower-box5} + @{willpower-box6} + @{willpower-box7} + @{willpower-box8} + @{willpower-box9} + @{willpower-box10} + @{willpower-box11} + @{willpower-box12} + @{willpower-box13} + @{willpower-box14} + @{willpower-box15}]] a0 m?{Modifiers|0} t~Willpower ~ c~@{name} ~'></button>
                     <button class="sheet-diebutton-simple" type="roll" title="Non-API Willpower Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Willpower Roll}} {{NormalSuccesses=[[ [[?{Willpower|5} + ?{Modifer|0}]]d10>6 ]]}} {{NormalDice=[[?{Willpower|5} + ?{Modifer|0}]]}}"
                         name="roll_willpowerInlineDice"></button>
                 </td>
@@ -1109,7 +1102,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Athletics" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Athletics" type='roll' name='roll_athleticsApi' value='!vtm skill r@{Hunger} s@{Athletics} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Athletics ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Athletics" type='roll' name='roll_athleticsApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Athletics} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Athletics ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Athletics Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Athletics}} {{NormalSuccesses=[[ [[ ((([[@{Athletics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Athletics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Athletics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Athletics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Athletics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Athletics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Athletics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Athletics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Athletics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Athletics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Athletics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Athletics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_athleticsInlineDice">
                         </button>
@@ -1132,7 +1125,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_AnimalKen" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls AnimalKen" type='roll' name='roll_animalKenApi' value='!vtm skill r@{Hunger} s@{AnimalKen} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Animal Ken ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls AnimalKen" type='roll' name='roll_animalKenApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{AnimalKen} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Animal Ken ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Animal Ken Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Animal Ken}} {{NormalSuccesses=[[ [[ ((([[@{AnimalKen}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{AnimalKen}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{AnimalKen}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{AnimalKen}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{AnimalKen}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{AnimalKen}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{AnimalKen}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{AnimalKen}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{AnimalKen}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{AnimalKen}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{AnimalKen}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{AnimalKen}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_AnimalKenInlineDice">
                         </button>
@@ -1157,7 +1150,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Academics" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Academics" type='roll' name='roll_academicsApi' value='!vtm skill r@{Hunger} s@{Academics} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Academics ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Academics" type='roll' name='roll_academicsApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Academics} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Academics ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Academics Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Academics}} {{NormalSuccesses=[[ [[ ((([[@{Academics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Academics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Academics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Academics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Academics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Academics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Academics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Academics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Academics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Academics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Academics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Academics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_AcademicsInlineDice">
                         </button>
@@ -1182,7 +1175,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Brawl" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Brawl" type='roll' name='roll_brawlApi' value='!vtm skill r@{Hunger} s@{Brawl} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Brawl ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Brawl" type='roll' name='roll_brawlApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Brawl} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Brawl ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Brawl Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Brawl}} {{NormalSuccesses=[[ [[ ((([[@{Brawl}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Brawl}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Brawl}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Brawl}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Brawl}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Brawl}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Brawl}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Brawl}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Brawl}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Brawl}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Brawl}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Brawl}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_BrawlInlineDice">
                         </button>
@@ -1205,7 +1198,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Etiquette" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Etiquette" type='roll' name='roll_etiquetteApi' value='!vtm skill r@{Hunger} s@{Etiquette} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Etiquette ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Etiquette" type='roll' name='roll_etiquetteApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Etiquette} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Etiquette ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Etiquette Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Etiquette}} {{NormalSuccesses=[[ [[ ((([[@{Etiquette}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Etiquette}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Etiquette}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Etiquette}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Etiquette}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Etiquette}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Etiquette}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Etiquette}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Etiquette}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Etiquette}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Etiquette}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Etiquette}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_EtiquetteInlineDice">
                         </button>
@@ -1228,7 +1221,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Awareness" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Awareness" type='roll' name='roll_awarenessApi' value='!vtm skill r@{Hunger} s@{Awareness} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Awareness~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Awareness" type='roll' name='roll_awarenessApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Awareness} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Awareness~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Awareness Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Awareness}} {{NormalSuccesses=[[ [[ ((([[@{Awareness}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Awareness}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Awareness}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Awareness}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Awareness}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Awareness}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Awareness}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Awareness}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Awareness}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Awareness}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Awareness}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Awareness}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_AwarenessInlineDice">
                         </button>
@@ -1253,7 +1246,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Craft" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Craft" type='roll' name='roll_craftApi' value='!vtm skill r@{Hunger} s@{Craft} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Craft ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Craft" type='roll' name='roll_craftApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Craft} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Craft ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Craft Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Craft}} {{NormalSuccesses=[[ [[ ((([[@{Craft}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Craft}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Craft}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Craft}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Craft}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Craft}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Craft}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Craft}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Craft}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Craft}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Craft}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Craft}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_CraftInlineDice">
                         </button>
@@ -1276,7 +1269,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Insight" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Insight" type='roll' name='roll_insightApi' value='!vtm skill r@{Hunger} s@{Insight} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Insight ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Insight" type='roll' name='roll_insightApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Insight} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Insight ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Insight Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Insight}} {{NormalSuccesses=[[ [[ ((([[@{Insight}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Insight}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Insight}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Insight}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Insight}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Insight}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Insight}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Insight}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Insight}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Insight}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Insight}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Insight}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_InsightInlineDice">
                         </button>
@@ -1299,7 +1292,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Finance" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Finance" type='roll' name='roll_financeApi' value='!vtm skill r@{Hunger} s@{Finance} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Finance ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Finance" type='roll' name='roll_financeApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Finance} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Finance ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Finance Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Finance}} {{NormalSuccesses=[[ [[ ((([[@{Finance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Finance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Finance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Finance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Finance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Finance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Finance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Finance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Finance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Finance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Finance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Finance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_FinanceInlineDice">
                         </button>
@@ -1324,7 +1317,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Drive" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Drive" type='roll' name='roll_driveApi' value='!vtm skill r@{Hunger} s@{Drive} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Drive ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Drive" type='roll' name='roll_driveApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Drive} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Drive ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Drive Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Drive}} {{NormalSuccesses=[[ [[ ((([[@{Drive}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Drive}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Drive}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Drive}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Drive}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Drive}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Drive}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Drive}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Drive}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Drive}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Drive}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Drive}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_DriveInlineDice">
                         </button>
@@ -1347,7 +1340,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Intimidation" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Intimidation" type='roll' name='roll_intimidationApi' value='!vtm skill r@{Hunger} s@{Intimidation} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Intimidation ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Intimidation" type='roll' name='roll_intimidationApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Intimidation} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Intimidation ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Intimidation Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Intimidation}} {{NormalSuccesses=[[ [[ ((([[@{Intimidation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Intimidation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Intimidation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Intimidation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Intimidation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Intimidation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Intimidation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Intimidation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Intimidation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Intimidation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Intimidation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Intimidation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_IntimidationInlineDice">
                         </button>
@@ -1370,7 +1363,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Investigation" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Investigation" type='roll' name='roll_investigationApi' value='!vtm skill r@{Hunger} s@{Investigation} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Investigation ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Investigation" type='roll' name='roll_investigationApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Investigation} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Investigation ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Investigation Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Investigation}} {{NormalSuccesses=[[ [[ ((([[@{Investigation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Investigation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Investigation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Investigation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Investigation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Investigation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Investigation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Investigation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Investigation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Investigation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Investigation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Investigation}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_InvestigationInlineDice">
                         </button>
@@ -1395,7 +1388,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Firearms" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Firearms" type='roll' name='roll_firearmsApi' value='!vtm skill r@{Hunger} s@{Firearms} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Firearms ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Firearms" type='roll' name='roll_firearmsApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Firearms} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Firearms ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Firearms Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Firearms}} {{NormalSuccesses=[[ [[ ((([[@{Firearms}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Firearms}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Firearms}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Firearms}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Firearms}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Firearms}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Firearms}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Firearms}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Firearms}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Firearms}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Firearms}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Firearms}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_FirearmsInlineDice">
                         </button>
@@ -1418,7 +1411,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Leadership" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Leadership" type='roll' name='roll_leadership' value='!vtm skill r@{Hunger} s@{Leadership} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Leadership ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Leadership" type='roll' name='roll_leadership' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Leadership} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Leadership ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Leadership Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Leadership}} {{NormalSuccesses=[[ [[ ((([[@{Leadership}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Leadership}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Leadership}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Leadership}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Leadership}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Leadership}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Leadership}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Leadership}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Leadership}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Leadership}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Leadership}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Leadership}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_LeadershipInlineDice">
                         </button>
@@ -1441,84 +1434,13 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Medicine" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Medicine" type='roll' name='roll_medicineApi' value='!vtm skill r@{Hunger} s@{Medicine} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Medicine ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Medicine" type='roll' name='roll_medicineApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Medicine} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Medicine ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Medicine Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Medicine}} {{NormalSuccesses=[[ [[ ((([[@{Medicine}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Medicine}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Medicine}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Medicine}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Medicine}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Medicine}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Medicine}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Medicine}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Medicine}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Medicine}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Medicine}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Medicine}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_MedicineInlineDice">
                         </button>
                     </div>
                 </td>
             </tr>
-            <tr>
-                <td>
-                    <h4 data-i18n="melee-u">Melee</h4>
-                </td>
-                <td>
-                    <div class="sheet-row">
-                        <input type="radio" class="sheet-defaultRadioBox zero" name="attr_Melee" value="0" checked/>
-                        <span></span>
-                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Melee" value="1" />
-                        <span></span>
-                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Melee" value="2" />
-                        <span></span>
-                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Melee" value="3" />
-                        <span></span>
-                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Melee" value="4" />
-                        <span></span>
-                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Melee" value="5" />
-                        <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Melee" type='roll' name='roll_meleeApi' value='!vtm skill r@{Hunger} s@{Melee} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Melee ~ c~@{name} ~'></button>
-                        <button class="sheet-diebutton-simple" type="roll" title="Non-API Melee Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Melee}} {{NormalSuccesses=[[ [[ ((([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
-                            name="roll_MeleeInlineDice">
-                        </button>
-                    </div>
-                </td>
-                <td>
-                    <h4 data-i18n="performance-u">Performance</h4>
-                </td>
-                <td>
-                    <div class="sheet-row">
-                        <input type="radio" class="sheet-defaultRadioBox zero" name="attr_Performance" value="0" checked/>
-                        <span></span>
-                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Performance" value="1" />
-                        <span></span>
-                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Performance" value="2" />
-                        <span></span>
-                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Performance" value="3" />
-                        <span></span>
-                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Performance" value="4" />
-                        <span></span>
-                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Performance" value="5" />
-                        <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Performance" type='roll' name='roll_performanceApi' value='!vtm skill r@{Hunger} s@{Performance} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Performance ~ c~@{name} ~'></button>
-                        <button class="sheet-diebutton-simple" type="roll" title="Non-API Performance Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Performance}} {{NormalSuccesses=[[ [[ ((([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
-                            name="roll_PerformanceInlineDice">
-                        </button>
-                    </div>
-                </td>
-                <td>
-                    <h4 data-i18n="occult-u">Occult</h4>
-                </td>
-                <td>
-                    <div class="sheet-row">
-                        <input type="radio" class="sheet-defaultRadioBox zero" name="attr_Occult" value="0" checked/>
-                        <span></span>
-                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Occult" value="1" />
-                        <span></span>
-                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Occult" value="2" />
-                        <span></span>
-                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Occult" value="3" />
-                        <span></span>
-                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Occult" value="4" />
-                        <span></span>
-                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Occult" value="5" />
-                        <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Occult" type='roll' name='roll_occultApi' value='!vtm skill r@{Hunger} s@{Occult} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Occult ~ c~@{name} ~'></button>
-                        <button class="sheet-diebutton-simple" type="roll" title="Non-API Occult Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Occult}} {{NormalSuccesses=[[ [[ ((([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
-                            name="roll_OccultInlineDice">
-                        </button>
-                    </div>
-                </td>
-            </tr>
             <tr>
                 <td>
                     <h4 data-i18n="larceny-u">Larceny</h4>
@@ -1537,12 +1459,83 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Larceny" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Larceny" type='roll' name='roll_larcenyApi' value='!vtm skill r@{Hunger} s@{Larceny} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Larceny ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Larceny" type='roll' name='roll_larcenyApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Larceny} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Larceny ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Larceny Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Larceny}} {{NormalSuccesses=[[ [[ ((([[@{Larceny}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Larceny}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Larceny}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Larceny}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Larceny}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Larceny}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Larceny}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Larceny}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Larceny}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Larceny}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Larceny}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Larceny}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_LarcenyInlineDice">
                         </button>
                     </div>
                 </td>
+                <td>
+                    <h4 data-i18n="performance-u">Performance</h4>
+                </td>
+                <td>
+                    <div class="sheet-row">
+                        <input type="radio" class="sheet-defaultRadioBox zero" name="attr_Performance" value="0" checked/>
+                        <span></span>
+                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Performance" value="1" />
+                        <span></span>
+                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Performance" value="2" />
+                        <span></span>
+                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Performance" value="3" />
+                        <span></span>
+                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Performance" value="4" />
+                        <span></span>
+                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Performance" value="5" />
+                        <span></span>
+                        <button class="sheet-diebutton-api" title="Rolls Performance" type='roll' name='roll_performanceApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Performance} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Performance ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-simple" type="roll" title="Non-API Performance Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Performance}} {{NormalSuccesses=[[ [[ ((([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Performance}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
+                            name="roll_PerformanceInlineDice">
+                        </button>
+                    </div>
+                </td>
+                <td>
+                    <h4 data-i18n="occult-u">Occult</h4>
+                </td>
+                <td>
+                    <div class="sheet-row">
+                        <input type="radio" class="sheet-defaultRadioBox zero" name="attr_Occult" value="0" checked/>
+                        <span></span>
+                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Occult" value="1" />
+                        <span></span>
+                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Occult" value="2" />
+                        <span></span>
+                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Occult" value="3" />
+                        <span></span>
+                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Occult" value="4" />
+                        <span></span>
+                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Occult" value="5" />
+                        <span></span>
+                        <button class="sheet-diebutton-api" title="Rolls Occult" type='roll' name='roll_occultApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Occult} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Occult ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-simple" type="roll" title="Non-API Occult Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Occult}} {{NormalSuccesses=[[ [[ ((([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Occult}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
+                            name="roll_OccultInlineDice">
+                        </button>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <h4 data-i18n="melee-u">Melee</h4>
+                </td>
+                <td>
+                    <div class="sheet-row">
+                        <input type="radio" class="sheet-defaultRadioBox zero" name="attr_Melee" value="0" checked/>
+                        <span></span>
+                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Melee" value="1" />
+                        <span></span>
+                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Melee" value="2" />
+                        <span></span>
+                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Melee" value="3" />
+                        <span></span>
+                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Melee" value="4" />
+                        <span></span>
+                        <input type="radio" class="sheet-defaultRadioBox" name="attr_Melee" value="5" />
+                        <span></span>
+                        <button class="sheet-diebutton-api" title="Rolls Melee" type='roll' name='roll_meleeApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Melee} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Melee ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-simple" type="roll" title="Non-API Melee Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Melee}} {{NormalSuccesses=[[ [[ ((([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Melee}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
+                            name="roll_MeleeInlineDice">
+                        </button>
+                    </div>
+                </td>
                 <td>
                     <h4 data-i18n="persuasion-u">Persuasion</h4>
                 </td>
@@ -1560,7 +1553,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Persuasion" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Persuasion" type='roll' name='roll_persuasionApi' value='!vtm skill r@{Hunger} s@{Persuasion} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Persuasion ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Persuasion" type='roll' name='roll_persuasionApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Persuasion} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Persuasion ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Persuasion Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Persuasion}} {{NormalSuccesses=[[ [[ ((([[@{Persuasion}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Persuasion}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Persuasion}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Persuasion}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Persuasion}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Persuasion}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Persuasion}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Persuasion}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Persuasion}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Persuasion}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Persuasion}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Persuasion}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_PersuasionInlineDice">
                         </button>
@@ -1583,7 +1576,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Politics" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Politics" type='roll' name='roll_politicsApi' value='!vtm skill r@{Hunger} s@{Politics} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Politics ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Politics" type='roll' name='roll_politicsApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Politics} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Politics ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Politics Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Politics}} {{NormalSuccesses=[[ [[ ((([[@{Politics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Politics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Politics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Politics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Politics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Politics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Politics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Politics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Politics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Politics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Politics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Politics}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_PoliticsInlineDice">
                         </button>
@@ -1608,7 +1601,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Stealth" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Stealth" type='roll' name='roll_stealthApi' value='!vtm skill r@{Hunger} s@{Stealth} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Stealth~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Stealth" type='roll' name='roll_stealthApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Stealth} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Stealth~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Stealth Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Stealth}} {{NormalSuccesses=[[ [[ ((([[@{Stealth}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Stealth}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Stealth}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Stealth}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Stealth}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Stealth}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Stealth}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Stealth}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Stealth}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Stealth}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Stealth}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Stealth}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_StealthInlineDice">
                         </button>
@@ -1631,7 +1624,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Streetwise" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Streetwise" type='roll' name='roll_streetwiseApi' value='!vtm skill r@{Hunger} s@{Streetwise} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Streetwise ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Streetwise" type='roll' name='roll_streetwiseApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Streetwise} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Streetwise ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Streetwise Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Streetwise}} {{NormalSuccesses=[[ [[ ((([[@{Streetwise}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Streetwise}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Streetwise}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Streetwise}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Streetwise}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Streetwise}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Streetwise}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Streetwise}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Streetwise}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Streetwise}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Streetwise}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Streetwise}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_StreetwiseInlineDice">
                         </button>
@@ -1654,7 +1647,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Science" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Science" type='roll' name='roll_scienceApi' value='!vtm skill r@{Hunger} s@{Science} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Science ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Science" type='roll' name='roll_scienceApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Science} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Science ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Science Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Science}} {{NormalSuccesses=[[ [[ ((([[@{Science}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Science}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Science}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Science}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Science}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Science}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Science}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Science}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Science}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Science}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Science}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Science}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_ScienceInlineDice">
                         </button>
@@ -1679,7 +1672,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Survival" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Survival" type='roll' name='roll_survivalApi' value='!vtm skill r@{Hunger} s@{Survival} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Survival ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Survival" type='roll' name='roll_survivalApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Survival} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Survival ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Survival Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Survival}} {{NormalSuccesses=[[ [[ ((([[@{Survival}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Survival}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Survival}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Survival}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Survival}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Survival}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Survival}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Survival}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Survival}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Survival}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Survival}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Survival}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_SurvivalInlineDice">
                         </button>
@@ -1702,7 +1695,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Subterfuge" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Subterfuge" type='roll' name='roll_subterfugeApi' value='!vtm skill r@{Hunger} s@{Subterfuge} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Subterfuge ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Subterfuge" type='roll' name='roll_subterfugeApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Subterfuge} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Subterfuge ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Subterfuge Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Subterfuge}} {{NormalSuccesses=[[ [[ ((([[@{Subterfuge}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Subterfuge}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Subterfuge}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Subterfuge}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Subterfuge}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Subterfuge}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Subterfuge}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Subterfuge}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Subterfuge}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Subterfuge}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Subterfuge}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Subterfuge}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_SubterfugeInlineDice">
                         </button>
@@ -1725,7 +1718,7 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Technology" value="5" />
                         <span></span>
-                        <button class="sheet-diebutton-api" title="Rolls Technology" type='roll' name='roll_technologyApi' value='!vtm skill r@{Hunger} s@{Technology} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Technology ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Technology" type='roll' name='roll_technologyApi' value='!vtm skill r@{Hunger} g~@{wtype} ~ s@{Technology} a?{Attribute|Strength,@{Strength}|Dexterity,@{Dexterity}|Stamina,@{Stamina}|Charisma,@{Charisma}|Manipulation,@{Manipulation}|Composure,@{Composure}|Intelligence,@{Intelligence}|Wits,@{Wits}|Resolve,@{Resolve}} m?{Modifiers|0} t~Technology ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Technology Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Technology}} {{NormalSuccesses=[[ [[ ((([[@{Technology}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Technology}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((((([[@{Technology}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Technology}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Technology}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Technology}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[@{Technology}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]]) + abs([[@{Technology}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]])) / 2) ]]}} {{HungerDice=[[(((((([[@{Technology}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Technology}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) + [[@{hunger}]]) - abs(((([[@{Technology}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]) + abs([[@{Technology}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]])) / 2) - [[@{hunger}]])) / 2)]]}}"
                             name="roll_TechnologyInlineDice">
                         </button>
@@ -1802,7 +1795,7 @@
                     <input type="radio" class="sheet-defaultRadioBox" name="attr_Discipline" value="5" />
                     <span></span>
                 </div>
-                <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm rouse t~Rouse ~ c~@{name} ~'></button>
+                <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm rouse g~@{wtype} ~ t~Rouse ~ c~@{name} ~'></button>
                 <button class="sheet-diebutton-simple" type="roll" title="Non-API Rouse Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Rouse}} {{HungerSuccesses=[[1d10>6 ]]}} {{HungerDice=1}}"
                     name="roll_rouseInlineDice"></button>
                 <select name="attr_DPAtt" style="width:110px; margin: 0 10px 0 10px; display:inline-block">
@@ -1860,7 +1853,7 @@
                     <option value="@{Technology}" data-i18n="technology-u">Technology</option>
                 </select>
                 <button class="sheet-diebutton-api" title="Discipline Roll" type='roll' style="vertical-align: top;" name='roll_DProllApi'
-                    value='!vtm skill r@{Hunger} a@{DPAtt} s@{DPAbi} m?{Modifiers|0} b@{BloodPotency}  t~@{DisciplineName} ~ c~@{name} ~'></button>
+                    value='!vtm skill r@{Hunger} g~@{wtype} ~ a@{DPAtt} s@{DPAbi} m?{Modifiers|0} b@{BloodPotency}  t~@{DisciplineName} ~ c~@{name} ~'></button>
                 <button class="sheet-diebutton-simple" type="roll" title="Non-API Discipline Roll" style="vertical-align: top;" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=@{DisciplineName}}} {{NormalSuccesses=[[ [[((([[ [[@{DPAtt} + @{DPAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{hunger} ]] ]]) + abs([[ [[@{DPAtt} + @{DPAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{hunger} ]] ]])) / 2)]]d10>6 ]]}} {{HungerSuccesses=[[ [[((([[@{DPAtt} + @{DPAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] + @{hunger}) - abs([[@{DPAtt} + @{DPAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] - @{hunger})) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[ [[@{DPAtt} + @{DPAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{hunger} ]] ]]) + abs([[ [[@{DPAtt} + @{DPAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{hunger} ]] ]])) / 2) ]]}} {{HungerDice=[[((([[@{DPAtt} + @{DPAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] + @{hunger}) - abs([[@{DPAtt} + @{DPAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] - @{hunger})) / 2)]]}}"
                     name="roll_disciplineInlineDice">
                 </button>
@@ -1872,7 +1865,7 @@
                     <div style="text-align: left; margin-left: 60px; ">
                         <h4 style="width:60px; display:inline-block">Power 1</h4>
                         <input type="text" name="attr_DisciplinePowerName1" style="width:300px; display:inline-block" />
-                        <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm rouse t~Rouse ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm rouse g~@{wtype} ~ t~Rouse ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Rouse Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Rouse}} {{HungerSuccesses=[[1d10>6 ]]}} {{HungerDice=1}}"
                             name="roll_rouseInlineDice"></button>
                         <select name="attr_DPPowerAtt1" style="width:110px; margin: 0 10px 0 10px; display:inline-block">
@@ -1930,11 +1923,17 @@
                             <option value="@{Technology}" data-i18n="technology-u">Technology</option>
                         </select>
                         <button class="sheet-diebutton-api" title="Discipline Roll" type='roll' style="vertical-align: top;" name='roll_DPPowerrollApi1'
-                            value='!vtm skill r@{Hunger} a@{DPPowerAtt1} s@{DPPowerAbi1} m?{Modifiers|0} b@{BloodPotency} c~@{name} ~ t~@{DisciplinePowerName1}~'>
+                            value='!vtm skill r@{Hunger} g~@{wtype} ~ a@{DPPowerAtt1} s@{DPPowerAbi1} m?{Modifiers|0} b@{BloodPotency} c~@{name} ~ t~@{DisciplinePowerName1}~'>
                         </button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Discipline Roll" style="vertical-align: top;" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=@{DisciplinePowerName1}}} {{NormalSuccesses=[[ [[((([[ [[@{DPPowerAtt1} + @{DPPowerAbi1} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]]) + abs([[ [[@{DPPowerAtt1} + @{DPPowerAbi1} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]])) / 2)]]d10>6 ]]}} {{HungerSuccesses=[[ [[((([[@{DPPowerAtt1} + @{DPPowerAbi1} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] + @{Hunger}) - abs([[@{DPPowerAtt1} + @{DPPowerAbi1} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] - @{Hunger})) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[ [[@{DPPowerAtt1} + @{DPPowerAbi1} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]]) + abs([[ [[@{DPPowerAtt1} + @{DPPowerAbi1} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]])) / 2) ]]}} {{HungerDice=[[((([[@{DPPowerAtt1} + @{DPPowerAbi1} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] + @{Hunger}) - abs([[@{DPPowerAtt1} + @{DPPowerAbi1} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] - @{Hunger})) / 2)]]}}"
                             name="roll_DPPowerrollInline1">
                     </div>
+                    <div style="text-align: left; margin-left: 60px; margin-top: 5px; margin-bottom: 5px;">
+                        <h4 style="width:60px; display:inline-block">Cost</h4>
+                        <input type="text" name="attr_DisCostPowerDetails1" style="width:278px; display:inline-block" />
+                        <h4 style="width:60px; display:inline-block">Duration</h4>
+                        <input type="text" name="attr_DisDurationPowerDetails1" style="width:278px; display:inline-block" />
+                    </div>
                     <div style="text-align: left; margin-left: 60px; margin-top: 5px; margin-bottom: 5px;">
                         <h4 style="width:60px; display:inline-block">Details</h4>
                         <input type="text" name="attr_DisciplinePowerDetails1" style="width:535px; display:inline-block" />
@@ -1947,7 +1946,7 @@
                     <div style="text-align: left; margin-left: 60px; ">
                         <h4 style="width:60px; display:inline-block">Power 2</h4>
                         <input type="text" name="attr_DisciplinePowerName2" style="width:300px; display:inline-block" />
-                        <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm rouse t~Rouse ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm rouse g~@{wtype} ~ t~Rouse ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Rouse Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Rouse}} {{HungerSuccesses=[[1d10>6 ]]}} {{HungerDice=1}}"
                             name="roll_rouseInlineDice"></button>
                         <select name="attr_DPPowerAtt2" style="width:110px; margin: 0 10px 0 10px; display:inline-block">
@@ -2005,11 +2004,17 @@
                             <option value="@{Technology}" data-i18n="technology-u">Technology</option>
                         </select>
                         <button class="sheet-diebutton-api" title="Discipline Roll" type='roll' style="vertical-align: top;" name='roll_DPPowerrollApi2'
-                            value='!vtm skill r@{Hunger} a@{DPPowerAtt2} s@{DPPowerAbi2} m?{Modifiers|0} b@{BloodPotency} c~@{name} ~ t~@{DisciplinePowerName2}~'>
+                            value='!vtm skill r@{Hunger} g~@{wtype} ~ a@{DPPowerAtt2} s@{DPPowerAbi2} m?{Modifiers|0} b@{BloodPotency} c~@{name} ~ t~@{DisciplinePowerName2}~'>
                         </button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Discipline Roll" style="vertical-align: top;" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=@{DisciplinePowerName2}}} {{NormalSuccesses=[[ [[((([[ [[@{DPPowerAtt2} + @{DPPowerAbi2} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]]) + abs([[ [[@{DPPowerAtt2} + @{DPPowerAbi2} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]])) / 2)]]d10>6 ]]}} {{HungerSuccesses=[[ [[((([[@{DPPowerAtt2} + @{DPPowerAbi2} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] + @{Hunger}) - abs([[@{DPPowerAtt2} + @{DPPowerAbi2} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] - @{Hunger})) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[ [[@{DPPowerAtt2} + @{DPPowerAbi2} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]]) + abs([[ [[@{DPPowerAtt2} + @{DPPowerAbi2} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]])) / 2) ]]}} {{HungerDice=[[((([[@{DPPowerAtt2} + @{DPPowerAbi2} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] + @{Hunger}) - abs([[@{DPPowerAtt2} + @{DPPowerAbi2} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] - @{Hunger})) / 2)]]}}"
                             name="roll_DPPowerrollInline2">
                     </div>
+                    <div style="text-align: left; margin-left: 60px; margin-top: 5px; margin-bottom: 5px;">
+                        <h4 style="width:60px; display:inline-block">Cost</h4>
+                        <input type="text" name="attr_DisCostPowerDetails2" style="width:278px; display:inline-block" />
+                        <h4 style="width:60px; display:inline-block">Duration</h4>
+                        <input type="text" name="attr_DisDurationPowerDetails2" style="width:278px; display:inline-block" />
+                    </div>
                     <div style="text-align: left; margin-left: 60px; margin-top: 5px; margin-bottom: 5px;">
                         <h4 style="width:60px; display:inline-block">Details</h4>
                         <input type="text" name="attr_DisciplinePowerDetails2" style="width:535px; display:inline-block" />
@@ -2022,7 +2027,7 @@
                     <div style="text-align: left; margin-left: 60px; ">
                         <h4 style="width:60px; display:inline-block">Power 3</h4>
                         <input type="text" name="attr_DisciplinePowerName3" style="width:300px; display:inline-block" />
-                        <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm rouse t~Rouse ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm rouse g~@{wtype} ~ t~Rouse ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Rouse Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Rouse}} {{HungerSuccesses=[[1d10>6 ]]}} {{HungerDice=1}}"
                             name="roll_rouseInlineDice"></button>
                         <select name="attr_DPPowerAtt3" style="width:110px; margin: 0 10px 0 10px; display:inline-block">
@@ -2080,11 +2085,17 @@
                             <option value="@{Technology}" data-i18n="technology-u">Technology</option>
                         </select>
                         <button class="sheet-diebutton-api" title="Discipline Roll" type='roll' style="vertical-align: top;" name='roll_DPPowerrollApi3'
-                            value='!vtm skill r@{Hunger} a@{DPPowerAtt3} s@{DPPowerAbi3} m?{Modifiers|0} b@{BloodPotency} c~@{name} ~ t~@{DisciplinePowerName3}~'>
+                            value='!vtm skill r@{Hunger} g~@{wtype} ~ a@{DPPowerAtt3} s@{DPPowerAbi3} m?{Modifiers|0} b@{BloodPotency} c~@{name} ~ t~@{DisciplinePowerName3}~'>
                         </button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Discipline Roll" style="vertical-align: top;" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=@{DisciplinePowerName3}}} {{NormalSuccesses=[[ [[((([[ [[@{DPPowerAtt3} + @{DPPowerAbi3} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]]) + abs([[ [[@{DPPowerAtt3} + @{DPPowerAbi3} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]])) / 2)]]d10>6 ]]}} {{HungerSuccesses=[[ [[((([[@{DPPowerAtt3} + @{DPPowerAbi3} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] + @{Hunger}) - abs([[@{DPPowerAtt3} + @{DPPowerAbi3} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] - @{Hunger})) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[ [[@{DPPowerAtt3} + @{DPPowerAbi3} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]]) + abs([[ [[@{DPPowerAtt3} + @{DPPowerAbi3} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]])) / 2) ]]}} {{HungerDice=[[((([[@{DPPowerAtt3} + @{DPPowerAbi3} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] + @{Hunger}) - abs([[@{DPPowerAtt3} + @{DPPowerAbi3} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] - @{Hunger})) / 2)]]}}"
                             name="roll_DPPowerrollInline1">
                     </div>
+                    <div style="text-align: left; margin-left: 60px; margin-top: 5px; margin-bottom: 5px;">
+                        <h4 style="width:60px; display:inline-block">Cost</h4>
+                        <input type="text" name="attr_DisCostPowerDetails3" style="width:278px; display:inline-block" />
+                        <h4 style="width:60px; display:inline-block">Duration</h4>
+                        <input type="text" name="attr_DisDurationPowerDetails3" style="width:278px; display:inline-block" />
+                    </div>
                     <div style="text-align: left; margin-left: 60px; margin-top: 5px; margin-bottom: 5px;">
                         <h4 style="width:60px; display:inline-block">Details</h4>
                         <input type="text" name="attr_DisciplinePowerDetails3" style="width:535px; display:inline-block" />
@@ -2097,7 +2108,7 @@
                     <div style="text-align: left; margin-left: 60px; ">
                         <h4 style="width:60px; display:inline-block">Power 4</h4>
                         <input type="text" name="attr_DisciplinePowerName4" style="width:300px; display:inline-block" />
-                        <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm rouse t~Rouse ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm rouse g~@{wtype} ~ t~Rouse ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Rouse Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Rouse}} {{HungerSuccesses=[[1d10>6 ]]}} {{HungerDice=1}}"
                             name="roll_rouseInlineDice"></button>
                         <select name="attr_DPPowerAtt4" style="width:110px; margin: 0 10px 0 10px; display:inline-block">
@@ -2155,11 +2166,17 @@
                             <option value="@{Technology}" data-i18n="technology-u">Technology</option>
                         </select>
                         <button class="sheet-diebutton-api" title="Discipline Roll" type='roll' style="vertical-align: top;" name='roll_DPPowerrollApi4'
-                            value='!vtm skill r@{Hunger} a@{DPPowerAtt4} s@{DPPowerAbi4} m?{Modifiers|0} b@{BloodPotency} c~@{name} ~ t~@{DisciplinePowerName4}~'>
+                            value='!vtm skill r@{Hunger} g~@{wtype} ~ a@{DPPowerAtt4} s@{DPPowerAbi4} m?{Modifiers|0} b@{BloodPotency} c~@{name} ~ t~@{DisciplinePowerName4}~'>
                         </button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Discipline Roll" style="vertical-align: top;" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=@{DisciplinePowerName4}}} {{NormalSuccesses=[[ [[((([[ [[@{DPPowerAtt4} + @{DPPowerAbi4} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]]) + abs([[ [[@{DPPowerAtt4} + @{DPPowerAbi4} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]])) / 2)]]d10>6 ]]}} {{HungerSuccesses=[[ [[((([[@{DPPowerAtt4} + @{DPPowerAbi4} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] + @{Hunger}) - abs([[@{DPPowerAtt4} + @{DPPowerAbi4} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] - @{Hunger})) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[ [[@{DPPowerAtt4} + @{DPPowerAbi4} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]]) + abs([[ [[@{DPPowerAtt4} + @{DPPowerAbi4} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]])) / 2) ]]}} {{HungerDice=[[((([[@{DPPowerAtt4} + @{DPPowerAbi4} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] + @{Hunger}) - abs([[@{DPPowerAtt4} + @{DPPowerAbi4} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] - @{Hunger})) / 2)]]}}"
                             name="roll_DPPowerrollInline4">
                     </div>
+                    <div style="text-align: left; margin-left: 60px; margin-top: 5px; margin-bottom: 5px;">
+                        <h4 style="width:60px; display:inline-block">Cost</h4>
+                        <input type="text" name="attr_DisCostPowerDetails4" style="width:278px; display:inline-block" />
+                        <h4 style="width:60px; display:inline-block">Duration</h4>
+                        <input type="text" name="attr_DisDurationPowerDetails4" style="width:278px; display:inline-block" />
+                    </div>
                     <div style="text-align: left; margin-left: 60px; margin-top: 5px; margin-bottom: 5px;">
                         <h4 style="width:60px; display:inline-block">Details</h4>
                         <input type="text" name="attr_DisciplinePowerDetails4" style="width:535px; display:inline-block" />
@@ -2172,7 +2189,7 @@
                     <div style="text-align: left; margin-left: 60px; ">
                         <h4 style="width:60px; display:inline-block">Power 5</h4>
                         <input type="text" name="attr_DisciplinePowerName5" style="width:300px; display:inline-block" />
-                        <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm rouse t~Rouse ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm rouse g~@{wtype} ~ t~Rouse ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Rouse Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Rouse}} {{HungerSuccesses=[[1d10>6 ]]}} {{HungerDice=1}}"
                             name="roll_rouseInlineDice"></button>
                         <select name="attr_DPPowerAtt5" style="width:110px; margin: 0 10px 0 10px; display:inline-block">
@@ -2230,11 +2247,17 @@
                             <option value="@{Technology}" data-i18n="technology-u">Technology</option>
                         </select>
                         <button class="sheet-diebutton-api" title="Discipline Roll" type='roll' style="vertical-align: top;" name='roll_DPPowerrollApi5'
-                            value='!vtm skill r@{Hunger} a@{DPPowerAtt5} s@{DPPowerAbi5} m?{Modifiers|0} b@{BloodPotency} c~@{name} ~ t~@{DisciplinePowerName5}~'>
+                            value='!vtm skill r@{Hunger} g~@{wtype} ~ a@{DPPowerAtt5} s@{DPPowerAbi5} m?{Modifiers|0} b@{BloodPotency} c~@{name} ~ t~@{DisciplinePowerName5}~'>
                         </button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Discipline Roll" style="vertical-align: top;" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=@{DisciplinePowerName5}}} {{NormalSuccesses=[[ [[((([[ [[@{DPPowerAtt5} + @{DPPowerAbi5} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]]) + abs([[ [[@{DPPowerAtt5} + @{DPPowerAbi5} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]])) / 2)]]d10>6 ]]}} {{HungerSuccesses=[[ [[((([[@{DPPowerAtt5} + @{DPPowerAbi5} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] + @{Hunger}) - abs([[@{DPPowerAtt5} + @{DPPowerAbi5} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] - @{Hunger})) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[ [[@{DPPowerAtt5} + @{DPPowerAbi5} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]]) + abs([[ [[@{DPPowerAtt5} + @{DPPowerAbi5} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{Hunger} ]] ]])) / 2) ]]}} {{HungerDice=[[((([[@{DPPowerAtt5} + @{DPPowerAbi5} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] + @{Hunger}) - abs([[@{DPPowerAtt5} + @{DPPowerAbi5} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] - @{Hunger})) / 2)]]}}"
                             name="roll_DPPowerrollInline5">
                     </div>
+                    <div style="text-align: left; margin-left: 60px; margin-top: 5px; margin-bottom: 5px;">
+                        <h4 style="width:60px; display:inline-block">Cost</h4>
+                        <input type="text" name="attr_DisCostPowerDetails5" style="width:278px; display:inline-block" />
+                        <h4 style="width:60px; display:inline-block">Duration</h4>
+                        <input type="text" name="attr_DisDurationPowerDetails5" style="width:278px; display:inline-block" />
+                    </div>
                     <div style="text-align: left; margin-left: 60px; margin-top: 5px;">
                         <h4 style="width:60px; display:inline-block">Details</h4>
                         <input type="text" name="attr_DisciplinePowerDetails5" style="width:535px; display:inline-block" />
@@ -2288,7 +2311,7 @@
                     <input type="radio" class="sheet-defaultRadioBox" name="attr_Ritual" value="5" />
                     <span></span>
                 </div>
-                <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm rouse t~Rouse ~ c~@{name} ~'></button>
+                <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm rouse g~@{wtype} ~ t~Rouse ~ c~@{name} ~'></button>
                 <button class="sheet-diebutton-simple" type="roll" title="Non-API Rouse Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Rouse}} {{HungerSuccesses=[[1d10>6 ]]}} {{HungerDice=1}}"
                     name="roll_rouseInlineDice"></button>
                 <select name="attr_RitualAtt" style="width:110px; margin: 0 10px 0 10px; display:inline-block">
@@ -2346,7 +2369,7 @@
                     <option value="@{Technology}" data-i18n="technology-u">Technology</option>
                 </select>
                 <button class="sheet-diebutton-api" title="Ritual Roll" type='roll' style="vertical-align: top;" name='roll_RitualrollApi'
-                    value='!vtm skill r@{Hunger} a@{RitualAtt} s@{RitualAbi} m?{Modifiers|0} b@{BloodPotency}  t~@{RitualName} ~ c~@{name} ~'></button>
+                    value='!vtm skill r@{Hunger} g~@{wtype} ~ a@{RitualAtt} s@{RitualAbi} m?{Modifiers|0} b@{BloodPotency}  t~@{RitualName} ~ c~@{name} ~'></button>
                 <button class="sheet-diebutton-simple" type="roll" title="Non-API Ritual Roll" style="vertical-align: top;" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=@{RitualName}}} {{NormalSuccesses=[[ [[((([[ [[@{RitualAtt} + @{RitualAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{hunger} ]] ]]) + abs([[ [[@{RitualAtt} + @{RitualAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{hunger} ]] ]])) / 2)]]d10>6 ]]}} {{HungerSuccesses=[[ [[((([[@{RitualAtt} + @{RitualAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] + @{hunger}) - abs([[@{RitualAtt} + @{RitualAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] - @{hunger})) / 2)]]d10>6]]}} {{NormalDice=[[ ((([[ [[@{RitualAtt} + @{RitualAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{hunger} ]] ]]) + abs([[ [[@{RitualAtt} + @{RitualAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{hunger} ]] ]])) / 2) ]]}} {{HungerDice=[[((([[@{RitualAtt} + @{RitualAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] + @{hunger}) - abs([[@{RitualAtt} + @{RitualAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]] - @{hunger})) / 2)]]}}"
                     name="roll_ritualInlineDice">
                 </button>
@@ -2513,25 +2536,25 @@
                 <td colspan="6">
                     <div class="sheet-row" align="center" style="display: inline-block;">
                         <h3 style="text-align: center; width:205px" data-i18n="rouse-u">Rouse</h3>
-                        <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm rouse t~Rouse ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm rouse g~@{wtype} ~ t~Rouse ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Rouse Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Rouse}} {{HungerSuccesses=[[1d10>6 ]]}} {{HungerDice=1}}"
                             name="roll_rouseInlineDice"></button>
                     </div>
                     <div class="sheet-row" align="center" style="display: inline-block;">
                         <h3 style="text-align: center; width:206px" data-i18n="frenzy-u">Frenzy</h3>
-                        <button class="sheet-diebutton-api" title="Rolls Frenzy" type='roll' name='roll_frenzyApi' value='!vtm frenzy p[[@{willpower-box1} + @{willpower-box2} + @{willpower-box3} + @{willpower-box4} + @{willpower-box5} + @{willpower-box6} + @{willpower-box7} + @{willpower-box8} + @{willpower-box9} + @{willpower-box10} + @{willpower-box11} + @{willpower-box12} + @{willpower-box13} + @{willpower-box14} + @{willpower-box15}]] o[[@{humanity-box1} + @{humanity-box2} + @{humanity-box3} + @{humanity-box4} + @{humanity-box5} + @{humanity-box6} + @{humanity-box7} + @{humanity-box8} + @{humanity-box9} + @{humanity-box10}]] m?{Modifiers|0} q?{Difficulty|1} t~FRENZY ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Frenzy" type='roll' name='roll_frenzyApi' value='!vtm frenzy g~@{wtype} ~ p[[@{willpower-box1} + @{willpower-box2} + @{willpower-box3} + @{willpower-box4} + @{willpower-box5} + @{willpower-box6} + @{willpower-box7} + @{willpower-box8} + @{willpower-box9} + @{willpower-box10} + @{willpower-box11} + @{willpower-box12} + @{willpower-box13} + @{willpower-box14} + @{willpower-box15}]] o[[@{humanity-box1} + @{humanity-box2} + @{humanity-box3} + @{humanity-box4} + @{humanity-box5} + @{humanity-box6} + @{humanity-box7} + @{humanity-box8} + @{humanity-box9} + @{humanity-box10}]] m?{Modifiers|0} q?{Difficulty|1} t~FRENZY ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Frenzy Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Frenzy}} {{HungerSuccesses=[[[[?{Willpower|5} + floor([[?{Humanity|5}]]/3.0)+ ?{Modifiers|0}]]d10>6 ]]}} {{HungerDice=[[?{Willpower|5} + floor([[?{Humanity|5}]]/3.0)+ ?{Modifiers|0}]]}}"
                             name="roll_frenzyInlineDice"></button>
                     </div>
                     <div class="sheet-row" align="center" style="display: inline-block;">
                         <h3 style="text-align: center; width:205px">Remorse</h3>
-                        <button class="sheet-diebutton-api" title="Rolls Remorse" type='roll' name='roll_remorseApi' value='!vtm remorse x[[@{humanity-box1} + @{humanity-box2} + @{humanity-box3} + @{humanity-box4} + @{humanity-box5} + @{humanity-box6} + @{humanity-box7} + @{humanity-box8} + @{humanity-box9} + @{humanity-box10}]] m?{Modifiers|0} t~Remorse ~ c~@{name} ~'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Remorse" type='roll' name='roll_remorseApi' value='!vtm remorse g~@{wtype} ~ x[[@{humanity-box1} + @{humanity-box2} + @{humanity-box3} + @{humanity-box4} + @{humanity-box5} + @{humanity-box6} + @{humanity-box7} + @{humanity-box8} + @{humanity-box9} + @{humanity-box10}]] m?{Modifiers|0} t~Remorse ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Remorse Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Remorse}} {{HungerSuccesses=[[[[?{Remorse Dice|1}]]d10>6 ]]}} {{HungerDice=[[?{Remorse Dice|1}]]}}"
                             name="roll_remorseInlineDice"></button>
                     </div>
                     <div class="sheet-row" align="center" style="display: inline-block;">
                         <h3 style="text-align: center; width:206px">Humanity</h3>
-                        <button class="sheet-diebutton-api" type="roll" title="Rolls Humanity" value='!vtm humanity o[[@{humanity-box1} + @{humanity-box2} + @{humanity-box3} + @{humanity-box4} + @{humanity-box5} + @{humanity-box6} + @{humanity-box7} + @{humanity-box8} + @{humanity-box9} + @{humanity-box10}]] m?{Modifiers|0} t~Humanity ~ c~@{name} ~'
+                        <button class="sheet-diebutton-api" type="roll" title="Rolls Humanity" value='!vtm humanity g~@{wtype} ~ o[[@{humanity-box1} + @{humanity-box2} + @{humanity-box3} + @{humanity-box4} + @{humanity-box5} + @{humanity-box6} + @{humanity-box7} + @{humanity-box8} + @{humanity-box9} + @{humanity-box10}]] m?{Modifiers|0} t~Humanity ~ c~@{name} ~'
                             name="roll_HumanityApi">
                         </button>
                         <button class="sheet-diebutton-simple" type="roll" title="Non-API Humanity Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Humanity}} {{NormalSuccesses=[[ [[?{Humanity|5} + ?{Modifiers|0} ]]d10>6 ]]}} {{NormalDice=[[?{Humanity|5} + ?{Modifiers|0} ]]}}"
@@ -3039,7 +3062,7 @@
                             <option value="@{Technology}" data-i18n="technology-u">Technology</option>
                         </select>
                         <button class="sheet-diebutton-api" title="Rolls Predator" type='roll' style="vertical-align: top;" name='roll_Predator'
-                            value='!vtm skill r@{Hunger} a@{PredatorAtr} s@{PredatorAbi} m?{Modifiers|0} t~Predator ~ c~@{name} ~'></button>
+                            value='!vtm skill r@{Hunger} g~@{wtype} ~ a@{PredatorAtr} s@{PredatorAbi} m?{Modifiers|0} t~Predator ~ c~@{name} ~'></button>
                         <button class="sheet-diebutton-simple" style="vertical-align: top;" type="roll" title="Non-API Predator Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=Predator}} {{NormalSuccesses=[[ [[(((@{PredatorAtr} + @{PredatorAbi} + ?{Modifier|0} - @{Hunger}) + abs(@{PredatorAtr} + @{PredatorAbi} + ?{Modifier|0} - @{Hunger})) / 2)]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((@{PredatorAtr} + @{PredatorAbi} + ?{Modifier|0} + @{Hunger}) - abs(@{PredatorAtr} + @{PredatorAbi} + ?{Modifier|0} - @{Hunger})) / 2)]]d10>6]]}} {{NormalDice=[[(((@{PredatorAtr} + @{PredatorAbi} + ?{Modifier|0} - @{Hunger}) + abs(@{PredatorAtr} + @{PredatorAbi} + ?{Modifier|0} - @{Hunger})) / 2)]]}} {{HungerDice=[[(((@{PredatorAtr} + @{PredatorAbi} + ?{Modifier|0} + @{Hunger}) - abs(@{PredatorAtr} + @{PredatorAbi} + ?{Modifier|0} - @{Hunger})) / 2)]]}}"
                             name="roll_predatorInlineDice">
                         </button>
@@ -3409,7 +3432,7 @@
                     </select>
                     <input type="checkbox" style="display:inline-block; width:70px" name="attr_HungerCheckbox" value="@{Hunger}" checked />
                     <input type="checkbox" style="display:inline-block; width:120px" name="attr_BPCheckbox" value="@{BloodPotency}" />
-                    <button type='roll' style="display:inline-block; vertical-align: middle;" name='roll_DProll' value='!vtm skill r@{HungerCheckbox} a@{CR1Att} s@{CR1Abi} m?{Modifiers|0} b@{BPCheckbox} t~@{CustomRoll1Name} ~ c~@{name} ~'></button>
+                    <button type='roll' style="display:inline-block; vertical-align: middle;" name='roll_DProll' value='!vtm skill g~@{wtype} ~ r@{HungerCheckbox} a@{CR1Att} s@{CR1Abi} m?{Modifiers|0} b@{BPCheckbox} t~@{CustomRoll1Name} ~ c~@{name} ~'></button>
                 </div>
             </fieldset>
         </div>
@@ -3447,7 +3470,7 @@
                     />
                     <input type="checkbox" style="display:inline-block; width:60px" name="attr_HungerCheckbox" value="@{Hunger}" checked />
                     <input type="checkbox" style="display:inline-block; width:120px" name="attr_BPCheckbox" value="@{BloodPotency}" />
-                    <button type='roll' style="display:inline-block; vertical-align: middle;" name='roll_DProll' value='!vtm skill r@{HungerCheckbox} a@{CustomRoll2Value1} s@{CustomRoll2Value2} m?{Modifiers|0} b@{BPCheckbox} t~@{CustomRoll2Name} ~ c~@{name} ~'></button>
+                    <button type='roll' style="display:inline-block; vertical-align: middle;" name='roll_DProll' value='!vtm skill g~@{wtype} ~ r@{HungerCheckbox} a@{CustomRoll2Value1} s@{CustomRoll2Value2} m?{Modifiers|0} b@{BPCheckbox} t~@{CustomRoll2Name} ~ c~@{name} ~'></button>
                 </div>
             </fieldset>
         </div>