diff --git a/vampire-v5/README.md b/vampire-v5/README.md
index cef528b31c..84edc8448e 100644
--- a/vampire-v5/README.md
+++ b/vampire-v5/README.md
@@ -4,7 +4,7 @@ Character sheet for Vampire The Maquerade, 5th Edition (v1.0)
 Author: Momtahan K. | UserID: 117780
 Design: Martinez A. | UserID: 143652
 Design Contributor: Obi | UserID: 95940
-Kudos to: Andreas J. (UserID: 1223200), Matt Zaldivar, Brian Shields, Benjamin Bandelow, for their stirling work which provided a basis for this sheet, and espcially to Konrad J. (UserID: 77736), who's Hero Quest Dice Roller has been invaluable. Special thanks to Beta testers Chros G.(326614) and Jordan L.(46186). Many thanks to BigWhoop (UserID: 2124413) for his work on the first version of Obi's sheet.
+Kudos to: Andreas J. (UserID: 1223200), Matt Zaldivar, Brian Shields, Benjamin Bandelow, for their stirling work which provided a basis for this sheet, and espcially to Konrad J. (UserID: 77736), who's Hero Quest Dice Roller has been invaluable. Special thanks to Beta testers Chros G.(326614) and Jordan L.(46186). Many thanks to BigWhoop (UserID: 2124413) for his work on the first version of Obi's sheet. Massive thanks to Barry Snyder for helping us with API-to-Non-API Toggling through explination and use of his code examples.
 
 A very special thank to https://game-icons.net The below icons were used and are licensed under a Creative Commons Attribution 3.0 Unported License. Water fountain icon - by Delapouite under CC BY 3.0 Oppression icon - by Lorc under CC BY 3.0 Prayer icon - by Lorc under CC BY 3.0 Ent Mouth icon - by Lorc under CC BY 3.0 Spattericon - by Lorc under CC BY 3.0 Wolverine claws icon - by Lorc under CC BY 3.0 Half heart icon - by Lorc under CC BY 3.0 Embraced energy iconby Lorc under CC BY 3.0
 
diff --git a/vampire-v5/VTM Dice Mechanics v1.0.js b/vampire-v5/VTM Dice Mechanics v1.0.js
index 8236267a44..68fa6c3302 100644
--- a/vampire-v5/VTM Dice Mechanics v1.0.js	
+++ b/vampire-v5/VTM Dice Mechanics v1.0.js	
@@ -476,7 +476,7 @@ var processScriptTabs = function (argv, who, dc) {
 					sendChat("The best thing about Hero Quest!", "https://www.youtube.com/watch?v=Cx8sl2uC46A");
 					break;
 				case "lupine":
-					sendChat("Some players (and character sheet designers)...", "https://youtu.be/ERDUbAv8Qz0?t=44s");
+					//sendChat("Some players (and character sheet designers)...", "");
 					break;
 				default:
 					processVampireDiceScript(argv[0], dc);
diff --git a/vampire-v5/preview.png b/vampire-v5/preview.png
new file mode 100644
index 0000000000..4cf6e9f5f1
Binary files /dev/null and b/vampire-v5/preview.png differ
diff --git a/vampire-v5/sheet.json b/vampire-v5/sheet.json
index 6801ce7524..ea371dee0a 100644
--- a/vampire-v5/sheet.json
+++ b/vampire-v5/sheet.json
@@ -4,6 +4,6 @@
 	"authors": "Momtahan K., Martinez A., Obi",
 	"roll20userid":"117780, 143652, 95940",
 	"preview": "CWOD-VTM5e.png",
-	"instructions": "See README.md. To use the sheet, the different buttons next to each Attribute enables you to provide a modifier. Each button is coded (to the best of my knowledge) to match VTM5e rules. The MISC section provides an area for custom rolls, this is useful for Discipline rolls that you will have to remake. As you can't select the disciplin in the Trait 2 combo box, please use the second set of custom rolls and type the value in manually. On pressing the COTERIE button a second set of headings will appear. It is recommended that the ST has one character sheet shared with all players, so they may all type the coterie details into a single sheet. By default Chrome (and likely Firefox) will stop the custom font, at the right of the address bar in your browser is a shield. If you click the shield and select Load unsafe scripts, this will provide access to the custom font. NOTICE: This sheet is usable without the Compainion API for those who do not have access to this. All rolls will need to be set up in the 'Rolls' part of the sheet under 'no-script rolls'."
+	"instructions": "See README.md. To use the sheet, the different buttons next to each Attribute enables you to provide a modifier. The Check-box toggle at the top of the sheet allows for toggling between Standard In-line Rolls and Rolling with the API. Each sheet is set to roll with the Inline, non-API rolls by default. API rolling requires a Pro-level subscription. Each button is coded (to the best of my knowledge) to match VTM5e rules. The ROLLs section provides an area for custom rolls, this is useful for Discipline rolls that you will have to remake. As you can't select the disciplin in the Trait 2 combo box, please use the second set of custom rolls and type the value in manually. On pressing the COTERIE button a second set of headings will appear. It is recommended that the ST has one character sheet shared with all players, so they may all type the coterie details into a single sheet. By default Chrome (and likely Firefox) will stop the custom font, at the right of the address bar in your browser is a shield. If you click the shield and select Load unsafe scripts, this will provide access to the custom font."
 }
 
diff --git a/vampire-v5/vampirev5.css b/vampire-v5/vampirev5.css
index 65e180aa9a..dd92522e2f 100644
--- a/vampire-v5/vampirev5.css
+++ b/vampire-v5/vampirev5.css
@@ -665,4 +665,18 @@ input.sheet-tab7 {
     margin-bottom: 5px;
     margin-top: 2px;
     font-family: 'Cinzel',"Courier New", Courier, monospace;
-}
\ No newline at end of file
+}
+
+/* - diebutton-simple = inline die roll; diebutton-api = call to the api - */
+button.sheet-diebutton-simple { /*  Simple Roll is the default roller */
+    
+}
+button.sheet-diebutton-api  { 	
+	display: none;             /* - Note: Simple Roll is the default and will be visible - */
+}
+
+/* - for the toggle to work on tables you need the div table - */
+input.sheet-roll-useDice:unchecked 	~ div table button.sheet-diebutton-api { display: none; }
+input.sheet-roll-useDice:unchecked 	~ div table button.sheet-diebutton-simple { display: inline-block; }
+input.sheet-roll-useDice:checked    ~ div table button.sheet-diebutton-simple { display: none; }
+input.sheet-roll-useDice:checked    ~ div table button.sheet-diebutton-api { display: inline-block; }
diff --git a/vampire-v5/vampirev5.html b/vampire-v5/vampirev5.html
index 7ed4f30627..72b35b2e15 100644
--- a/vampire-v5/vampirev5.html
+++ b/vampire-v5/vampirev5.html
@@ -5,7 +5,9 @@
     Design: Martinez A. | UserID: 143652
 	Design Contributor: Obi | UserID: 95940
     Kudos to: Andreas J. (UserID: 1223200), Matt Zaldivar, Brian Shields, Benjamin Bandelow and espcially to Konrad J. (UserID: 77736), who's Hero Quest Dice Roller has been invaluable. Special thanks to Beta testers Chros G.(326614)
-    and Jordan L.(46186) An extra special shout out the Roll20 and its community Community, who's patience and wisdom helped make this possible. Many thanks to BigWhoop (UserID: 2124413) for his work on the first version of Obi's sheet.
+    and Jordan L.(46186) An extra special shout out the Roll20 and its community Community, who's patience and wisdom helped make this possible. Many thanks to BigWhoop (UserID: 2124413) for his work on the first version of Obi's sheet. 
+	Massive thanks to Barry Snyder for helping us with API-to-Non-API Toggling through explination and use of his code examples.
+
 
     Installation instructions
     This character sheet comes in 4 parts. This html code, the CSS file, a "translation.json" file and the VTM Dice Mechanics.js file
@@ -41,6 +43,8 @@
 -->
 <input class="npc_toggle" name="attr_CoterieCheckbox" type="hidden" value="0">
 
+
+
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab1" value="1" checked="checked">
 <span title="CORE"></span>
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab2" value="2">
@@ -58,12 +62,25 @@
 <table style="width:834px" class="sheet-auto-style8">
     <tr>
         <td colspan="6">
-            <hr class="sheet-auto-style2 sheet-thick-divide" style="margin-top: 1px" noshade="noshade">
+            <hr class="sheet-auto-style2 sheet-thick-divide" style="margin-top: 1px; margin-bottom: 5px" noshade="noshade">
         </td>
     </tr>
 </table>
 <div class="clear"></div>
 
+<!---Added API toggle--->
+<h4 style="display:inline-block; margin-right: 20px">Options: </h4>
+<h4 style="display:inline-block">Enable API Scripts (ST Pro-account only): </h4>
+<input type="checkbox" name="attr_ApiRollRoggle" class="sheet-roll-useDice" value="1" title="check to use the standard Roll20 Dice Rolling mechanism vs the API."
+    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">
+            <hr class="auto-style2 sheet-thin-divide" style="margin-top: 5px;">
+        </td>
+    </tr>
+</table>
+
 <div class="sheet-tab-content sheet-taba">
     <table style="width:834px" class="sheet-auto-style8">
         <tr>
@@ -281,6 +298,8 @@
                 <hr class="sheet-auto-style2 sheet-thick-divide" noshade="noshade">
             </td>
         </tr>
+
+
         <tr>
             <td>
                 <label class="sheet-top-label" data-i18n="name-u">Name:</label>
@@ -397,7 +416,12 @@
                     <span></span>
                     <input type="radio" class="sheet-defaultRadioBox" name="attr_Strength" value="5" />
                     <span></span>
-                    <button type='roll' name='roll_strength_only' value='!vtm atr r@{Hunger} a@{Strength} m?{Modifiers|0} c"@{name} " t"Strength"'></button>
+                    <button class="sheet-diebutton-api" type="roll" title="Rolls Strength" value='!vtm atr r@{Hunger} a@{Strength} m?{Modifiers|0} c"@{name} " t"Strength"'
+                        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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                        name="roll_StrengthInlineDice">
+                    </button>
                 </div>
             </td>
             <td>
@@ -417,7 +441,11 @@
                     <span></span>
                     <input type="radio" class="sheet-defaultRadioBox" name="attr_Charisma" value="5" />
                     <span></span>
-                    <button type='roll' name='roll_charisma_only' value='!vtm atr r@{Hunger} a@{Charisma} m?{Modifiers|0} c"@{name} " t"Charisma"'></button>
+                    <button class="sheet-diebutton-api" type="roll" title="Rolls Charisma" value='!vtm atr r@{Hunger} a@{Charisma} m?{Modifiers|0} c"@{name} " t"Charisma"'
+                        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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                        name="roll_charismaInlineDice"></button>
                 </div>
             </td>
             <td>
@@ -437,7 +465,16 @@
                     <span></span>
                     <input type="radio" class="sheet-defaultRadioBox" name="attr_Intelligence" value="5" />
                     <span></span>
-                    <button type='roll' name='roll_intelligence_only' value='!vtm atr r@{Hunger} a@{Intelligence} m?{Modifiers|0} c"@{name} " t"Intelligence"'></button>
+
+
+                    <button class="sheet-diebutton-api" type="roll" title="Rolls Intelligence" value='!vtm atr r@{Hunger} a@{Intelligence} m?{Modifiers|0} c"@{name} " t"Intelligence"'
+                        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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                        name="roll_intelligenceInlineDice"></button>
+
+
+
                 </div>
             </td>
         </tr>
@@ -459,7 +496,9 @@
                     <span></span>
                     <input type="radio" class="sheet-defaultRadioBox" name="attr_Dexterity" value="5" />
                     <span></span>
-                    <button type='roll' name='roll_dexterity_only' value='!vtm atr r@{Hunger} a@{Dexterity} m?{Modifiers|0} c"@{name} " t"Dexterity"'></button>
+                    <button class="sheet-diebutton-api" title="Rolls Dexterity" type='roll' name='roll_dexterity_onlyApi' value='!vtm atr r@{Hunger} a@{Dexterity} m?{Modifiers|0} c"@{name} " t"Dexterity"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                        name="roll_dexterityInlineDice"></button>
                 </div>
             </td>
 
@@ -480,7 +519,9 @@
                     <span></span>
                     <input type="radio" class="sheet-defaultRadioBox" name="attr_Manipulation" value="5" />
                     <span></span>
-                    <button type='roll' name='roll_manipulation_only' value='!vtm atr r@{Hunger} a@{Manipulation} m?{Modifiers|0} c"@{name} " t"Manipulation"'></button>
+                    <button class="sheet-diebutton-api" title="Rolls Manipulation" type='roll' name='roll_manipulation_onlyApi' value='!vtm atr r@{Hunger} a@{Manipulation} m?{Modifiers|0} c"@{name} " t"Manipulation"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                        name="roll_manipulationInlineDice"></button>
                 </div>
             </td>
             <td>
@@ -500,7 +541,9 @@
                     <span></span>
                     <input type="radio" class="sheet-defaultRadioBox" name="attr_Wits" value="5" />
                     <span></span>
-                    <button type='roll' name='roll_wits_only' value='!vtm atr r@{Hunger} a@{Wits} m?{Modifiers|0} c"@{name} " t"Wits"'></button>
+                    <button class="sheet-diebutton-api" title="Rolls Wits" type='roll' name='roll_wits_onlyApi' value='!vtm atr r@{Hunger} a@{Wits} m?{Modifiers|0} c"@{name} " t"Wits"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                        name="roll_witsInlineDice"></button>
                 </div>
             </td>
         </tr>
@@ -522,7 +565,9 @@
                     <span></span>
                     <input type="radio" class="sheet-defaultRadioBox" name="attr_Stamina" value="5" />
                     <span></span>
-                    <button type='roll' name='roll_stamina_only' value='!vtm atr r@{Hunger} a@{Stamina} m?{Modifiers|0} c"@{name} " t"Stamina"'></button>
+                    <button class="sheet-diebutton-api" title="Rolls Stamina" type='roll' name='roll_stamina_onlyApi' value='!vtm atr r@{Hunger} a@{Stamina} m?{Modifiers|0} c"@{name} " t"Stamina"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                        name="roll_staminaInlineDice"></button>
                 </div>
             </td>
             <td>
@@ -542,7 +587,9 @@
                     <span></span>
                     <input type="radio" class="sheet-defaultRadioBox" name="attr_Composure" value="5" />
                     <span></span>
-                    <button type='roll' name='roll_composure_only' value='!vtm atr r@{Hunger} a@{Composure} m?{Modifiers|0} c"@{name} " t"Composure"'></button>
+                    <button class="sheet-diebutton-api" title="Rolls Composure" type='roll' name='roll_composure_onlyApi' value='!vtm atr r@{Hunger} a@{Composure} m?{Modifiers|0} c"@{name} " t"Composure"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                        name="roll_composureInlineDice"></button>
                 </div>
             </td>
             <td>
@@ -562,7 +609,9 @@
                     <span></span>
                     <input type="radio" class="sheet-defaultRadioBox" name="attr_Resolve" value="5" />
                     <span></span>
-                    <button type='roll' name='roll_resolve_only' value='!vtm atr r@{Hunger} a@{Resolve} m?{Modifiers|0} c"@{name} " t"Resolve"'></button>
+                    <button class="sheet-diebutton-api" title="Rolls Resolve" type='roll' name='roll_resolve_onlyApi' value='!vtm atr r@{Hunger} a@{Resolve} m?{Modifiers|0} c"@{name} " t"Resolve"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                        name="roll_resolveInlineDice"></button>
                 </div>
             </td>
         </tr>
@@ -953,17 +1002,21 @@
 
             <tr>
                 <td colspan="3">
-                    <label style="display: inline-block">Max WP:</label>
-                    <input style="width: 20px;display: inline-block;text-align: center;" type="text" name="attr_maxwp" />
-                    <label style="width: 90px;display: inline-block">WP Re-roll:</label>
-                    <button style="display: inline-block" type='roll' name='roll_willpowerreroll' value='!vtm reroll w3 t"Re-roll"'></button>
-                    <label style="width: 80px;display: inline-block">Willpower:</label>
-                    <button type='roll' name='roll_Willpowerroll' 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} c"@{name} " t"Willpower"'></button>
+                    <label style="display: inline-block; padding-right: 0px">Max WP:</label>
+                    <input style="width: 40px;display: inline-block;text-align: center" type="number" name="attr_maxwp" />
+                    <label style="width: 90px;display: inline-block; padding-right: 0px">WP Re-roll:</label>
+                    <button class="sheet-diebutton-api" title="Willpower Reroll" type='roll' name='roll_willpowerRerollApi' value='!vtm reroll w3 t"Re-roll"'></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|1}]]d10>6 ]]}} {{NormalDice=[[?{Re-Roll Dice|1}]]}}"
+                        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} c"@{name} " t"Willpower"'></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}]]}}"
+                        name="roll_willpowerInlineDice"></button>
                 </td>
                 <td colspan="3">
                     <div class="sheet-row" align="center" style="display: inline-block;">
-                        <label style="width: 120px;margin-left: 150px;">Max Health:</label>
-                        <input style="width: 20px" type="text" name="attr_maxhealth" />
+                        <label style="width: 120px;margin-left: 150px;; padding-right: 0px">Max Health:</label>
+                        <input style="width: 40px" type="number" name="attr_maxhealth" />
                     </div>
                 </td>
             </tr>
@@ -999,7 +1052,10 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Athletics" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_athletics' 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} c"@{name} " t"Athletics"'></button>
+                        <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} c"@{name} " t"Athletics"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_athleticsInlineDice">
+                        </button>
                     </div>
                 </td>
                 <td style="width: 94px" class="auto-style9">
@@ -1019,8 +1075,12 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_AnimalKen" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_AnimalKen' 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} c"@{name} " t"Animal Ken"'></button>
+                        <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} c"@{name} " t"Animal Ken"'></button>
+                        <button class="sheet-diebutton-simple" type="roll" title="Non-API Animal Ken Roll" value="&{template:wod} {{name= @{name}}} {{Rollname=AnimalKen}} {{NormalSuccesses=[[ [[ [[@{AnimalKen}+?{Attribute|Charisma, @{Charisma}|Composure, @{Composure}|Dexterity, @{Dexterity}|Intelligence, @{Intelligence}|Manipulation, @{Manipulation}|Resolve, @{Resolve}|Stamina, @{Stamina}|Strength, @{Strength}|Wits, @{Wits}}+?{Modifiers|0} ]]- [[ @{hunger} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_animalKenInlineDice">
                     </div>
+
+                    </button>
                 </td>
                 <td style="width: 94px" class="auto-style9">
                     <h4 data-i18n="academics-u">Academics</h4>
@@ -1039,7 +1099,10 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Academics" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_academics' 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} c"@{name} " t"Academics"'></button>
+                        <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} c"@{name} " t"Academics"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_academicsInlineDice">
+                        </button>
                     </div>
                 </td>
             </tr>
@@ -1061,7 +1124,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Brawl" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_brawl' 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} c"@{name} " t"Brawl"'></button>
+                        <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} c"@{name} " t"Brawl"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_brawlInlineDice"></button>
                     </div>
                 </td>
                 <td>
@@ -1081,7 +1146,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Etiquette" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_etiquette' 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} c"@{name} " t"Etiquette"'></button>
+                        <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} c"@{name} " t"Etiquette"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_etiquetteInlineDice"></button>
                     </div>
                 </td>
                 <td>
@@ -1101,7 +1168,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Awareness" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_awareness' 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} c"@{name} " t"Awareness"'></button>
+                        <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} c"@{name} " t"Awareness"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_awarenessInlineDice"></button>
                     </div>
                 </td>
             </tr>
@@ -1123,7 +1192,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Craft" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_craft' 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} c"@{name} " t"Craft"'></button>
+                        <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} c"@{name} " t"Craft"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_craftInlineDice"></button>
                     </div>
                 </td>
                 <td>
@@ -1143,7 +1214,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Insight" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_insight' 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} c"@{name} " t"Insight"'></button>
+                        <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} c"@{name} " t"Insight"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_insightInlineDice"></button>
                     </div>
                 </td>
                 <td>
@@ -1163,7 +1236,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Finance" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_finance' 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} c"@{name} " t"Finance"'></button>
+                        <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} c"@{name} " t"Finance"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_financeInlineDice"></button>
                     </div>
                 </td>
             </tr>
@@ -1185,7 +1260,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Drive" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_drive' 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} c"@{name} " t"Drive"'></button>
+                        <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} c"@{name} " t"Drive"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_driveInlineDice"></button>
                     </div>
                 </td>
                 <td>
@@ -1205,7 +1282,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Intimidation" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_intimidation' 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} c"@{name} " t"Intimidation"'></button>
+                        <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} c"@{name} " t"Intimidation"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_intimidationInlineDice"></button>
                     </div>
                 </td>
                 <td>
@@ -1225,7 +1304,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Investigation" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_investigation' 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} c"@{name} " t"Investigation"'></button>
+                        <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} c"@{name} " t"Investigation"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_investigationInlineDice"></button>
                     </div>
                 </td>
             </tr>
@@ -1247,7 +1328,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Firearms" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_firearms' 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} c"@{name} " t"Firearms"'></button>
+                        <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} c"@{name} " t"Firearms"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_firearmsInlineDice"></button>
                     </div>
                 </td>
                 <td>
@@ -1267,7 +1350,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Leadership" value="5" />
                         <span></span>
-                        <button 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} c"@{name} " t"Leadership"'></button>
+                        <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} c"@{name} " t"Leadership"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_leadershipInlineDice"></button>
                     </div>
                 </td>
                 <td>
@@ -1287,7 +1372,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Medicine" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_medicine' 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} c"@{name} " t"Medicine"'></button>
+                        <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} c"@{name} " t"Medicine"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_medicineInlineDice"></button>
                     </div>
                 </td>
             </tr>
@@ -1309,7 +1396,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Melee" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_melee' 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} c"@{name} " t"Melee"'></button>
+                        <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} c"@{name} " t"Melee"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_meleeInlineDice"></button>
                     </div>
                 </td>
                 <td>
@@ -1329,7 +1418,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Performance" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_performance' 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} c"@{name} " t"Performance"'></button>
+                        <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} c"@{name} " t"Performance"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_performanceInlineDice"></button>
                     </div>
                 </td>
                 <td>
@@ -1349,7 +1440,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Occult" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_occult' 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} c"@{name} " t"Occult"'></button>
+                        <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} c"@{name} " t"Occult"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_occultInlineDice"></button>
                     </div>
                 </td>
             </tr>
@@ -1371,7 +1464,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Larceny" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_larceny' 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} c"@{name} " t"Larceny"'></button>
+                        <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} c"@{name} " t"Larceny"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_larcenyInlineDice"></button>
                     </div>
                 </td>
                 <td>
@@ -1391,7 +1486,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Persuasion" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_persuasion' 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} c"@{name} " t"Persuasion"'></button>
+                        <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} c"@{name} " t"Persuasion"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_persuasionInlineDice"></button>
                     </div>
                 </td>
                 <td>
@@ -1411,7 +1508,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Politics" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_politics' 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} c"@{name} " t"Politics"'></button>
+                        <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} c"@{name} " t"Politics"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_politicsInlineDice"></button>
                     </div>
                 </td>
             </tr>
@@ -1433,7 +1532,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Stealth" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_stealth' 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} c"@{name} " t"Stealth"'></button>
+                        <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} c"@{name} " t"Stealth"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_stealthInlineDice"></button>
                     </div>
                 </td>
                 <td>
@@ -1453,7 +1554,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Streetwise" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_streetwise' 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} c"@{name} " t"Streetwise"'></button>
+                        <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} c"@{name} " t"Streetwise"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_streetwiseInlineDice"></button>
                     </div>
                 </td>
                 <td>
@@ -1473,7 +1576,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Science" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_science' 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} c"@{name} " t"Science"'></button>
+                        <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} c"@{name} " t"Science"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_scienceInlineDice"></button>
                     </div>
                 </td>
             </tr>
@@ -1495,7 +1600,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Survival" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_survival' 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} c"@{name} " t"Survival"'></button>
+                        <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} c"@{name} " t"Survival"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_survivalInlineDice"></button>
                     </div>
                 </td>
                 <td>
@@ -1515,7 +1622,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Subterfuge" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_subterfuge' 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} c"@{name} " t"Subterfuge"'></button>
+                        <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} c"@{name} " t"Subterfuge"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_subterfugeInlineDice"></button>
                     </div>
                 </td>
                 <td>
@@ -1535,7 +1644,9 @@
                         <span></span>
                         <input type="radio" class="sheet-defaultRadioBox" name="attr_Technology" value="5" />
                         <span></span>
-                        <button type='roll' name='roll_technology' 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} c"@{name} " t"Technology"'></button>
+                        <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} c"@{name} " t"Technology"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]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} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_technologyInlineDice"></button>
                     </div>
                 </td>
             </tr>
@@ -1608,7 +1719,9 @@
                     <input type="radio" class="sheet-defaultRadioBox" name="attr_Discipline" value="5" />
                     <span></span>
                 </div>
-                <button type='roll' name='roll_rouse' value='!vtm rouse c"@{name} "'></button>
+                <button class="sheet-diebutton-api" title="Rolls Rouse" style="display:none" type='roll' name='roll_rouseApi' value='!vtm rouse c"@{name} "'></button>
+                <button class="sheet-diebutton-simple" type="roll" style="display:none" title="Non-API Rouse Roll" value="&{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>
                     <option value="@{Strength}" data-i18n="strength-u">Strength</option>
@@ -1652,7 +1765,10 @@
                     <option value="@{Survival}" data-i18n="survival-u">Survival</option>
                     <option value="@{Technology}" data-i18n="technology-u">Technology</option>
                 </select>
-                <button type='roll' style="display:inline-block; vertical-align: top;" name='roll_DProll' value='!vtm skill r@{Hunger} a@{DPAtt} s@{DPAbi} m?{Modifiers|0} b@{BloodPotency} c"@{name} " t"@{DisciplineName}"'></button>
+                <button class="sheet-diebutton-api" title="Discipline Roll" type='roll' style="display:inline-block; vertical-align: top;" name='roll_DProllApi'
+                    value='!vtm skill r@{Hunger} a@{DPAtt} s@{DPAbi} m?{Modifiers|0} b@{BloodPotency} c"@{name} " t"@{DisciplineName}"'></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} ]] ]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]d10>6]]}} {{NormalDice=[[ [[@{DPAtt} + @{DPAbi} + floor([[@{BloodPotency}]]/2.0) +?{Modifiers|0} ]]- [[ @{hunger} ]] ]]}} {{HungerDice=[[@{hunger}]]}}"
+                    name="roll_disciplineInlineDice"></button>
             </div>
             <h4 align="center">Powers</h4>
             <div style="text-align: center">
@@ -1816,19 +1932,25 @@
                 <td colspan="2">
                     <div class="sheet-row" align="center" style="display: inline-block;">
                         <h3 style="text-align: center; width:274px" data-i18n="rouse-u">Rouse</h3>
-                        <button type='roll' name='roll_rouse' value='!vtm rouse c"@{name} "'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Rouse" type='roll' name='roll_rouseApi' value='!vtm 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}}"
+                            name="roll_rouseInlineDice"></button>
                     </div>
                 </td>
                 <td colspan="2">
                     <div class="sheet-row" align="center" style="display: inline-block;">
                         <h3 style="text-align: center; width:274px" data-i18n="frenzy-u">Frenzy</h3>
-                        <button type='roll' name='roll_frenzy' 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} c"@{name} " t"FRENZY"'></button>
+                        <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} c"@{name} " t"FRENZY"'></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}]]}}"
+                            name="roll_frenzyInlineDice"></button>
                     </div>
                 </td>
                 <td colspan="2">
                     <div class="sheet-row" align="center" style="display: inline-block;">
                         <h3 style="text-align: center; width:274px">Remorse</h3>
-                        <button type='roll' name='roll_remorse' value='!vtm humanity x[[@{humanity-box1} + @{humanity-box2} + @{humanity-box3} + @{humanity-box4} + @{humanity-box5} + @{humanity-box6} + @{humanity-box7} + @{humanity-box8} + @{humanity-box9} + @{humanity-box10}]] m?{Modifiers|0} c"@{name} " t"Humanity"'></button>
+                        <button class="sheet-diebutton-api" title="Rolls Remorse" type='roll' name='roll_remorseApi' value='!vtm humanity x[[@{humanity-box1} + @{humanity-box2} + @{humanity-box3} + @{humanity-box4} + @{humanity-box5} + @{humanity-box6} + @{humanity-box7} + @{humanity-box8} + @{humanity-box9} + @{humanity-box10}]] m?{Modifiers|0} c"@{name} " t"Humanity"'></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}]]}}"
+                            name="roll_remorseInlineDice"></button>
                     </div>
                 </td>
             </tr>
@@ -2243,7 +2365,10 @@
                             <option value="@{Survival}" data-i18n="survival-u">Survival</option>
                             <option value="@{Technology}" data-i18n="technology-u">Technology</option>
                         </select>
-                        <button type='roll' style="display:inline-block; vertical-align: top;" name='roll_Predator' value='!vtm skill r@{Hunger} a@{PredatorAtr} s@{PredatorAbi} m?{Modifiers|0} c"@{name} " t"Predator"'></button>
+                        <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} c"@{name} " t"Predator"'></button>
+                        <button class="sheet-diebutton-simple" style="vertical-align: top;" type="roll" title="Non-API Predator Roll" value="&{template:wod} {{name= @{name}}} {{Rollname=Predator}} {{HungerSuccesses=[[[[a@{PredatorAtr} + s@{PredatorAbi} + ?{Modifier|0} - r@{Hunger}]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{hunger}]]d10>6]]}} {{HungerDice=[[a@{PredatorAtr} + s@{PredatorAbi} + ?{Modifier|0} - r@{Hunger}]]}} {{HungerDice=[[@{hunger}]]}}"
+                            name="roll_predatorInlineDice"></button>
                     </div>
                 </td>
             </tr>
@@ -2370,7 +2495,9 @@
 
             <tr>
                 <td colspan="3" align="center">
-                    <h4 style="line-height:28px;display:inline-block;margin-right: 10px;position: relative;left:11px">True Age</h4>
+                    <h4 style="line-height:28px;display:inline-block;margin-right: 10px;position: relative;left:11px">True
+                        Age
+                    </h4>
                     <input type="text" name="attr_TrueAge" style="width: 150px;margin-right: 10px;margin-bottom: 5px;display:inline-block;position: relative;left:11px "
                     />
                 </td>
@@ -2387,7 +2514,8 @@
                     />
                 </td>
                 <td colspan="3" align="center">
-                    <h4 style="line-height:28px;display:inline-block;margin-right: 10px;position: relative;left:1px">Date of Death</h4>
+                    <h4 style="line-height:28px;display:inline-block;margin-right: 10px;position: relative;left:1px">Date
+                        of Death</h4>
                     <input type="text" name="attr_DateOfDeath" style="width: 150px;margin-right: 10px;margin-bottom: 5px; display:inline-block;position: relative;left:1px"
                     />
                 </td>
@@ -2468,9 +2596,9 @@
                     <h4 style="display:inline-block">Type: </h4>
                     <input type="text" name="attr_weapontype" style="width:120px; display:inline-block; margin-right: 10px">
                     <h4 style="display:inline-block">Damage Value: </h4>
-                    <input type="text" name="attr_weapondamage" style="width:20px; display:inline-block; margin-right: 10px">
+                    <input type="number" name="attr_weapondamage" style="width:40px; display:inline-block; margin-right: 10px">
                     <h4 style="display:inline-block">Notes: </h4>
-                    <input type="text" name="attr_weaponnotes" style="width:310px; display:inline-block">
+                    <input type="text" name="attr_weaponnotes" style="width:295px; display:inline-block">
                 </div>
             </fieldset>
         </div>
@@ -2479,7 +2607,7 @@
             <h4 style="display:inline-block; margin-right: 5px">Type: </h4>
             <input type="text" name="attr_weapontype" style="width:120px; display:inline-block; margin-right: 10px">
             <h4 style="display:inline-block">Armor Value: </h4>
-            <input type="text" name="attr_weapondamage" style="width:20px; display:inline-block; margin-right: 10px">
+            <input type="number" name="attr_weapondamage" style="width:40px; display:inline-block; margin-right: 10px">
             <h4 style="display:inline-block">Notes: </h4>
             <input type="text" name="attr_weaponnotes" style="width:310px; display:inline-block">
         </div>
@@ -2608,17 +2736,18 @@
                 <div style="text-align: left">
                     <input type="text" name="attr_CustomRoll2Name" style="width:200px; margin:0 5px 2px 0; display:inline-block" />
                     <input type="text" name="attr_CustomRoll2Trait1" style="width:110px; margin:0 0 2px 0; display:inline-block" />
-                    <input type="text" name="attr_CustomRoll2Value1" style="width:25px; margin:0 18px 2px 12px; display:inline-block;text-align: center;"
+                    <input type="number" name="attr_CustomRoll2Value1" style="width:40px; margin:0 12px 2px 3px; display:inline-block;text-align: center;"
                     />
                     <input type="text" name="attr_CustomRoll2Trait2" style="width:110px; margin:0 0 2px 0; display:inline-block" />
-                    <input type="text" name="attr_CustomRoll2Value2" style="width:25px; margin:0 10px 2px 10px; display:inline-block;text-align: center;"
+                    <input type="number" name="attr_CustomRoll2Value2" style="width:40px; margin:0 10px 2px 2px; display:inline-block;text-align: center;"
                     />
-                    <input type="checkbox" style="display:inline-block; width:70px" name="attr_HungerCheckbox" value="@{Hunger}" checked />
+                    <input type="checkbox" style="display:inline-block; width:60px" name="attr_HungerCheckbox" value="@{Hunger}" checked />
                     <input type="checkbox" style="display:inline-block; width:120px" name="attr_BPCheckbox" value="@{BloodPotency}" />
                     <button type='roll' style="display:inline-block; vertical-align: middle;" name='roll_DProll' value='!vtm skill r@{HungerCheckbox} a@{CustomRoll2Value1} s@{CustomRoll2Value2} m?{Modifiers|0} b@{BPCheckbox} c"@{name} " t"@{CustomRoll2Name} "'></button>
                 </div>
             </fieldset>
         </div>
+
         <table style="width:834px" class="sheet-auto-style8">
             <tr>
                 <td class="auto-style3" colspan="6" style="height: 24px" valign="middle">
@@ -2626,32 +2755,32 @@
                 </td>
             </tr>
         </table>
-<!--Non-scripted Custom Roll-->
-		<h2 class="auto-style1 sheet-header">No-Script ROLLS</h2>
-                </td>
-            </tr>
+        <!--Non-scripted Custom Roll-->
+        <h2 class="auto-style1 sheet-header">NO API SCRIPT CUSTOM ROLLS</h2>
+        </td>
+        </tr>
 
-            <!--Separator-->
-            <tr>
-                <td colspan="6">
-                    <hr class="sheet-auto-style2 sheet-thick-divide" noshade="noshade">
-                </td>
-            </tr>
-            <tr>
-                <td colspan="6">
-                    <div style="text-align: left">
-                        <h3 style="display:inline-block; width:200px; margin:0 0 2px 0;">Name</h3>
-                        <h3 style="display:inline-block; width:110px; margin: 0 5px 0 5px;">Trait 1</h3>
-                        <h3 style="display:inline-block; width:110px; margin: 0 10px 0 0;">Trait 2</h3>
-                        <h3 style="display:inline-block; width:70px">Hunger</h3>
-                        <h3 style="display:inline-block; width:120px; margin: 0 0 0 5px;">Blood Potency</h3>
-                    </div>
-                </td>
-            </tr>
+        <!--Separator-->
+        <tr>
+            <td colspan="6">
+                <hr class="sheet-auto-style2 sheet-thick-divide" noshade="noshade">
+            </td>
+        </tr>
+        <tr>
+            <td colspan="6">
+                <div style="text-align: left">
+                    <h3 style="display:inline-block; width:200px; margin:0 0 2px 0;">Name</h3>
+                    <h3 style="display:inline-block; width:110px; margin: 0 5px 0 5px;">Trait 1</h3>
+                    <h3 style="display:inline-block; width:110px; margin: 0 10px 0 0;">Trait 2</h3>
+                    <h3 style="display:inline-block; width:70px">Hunger</h3>
+                    <h3 style="display:inline-block; width:120px; margin: 0 0 0 5px;">Blood Potency</h3>
+                </div>
+            </td>
+        </tr>
         </table>
 
         <div style="width:834px" class="sheet-auto-style8">
-            <fieldset class="repeating_customroll1">
+            <fieldset class="repeating_customroll3">
                 <div style="text-align: left">
                     <input type="text" name="attr_CustomRoll3Name" style="width:200px; margin:0 0 2px 0; display:inline-block" />
                     <select name="attr_CR3Att" style="width:110px; margin: 0 5px 0 5px; display:inline-block">
@@ -2706,8 +2835,50 @@
                         <option value="@{Technology}" data-i18n="technology-u">Technology</option>
                     </select>
                     <input type="checkbox" style="display:inline-block; width:70px" name="attr_HungerCheckbox" value="@{Hunger}" checked />
-                    <input type="checkbox" style="display:inline-block; width:120px" name="attr_BPCheckbox" value="@{BloodPotency}" />
-                    <button type='roll' style="display:inline-block; vertical-align: middle;" name='roll_DProll' value="Rolls some dice: [[[[@{CR3Att}+@{CR3Abi}+@{BPCheckbox}-@{Hunger}]]d10>6]]. Hunger Result: [[[[@{HungerCheckbox}]]d10>6]]." ></button>
+                    <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}]]d10>6]]}} {{HungerSuccesses=[[ [[@{HungerCheckbox}]]d10>6]]}} {{NormalDice=[[@{CR3Att} + @{CR3Abi} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox}]]}} {{HungerDice=[[@{HungerCheckbox}]]}}"
+                        name="roll_custom1InlineDice"></button>
+                </div>
+            </fieldset>
+        </div>
+
+        <table style="width:834px" class="sheet-auto-style8">
+            <tr>
+                <td class="auto-style3" colspan="6" style="height: 24px" valign="middle">
+                    <hr class="auto-style2 sheet-thin-divide">
+                </td>
+            </tr>
+            <tr>
+                <td colspan="6">
+                    <div style="text-align: left">
+                        <h3 style="display:inline-block; width:200px; margin:0 0 2px 0;">Name</h3>
+                        <h3 style="display:inline-block; width:110px; margin: 0 0 0 5px;">Trait 1</h3>
+                        <h3 style="display:inline-block; width:45px; margin: 0 10px 0 0;">Value</h3>
+                        <h3 style="display:inline-block; width:110px; margin: 0 0 0 0;">Trait 2</h3>
+                        <h3 style="display:inline-block; width:45px; margin: 0 5px 0 0;">Value</h3>
+                        <h3 style="display:inline-block; width:70px">Hunger</h3>
+                        <h3 style="display:inline-block; width:120px; margin: 0 0 0 5px;">Blood Potency</h3>
+                    </div>
+                </td>
+            </tr>
+        </table>
+
+        <div style="width:834px" class="sheet-auto-style8">
+            <fieldset class="repeating_customroll4">
+                <div style="text-align: left">
+                    <input type="text" name="attr_CustomRoll4Name" style="width:200px; margin:0 5px 2px 0; display:inline-block" />
+                    <input type="text" name="attr_CustomRoll4Trait1" style="width:110px; margin:0 0 2px 0; display:inline-block" />
+                    <input type="number" name="attr_CustomRoll4Value1" style="width:40px; margin:0 12px 2px 3px; display:inline-block;text-align: center;"
+                    />
+                    <input type="text" name="attr_CustomRoll4Trait2" style="width:110px; margin:0 0 2px 0; display:inline-block" />
+                    <input type="number" name="attr_CustomRoll4Value2" style="width:40px; margin:0 10px 2px 2px; display:inline-block;text-align: center;"
+                    />
+                    <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}]]d10>6 ]]}} {{HungerSuccesses=[[ [[@{HungerCheckbox}]]d10>6]]}} {{NormalDice=[[@{CustomRoll4Value1} + @{CustomRoll4Value2} + @{BPCheckbox} + ?{Modifier|0} - @{HungerCheckbox}]]}} {{HungerDice=[[@{HungerCheckbox}]]}}"
+                        name="roll_custom2InlineDice"></button>
                 </div>
             </fieldset>
         </div>
@@ -2749,7 +2920,7 @@
                     Kudos to: Andreas J. (UserID: 1223200), Matt Zaldivar, Brian Shields, Benjamin Bandelow and espcially to Konrad J. (UserID:
                     77736), who's Hero Quest Dice Roller has been invaluable. Special thanks to Beta testers Chros G.(326614)
                     and Jordan L.(46186). Many thanks to BigWhoop (UserID: 2124413) for his work on the first version of
-                    Obi's sheet.
+                    Obi's sheet. Massive thanks to Barry Snyder for helping us with API-to-Non-API Toggling through explination and use of his code examples.
                 </td>
             </tr>
             <tr>
@@ -2757,11 +2928,12 @@
                     &nbsp;</td>
             </tr>
             <tr>
-                <td colspan="6" class="auto-style1" style="text-align: center">A very special thank to https://game-icons.net The below icons were used and are licensed under a Creative
-                    Commons Attribution 3.0 Unported License. Water fountain icon - by Delapouite under CC BY 3.0 Oppression
-                    icon - by Lorc under CC BY 3.0 Prayer icon - by Lorc under CC BY 3.0 Ent Mouth icon - by Lorc under CC
-                    BY 3.0 Spatter icon - by Lorc under CC BY 3.0 Wolverine claws icon - by Lorc under CC BY 3.0 Half heart
-                    icon - by Lorc under CC BY 3.0 Embraced energy iconby Lorc under CC BY 3.0</td>
+                <td colspan="6" class="auto-style1" style="text-align: center">A very special thank to https://game-icons.net
+                    The below icons were used and are licensed under a Creative Commons Attribution 3.0 Unported License.
+                    Water fountain icon - by Delapouite under CC BY 3.0 Oppression icon - by Lorc under CC BY 3.0 Prayer
+                    icon - by Lorc under CC BY 3.0 Ent Mouth icon - by Lorc under CC BY 3.0 Spatter icon - by Lorc under
+                    CC BY 3.0 Wolverine claws icon - by Lorc under CC BY 3.0 Half heart icon - by Lorc under CC BY 3.0 Embraced
+                    energy iconby Lorc under CC BY 3.0</td>
             </tr>
 
             <tr>
@@ -2834,7 +3006,22 @@
                 <tr>
                     <td class="attr" style="padding-bottom: 8px;">{{Normal}}</td>
                 </tr>
-                {{/Normal}} {{#Hunger}}
+                {{/Normal}} {{#NormalSuccesses}}
+                <tr>
+                    <td class="attr">Normal Successes</td>
+                </tr>
+                {{#NormalDice}}
+                <tr>
+                    <td class="attr">(Dice rolled: {{NormalDice}})</td>
+                </tr>
+                {{/NormalDice}}
+                <td style="height: 2px; text-align: center; width: 200px" valign="middle">
+                    <hr style="border-top:1px solid rgb(112, 0, 0);" noshade>
+                </td>
+                <tr>
+                    <td class="attr" style="padding-bottom: 8px;font-size: 24px;">{{NormalSuccesses}}</td>
+                </tr>
+                {{/NormalSuccesses}}{{#Hunger}}
                 <tr>
                     <td class="attr">Hunger</td>
                 </tr>
@@ -2844,7 +3031,22 @@
                 <tr>
                     <td class="attr" style="padding-bottom: 8px;">{{Hunger}}</td>
                 </tr>
-                {{/Hunger}} {{#Successes}}
+                {{/Hunger}} {{#HungerSuccesses}}
+                <tr>
+                    <td class="attr">Hunger Successes</td>
+                </tr>
+                {{#HungerDice}}
+                <tr>
+                    <td class="attr">(Dice rolled: {{HungerDice}})</td>
+                </tr>
+                {{/HungerDice}}
+                <td style="height: 2px; text-align: center; width: 200px" valign="middle">
+                    <hr style="border-top:1px solid rgb(112, 0, 0);" noshade>
+                </td>
+                <tr>
+                    <td class="attr" style="font-size: 24px;">{{HungerSuccesses}}</td>
+                </tr>
+                {{/HungerSuccesses}}{{#Successes}}
                 <tr>
                     <td class="attr">Successes</td>
                 </tr>