diff --git a/vampire-v5/vampirev5.html b/vampire-v5/vampirev5.html
index b7d0664f10..82b126d06a 100644
--- a/vampire-v5/vampirev5.html
+++ b/vampire-v5/vampirev5.html
@@ -42,6 +42,7 @@
     This license MUST be copied on to any derivative work. Effectively feel free to use, edit and modify the code to your hearts content. As I understand it this will only cause an issue if you  try to use it for commerical gain. This has been added to ensure the community benefits from it.
 -->
 <input class="npc_toggle" name="attr_CoterieCheckbox" type="hidden" value="0">
+<input class="toggleflag" name="attr_wtype" type="hidden"/>
 
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab1" value="1" checked="checked">
 <span title="CORE"></span>
@@ -78,6 +79,18 @@
 <input type="checkbox" name="attr_Attribute6Plus" class="sheet-attribute6Plus" value="1" title="Check to show 6 or more check boxes for attributes."
     style="display:inline-block; width:20px" checked/><Span class="sheet-block-text"></span>
 
+
+<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>
+
+<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">
@@ -433,7 +446,7 @@
                     <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} ~'
                         name="roll_StrengthApi">
                     </button>
-                    <button class="sheet-diebutton-simple" type="roll" title="Non-API Strength Roll" value="&{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)]]}}"
+                    <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)]]}}"
                         name="roll_StrengthInlineDice">
                     </button>
                 </div>
@@ -462,7 +475,7 @@
                     <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} ~'
                         name="roll_CharismaApi">
                     </button>
-                    <button class="sheet-diebutton-simple" type="roll" title="Non-API Charisma Roll" value="&{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)]]}}"
+                    <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)]]}}"
                         name="roll_CharismaInlineDice"></button>
                 </div>
             </td>
@@ -490,7 +503,7 @@
                     <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} ~'
                         name="roll_IntApi">
                     </button>
-                    <button class="sheet-diebutton-simple" type="roll" title="Non-API Intelligence Roll" value="&{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)]]}}"
+                    <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>
 
 
@@ -521,7 +534,7 @@
                     <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-simple" type="roll" title="Non-API Dexterity Roll" value="&{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)]]}}"
+                    <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>
             </td>
@@ -548,7 +561,7 @@
                     <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-simple" type="roll" title="Non-API Manipulation Roll" value="&{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)]]}}"
+                    <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>
             </td>
@@ -574,7 +587,7 @@
                     <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-simple" type="roll" title="Non-API Wits Roll" value="&{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)]]}}"
+                    <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>
             </td>
@@ -602,7 +615,7 @@
                     <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-simple" type="roll" title="Non-API Stamina Roll" value="&{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)]]}}"
+                    <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>
             </td>
@@ -628,7 +641,7 @@
                     <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-simple" type="roll" title="Non-API Composure Roll" value="&{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)]]}}"
+                    <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>
             </td>
@@ -654,7 +667,7 @@
                     <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-simple" type="roll" title="Non-API Resolve Roll" value="&{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)]]}}"
+                    <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>
             </td>
@@ -1050,11 +1063,11 @@
                     <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-simple" type="roll" title="Non-API Willpower Re-Roll" value="&{template:wod} {{name= @{name}}} {{Rollname=Willpower Re-Roll}} {{NormalSuccesses=[[ [[?{Re-Roll Dice|3}]]d10>6 ]]}} {{NormalDice=[[?{Re-Roll Dice|3}]]}}"
+                    <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-simple" type="roll" title="Non-API Willpower Roll" value="&{template:wod} {{name= @{name}}} {{Rollname=Willpower Roll}} {{NormalSuccesses=[[ [[?{Willpower|5} + ?{Modifer|0}]]d10>6 ]]}} {{NormalDice=[[?{Willpower|5} + ?{Modifer|0}]]}}"
+                    <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>
                 <td colspan="3">
@@ -1097,7 +1110,7 @@
                         <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-simple" type="roll" title="Non-API Athletics Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1120,7 +1133,7 @@
                         <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-simple" type="roll" title="Non-API Animal Ken Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1145,7 +1158,7 @@
                         <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-simple" type="roll" title="Non-API Academics Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1170,7 +1183,7 @@
                         <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-simple" type="roll" title="Non-API Brawl Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1193,7 +1206,7 @@
                         <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-simple" type="roll" title="Non-API Etiquette Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1216,7 +1229,7 @@
                         <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-simple" type="roll" title="Non-API Awareness Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1241,7 +1254,7 @@
                         <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-simple" type="roll" title="Non-API Craft Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1264,7 +1277,7 @@
                         <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-simple" type="roll" title="Non-API Insight Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1287,7 +1300,7 @@
                         <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-simple" type="roll" title="Non-API Finance Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1312,7 +1325,7 @@
                         <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-simple" type="roll" title="Non-API Drive Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1335,7 +1348,7 @@
                         <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-simple" type="roll" title="Non-API Intimidation Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1358,7 +1371,7 @@
                         <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-simple" type="roll" title="Non-API Investigation Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1383,7 +1396,7 @@
                         <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-simple" type="roll" title="Non-API Firearms Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1406,7 +1419,7 @@
                         <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-simple" type="roll" title="Non-API Leadership Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1429,7 +1442,7 @@
                         <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-simple" type="roll" title="Non-API Medicine Roll" value="&{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)]]}}"
+                        <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>
@@ -1454,7 +1467,7 @@
                         <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="&{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)]]}}"
+                        <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>
@@ -1477,7 +1490,7 @@
                         <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="&{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)]]}}"
+                        <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>
@@ -1500,7 +1513,7 @@
                         <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="&{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)]]}}"
+                        <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>
@@ -1525,7 +1538,7 @@
                         <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-simple" type="roll" title="Non-API Larceny Roll" value="&{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)]]}}"
+                        <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>
@@ -1548,7 +1561,7 @@
                         <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-simple" type="roll" title="Non-API Persuasion Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1571,7 +1584,7 @@
                         <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-simple" type="roll" title="Non-API Politics Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1596,7 +1609,7 @@
                         <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-simple" type="roll" title="Non-API Stealth Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1619,7 +1632,7 @@
                         <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-simple" type="roll" title="Non-API Streetwise Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1642,7 +1655,7 @@
                         <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-simple" type="roll" title="Non-API Science Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1667,7 +1680,7 @@
                         <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-simple" type="roll" title="Non-API Survival Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1690,7 +1703,7 @@
                         <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-simple" type="roll" title="Non-API Subterfuge Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1713,7 +1726,7 @@
                         <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-simple" type="roll" title="Non-API Technology Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -1790,7 +1803,7 @@
                     <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-simple" type="roll" title="Non-API Rouse Roll" value="&{template:wod} {{name= @{name}}} {{Rollname=Rouse}} {{HungerSuccesses=[[1d10>6 ]]}} {{HungerDice=1}}"
+                <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">
                     <option value="0" selected></option>
@@ -1848,7 +1861,7 @@
                 </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>
-                <button class="sheet-diebutton-simple" type="roll" title="Non-API Discipline Roll" style="vertical-align: top;" value="&{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)]]}}"
+                <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>
             </div>
@@ -1860,7 +1873,7 @@
                         <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-simple" type="roll" title="Non-API Rouse Roll" value="&{template:wod} {{name= @{name}}} {{Rollname=Rouse}} {{HungerSuccesses=[[1d10>6 ]]}} {{HungerDice=1}}"
+                        <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">
                             <option value="0" selected></option>
@@ -1919,14 +1932,14 @@
                         <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}~'>
                         </button>
-                        <button class="sheet-diebutton-simple" type="roll" title="Non-API Discipline Roll" style="vertical-align: top;" value="&{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)]]}}"
+                        <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">Details</h4>
                         <input type="text" name="attr_DisciplinePowerDetails1" style="width:535px; display:inline-block" />
                         <h4 style="margin-left:5px; width:50px; display:inline-block">Display</h4>
-                        <button type="roll" title="Print Details" value="&{template:wod} {{name= @{name}}} {{Rollname=@{DisciplinePowerName1}}} {{DisciplineDetails=@{DisciplinePowerDetails1}}}"
+                        <button type="roll" title="Print Details" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=@{DisciplinePowerName1}}} {{DisciplineDetails=@{DisciplinePowerDetails1}}}"
                             name="roll_rouseInlineDice"></button>
                     </div>
                 </div>
@@ -1935,7 +1948,7 @@
                         <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-simple" type="roll" title="Non-API Rouse Roll" value="&{template:wod} {{name= @{name}}} {{Rollname=Rouse}} {{HungerSuccesses=[[1d10>6 ]]}} {{HungerDice=1}}"
+                        <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">
                             <option value="0" selected></option>
@@ -1994,14 +2007,14 @@
                         <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}~'>
                         </button>
-                        <button class="sheet-diebutton-simple" type="roll" title="Non-API Discipline Roll" style="vertical-align: top;" value="&{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)]]}}"
+                        <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">Details</h4>
                         <input type="text" name="attr_DisciplinePowerDetails2" style="width:535px; display:inline-block" />
                         <h4 style="margin-left:5px; width:50px; display:inline-block">Display</h4>
-                        <button type="roll" title="Print Details" value="&{template:wod} {{name= @{name}}} {{Rollname=@{DisciplinePowerName2}}} {{DisciplineDetails=@{DisciplinePowerDetails2}}}"
+                        <button type="roll" title="Print Details" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=@{DisciplinePowerName2}}} {{DisciplineDetails=@{DisciplinePowerDetails2}}}"
                             name="roll_DisciplineDetailsInlineDice2"></button>
                     </div>
                 </div>
@@ -2010,7 +2023,7 @@
                         <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-simple" type="roll" title="Non-API Rouse Roll" value="&{template:wod} {{name= @{name}}} {{Rollname=Rouse}} {{HungerSuccesses=[[1d10>6 ]]}} {{HungerDice=1}}"
+                        <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">
                             <option value="0" selected></option>
@@ -2069,14 +2082,14 @@
                         <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}~'>
                         </button>
-                        <button class="sheet-diebutton-simple" type="roll" title="Non-API Discipline Roll" style="vertical-align: top;" value="&{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)]]}}"
+                        <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">Details</h4>
                         <input type="text" name="attr_DisciplinePowerDetails3" style="width:535px; display:inline-block" />
                         <h4 style="margin-left:5px; width:50px; display:inline-block">Display</h4>
-                        <button type="roll" title="Print Details" value="&{template:wod} {{name= @{name}}} {{Rollname=@{DisciplinePowerName3}}} {{DisciplineDetails=@{DisciplinePowerDetails3}}}"
+                        <button type="roll" title="Print Details" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=@{DisciplinePowerName3}}} {{DisciplineDetails=@{DisciplinePowerDetails3}}}"
                             name="roll_DisciplineDetailsInlineDice3"></button>
                     </div>
                 </div>
@@ -2085,7 +2098,7 @@
                         <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-simple" type="roll" title="Non-API Rouse Roll" value="&{template:wod} {{name= @{name}}} {{Rollname=Rouse}} {{HungerSuccesses=[[1d10>6 ]]}} {{HungerDice=1}}"
+                        <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">
                             <option value="0" selected></option>
@@ -2144,14 +2157,14 @@
                         <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}~'>
                         </button>
-                        <button class="sheet-diebutton-simple" type="roll" title="Non-API Discipline Roll" style="vertical-align: top;" value="&{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)]]}}"
+                        <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">Details</h4>
                         <input type="text" name="attr_DisciplinePowerDetails4" style="width:535px; display:inline-block" />
                         <h4 style="margin-left:5px; width:50px; display:inline-block">Display</h4>
-                        <button type="roll" title="Print Details" value="&{template:wod} {{name= @{name}}} {{Rollname=@{DisciplinePowerName4}}} {{DisciplineDetails=@{DisciplinePowerDetails4}}}"
+                        <button type="roll" title="Print Details" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=@{DisciplinePowerName4}}} {{DisciplineDetails=@{DisciplinePowerDetails4}}}"
                             name="roll_DisciplineDetailsInlineDice4"></button>
                     </div>
                 </div>
@@ -2160,7 +2173,7 @@
                         <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-simple" type="roll" title="Non-API Rouse Roll" value="&{template:wod} {{name= @{name}}} {{Rollname=Rouse}} {{HungerSuccesses=[[1d10>6 ]]}} {{HungerDice=1}}"
+                        <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">
                             <option value="0" selected></option>
@@ -2219,14 +2232,14 @@
                         <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}~'>
                         </button>
-                        <button class="sheet-diebutton-simple" type="roll" title="Non-API Discipline Roll" style="vertical-align: top;" value="&{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)]]}}"
+                        <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;">
                         <h4 style="width:60px; display:inline-block">Details</h4>
                         <input type="text" name="attr_DisciplinePowerDetails5" style="width:535px; display:inline-block" />
                         <h4 style="margin-left:5px; width:50px; display:inline-block">Display</h4>
-                        <button type="roll" title="Print Details" value="&{template:wod} {{name= @{name}}} {{Rollname=@{DisciplinePowerName5}}} {{DisciplineDetails=@{DisciplinePowerDetails5}}}"
+                        <button type="roll" title="Print Details" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=@{DisciplinePowerName5}}} {{DisciplineDetails=@{DisciplinePowerDetails5}}}"
                             name="roll_DisciplineDetailsInlineDice5"></button>
                     </div>
                 </div>
@@ -2276,7 +2289,7 @@
                     <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-simple" type="roll" title="Non-API Rouse Roll" value="&{template:wod} {{name= @{name}}} {{Rollname=Rouse}} {{HungerSuccesses=[[1d10>6 ]]}} {{HungerDice=1}}"
+                <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">
                     <option value="0" selected></option>
@@ -2334,7 +2347,7 @@
                 </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>
-                <button class="sheet-diebutton-simple" type="roll" title="Non-API Ritual Roll" style="vertical-align: top;" value="&{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)]]}}"
+                <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>
             </div>
@@ -2347,7 +2360,7 @@
                         <h4 style="width:60px; display:inline-block">Details</h4>
                         <input type="text" name="attr_RitualDetails" style="width:535px; display:inline-block" />
                         <h4 style="margin-left:5px; width:50px; display:inline-block">Display</h4>
-                        <button type="roll" title="Print Details" value="&{template:wod} {{name= @{name}}} {{Rollname=@{RitualName}}} {{DisciplineDetails=@{RitualDetails}}}"
+                        <button type="roll" title="Print Details" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=@{RitualName}}} {{DisciplineDetails=@{RitualDetails}}}"
                             name="roll_RitualDetailsInlineDice"></button>
                     </div>            
                 </div>
@@ -2501,19 +2514,19 @@
                     <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-simple" type="roll" title="Non-API Rouse Roll" value="&{template:wod} {{name= @{name}}} {{Rollname=Rouse}} {{HungerSuccesses=[[1d10>6 ]]}} {{HungerDice=1}}"
+                        <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-simple" type="roll" title="Non-API Frenzy Roll" value="&{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}]]}}"
+                        <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-simple" type="roll" title="Non-API Remorse Roll" value="&{template:wod} {{name= @{name}}} {{Rollname=Remorse}} {{HungerSuccesses=[[[[?{Remorse Dice|1}]]d10>6 ]]}} {{HungerDice=[[?{Remorse Dice|1}]]}}"
+                        <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;">
@@ -2521,7 +2534,7 @@
                         <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} ~'
                             name="roll_HumanityApi">
                         </button>
-                        <button class="sheet-diebutton-simple" type="roll" title="Non-API Humanity Roll" value="&{template:wod} {{name= @{name}}} {{Rollname=Humanity}} {{NormalSuccesses=[[ [[?{Humanity|5} + ?{Modifiers|0} ]]d10>6 ]]}} {{NormalDice=[[?{Humanity|5} + ?{Modifiers|0} ]]}}"
+                        <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} ]]}}"
                             name="roll_HumanityInlineDice">
                         </button>
                     </div>
@@ -3027,7 +3040,7 @@
                         </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>
-                        <button class="sheet-diebutton-simple" style="vertical-align: top;" type="roll" title="Non-API Predator Roll" value="&{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)]]}}"
+                        <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>
                     </div>
@@ -3529,7 +3542,7 @@
                     <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="floor([[@{BloodPotency}]]/2.0)"
                     />
-                    <button type="roll" title="Non-API Custom Roll" value="&{template:wod} {{name= @{name}}} {{Rollname=@{CustomRoll3Name}}} {{NormalSuccesses=[[ [[(((@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox}) + abs(@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox})) / 2)]]d10>6]]}} {{HungerSuccesses=[[ [[(((@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} + @{HungerCheckbox}) - abs(@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox})) / 2)]]d10>6]]}} {{NormalDice=[[(((@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox}) + abs(@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox})) / 2)]]}} {{HungerDice=[[(((@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} + @{HungerCheckbox}) - abs(@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox})) / 2)]]}}"
+                    <button type="roll" title="Non-API Custom Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=@{CustomRoll3Name}}} {{NormalSuccesses=[[ [[(((@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox}) + abs(@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox})) / 2)]]d10>6]]}} {{HungerSuccesses=[[ [[(((@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} + @{HungerCheckbox}) - abs(@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox})) / 2)]]d10>6]]}} {{NormalDice=[[(((@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox}) + abs(@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox})) / 2)]]}} {{HungerDice=[[(((@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} + @{HungerCheckbox}) - abs(@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox})) / 2)]]}}"
                         name="roll_custom1InlineDice">
                     </button>
                 </div>
@@ -3570,7 +3583,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="floor([[@{BloodPotency}]]/2.0)"
                     />
-                    <button type="roll" title="Non-API Custom Roll" value="&{template:wod} {{name= @{name}}} {{Rollname=@{CustomRoll4Name}}} {{NormalSuccesses=[[ [[(((@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox}) + abs(@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox})) / 2)]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} + @{HungerCheckbox}) - abs(@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox})) / 2)]]d10>6]]}} {{NormalDice=[[(((@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox}) + abs(@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox})) / 2)]]}} {{HungerDice=[[(((@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} + @{HungerCheckbox}) - abs(@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox})) / 2)]]}}"
+                    <button type="roll" title="Non-API Custom Roll" value="@{wtype}&{template:wod} {{name= @{name}}} {{Rollname=@{CustomRoll4Name}}} {{NormalSuccesses=[[ [[(((@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox}) + abs(@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox})) / 2)]]d10>6 ]]}} {{HungerSuccesses=[[ [[(((@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} + @{HungerCheckbox}) - abs(@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox})) / 2)]]d10>6]]}} {{NormalDice=[[(((@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox}) + abs(@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox})) / 2)]]}} {{HungerDice=[[(((@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} + @{HungerCheckbox}) - abs(@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox})) / 2)]]}}"
                         name="roll_custom2InlineDice">
                     </button>
                 </div>