diff --git a/Pathfinder-Neceros/pathfinder-neceros.html b/Pathfinder-Neceros/pathfinder-neceros.html
index 74618e350d..45c164304b 100644
--- a/Pathfinder-Neceros/pathfinder-neceros.html
+++ b/Pathfinder-Neceros/pathfinder-neceros.html
@@ -92,7 +92,7 @@
 						<span class="sheet-table-header">Temp</span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-data-center"><button title="STRCheck" type="roll" name="roll_STRCheck" value="STR Check: [[1d20 + @{STR-mod}]]"></button></span>
+						<span class="sheet-table-data-center"><button title="STRCheck" type="roll" name="roll_STRCheck" value="@{character_name}'s STR Check: [[1d20 + @{STR-mod}]]"></button></span>
 						<span class="sheet-table-row-name">STR</span>
 						<span class="sheet-table-data-center"><input title="STR" type="number" name="attr_STR" value="(@{STR-base} + @{STR-enhance} + @{STR-misc} + @{STR-temp})" disabled></span>
 						<span class="sheet-table-data-center"><input title="STR-mod" type="number" name="attr_STR-mod" value="(floor((@{STR}) / 2) - 5)" disabled></span>
@@ -102,7 +102,7 @@
 						<span class="sheet-table-data-center"><input title="STR-temp" type="number" name="attr_STR-temp" value="0"></span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-data-center"><button title="DEXCheck" type="roll" name="roll_DEXCheck" value="DEX Check: [[1d20 + @{DEX-mod}]]"></button></span>
+						<span class="sheet-table-data-center"><button title="DEXCheck" type="roll" name="roll_DEXCheck" value="@{character_name}'s DEX Check: [[1d20 + @{DEX-mod}]]"></button></span>
 						<span class="sheet-table-row-name">DEX</span>
 						<span class="sheet-table-data-center"><input title="DEX" type="number" name="attr_DEX" value="(@{DEX-base} + @{DEX-enhance} + @{DEX-misc} + @{DEX-temp})" disabled></span>
 						<span class="sheet-table-data-center"><input title="DEX-mod" type="number" name="attr_DEX-mod" value="(floor((@{DEX}) / 2) - 5)" disabled></span>
@@ -112,7 +112,7 @@
 						<span class="sheet-table-data-center"><input title="DEX-temp" type="number" name="attr_DEX-temp" value="0"></span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-data-center"><button title="CONCheck" type="roll" name="roll_CONCheck" value="CON Check: [[1d20 + @{CON-mod}]]"></button></span>
+						<span class="sheet-table-data-center"><button title="CONCheck" type="roll" name="roll_CONCheck" value="@{character_name}'s CON Check: [[1d20 + @{CON-mod}]]"></button></span>
 						<span class="sheet-table-row-name">CON</span>
 						<span class="sheet-table-data-center"><input title="CON" type="number" name="attr_CON" value="(@{CON-base} + @{CON-enhance} + @{CON-misc} + @{CON-temp})" disabled></span>
 						<span class="sheet-table-data-center"><input title="CON-mod" type="number" name="attr_CON-mod" value="(floor((@{CON}) / 2) - 5)" disabled></span>
@@ -122,7 +122,7 @@
 						<span class="sheet-table-data-center"><input title="CON-temp" type="number" name="attr_CON-temp" value="0"></span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-data-center"><button title="INTCheck" type="roll" name="roll_INTCheck" value="INT Check: [[1d20 + @{INT-mod}]]"></button></span>
+						<span class="sheet-table-data-center"><button title="INTCheck" type="roll" name="roll_INTCheck" value="@{character_name}'s INT Check: [[1d20 + @{INT-mod}]]"></button></span>
 						<span class="sheet-table-row-name">INT</span>
 						<span class="sheet-table-data-center"><input title="INT" type="number" name="attr_INT" value="(@{INT-base} + @{INT-enhance} + @{INT-misc} + @{INT-temp})" disabled></span>
 						<span class="sheet-table-data-center"><input title="INT-mod" type="number" name="attr_INT-mod" value="(floor((@{INT}) / 2) - 5)" disabled></span>
@@ -132,7 +132,7 @@
 						<span class="sheet-table-data-center"><input title="INT-temp" type="number" name="attr_INT-temp" value="0"></span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-data-center"><button title="WISCheck" type="roll" name="roll_WISCheck" value="WIS Check: [[1d20 + @{WIS-mod}]]"></button></span>
+						<span class="sheet-table-data-center"><button title="WISCheck" type="roll" name="roll_WISCheck" value="@{character_name}'s WIS Check: [[1d20 + @{WIS-mod}]]"></button></span>
 						<span class="sheet-table-row-name">WIS</span>
 						<span class="sheet-table-data-center"><input title="WIS" type="number" name="attr_WIS" value="(@{WIS-base} + @{WIS-enhance} + @{WIS-misc} + @{WIS-temp})" disabled></span>
 						<span class="sheet-table-data-center"><input title="WIS-mod" type="number" name="attr_WIS-mod" value="(floor((@{WIS}) / 2) - 5)" disabled></span>
@@ -142,7 +142,7 @@
 						<span class="sheet-table-data-center"><input title="WIS-temp" type="number" name="attr_WIS-temp" value="0"></span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-data-center"><button title="CHACheck" type="roll" name="roll_CHACheck" value="CHA Check: [[1d20 + @{CHA-mod}]]"></button></span>
+						<span class="sheet-table-data-center"><button title="CHACheck" type="roll" name="roll_CHACheck" value="@{character_name}'s CHA Check: [[1d20 + @{CHA-mod}]]"></button></span>
 						<span class="sheet-table-row-name">CHA</span>
 						<span class="sheet-table-data-center"><input title="CHA" type="number" name="attr_CHA" value="(@{CHA-base} + @{CHA-enhance} + @{CHA-misc} + @{CHA-temp})" disabled></span>
 						<span class="sheet-table-data-center"><input title="CHA-mod" type="number" name="attr_CHA-mod" value="(floor((@{CHA}) / 2) - 5)" disabled></span>
@@ -1167,7 +1167,7 @@
 						<span class="sheet-table-header">Caster Lvl:</span>
 						<span class="sheet-table-data-left"><input title="spellclass-0-level" type="number" name="attr_spellclass-0-level" value="0"></span>
 						<span class="sheet-table-header">CL Check</span>
-						<span class="sheet-table-data-left"><button title="SpellClass0CLCheck" type="roll" name="roll_SpellClass0CLCheck" value="@{spellclass-0-name} caster level check: [[1d20 + @{spellclass-0-level}]]"></button></span>
+						<span class="sheet-table-data-left"><button title="SpellClass0CLCheck" type="roll" name="roll_SpellClass0CLCheck" value="@{character_name}'s @{spellclass-0-name} caster level check: [[1d20 + @{spellclass-0-level}]]"></button></span>
 					</div>
 					<div class="sheet-table">
 						<div class="sheet-table-row">
@@ -1292,7 +1292,7 @@
 						<span class="sheet-table-header">Caster Lvl:</span>
 						<span class="sheet-table-data-left"><input title="spellclass-1-level" type="number" name="attr_spellclass-1-level" value="0"></span>
 						<span class="sheet-table-header">CL Check</span>
-						<span class="sheet-table-data-left"><button title="SpellClass1CLCheck" type="roll" name="roll_SpellClass1CLCheck" value="@{spellclass-1-name} caster level check: [[1d20 + @{spellclass-1-level}]]"></button></span>
+						<span class="sheet-table-data-left"><button title="SpellClass1CLCheck" type="roll" name="roll_SpellClass1CLCheck" value="@{character_name}'s @{spellclass-1-name} caster level check: [[1d20 + @{spellclass-1-level}]]"></button></span>
 					</div>
 					<div class="sheet-table">
 						<div class="sheet-table-row">
@@ -1836,7 +1836,7 @@
 				<span class="sheet-table-header" style="text-align:left;"></span>
 			</div>
 			<div class="sheet-table-row">				
-				<span class="sheet-table-data-left" style="width:5%;"><button title="InitiativeRoll" type="roll" name="roll_InitiativeRoll" value="Initiative result: [[1d20 + @{init} &amp;{tracker}]]&#x00A;Initiative bonus: [[@{init}]]"></button></span>
+				<span class="sheet-table-data-left" style="width:5%;"><button title="NPC-InitiativeRoll" type="roll" name="roll_NPC-InitiativeRoll" value="/w gm @{character_name}'s Initiative result: [[1d20 + @{init} &amp;{tracker}]]&#x00A;Initiative bonus: [[@{init}]]"></button></span>
 				<span class="sheet-table-data-left" style="width:5%;"><b>Init</b></span>
 				<span class="sheet-table-data-left" style="width:5%;"><input type="number" title="init" name="attr_init" value="@{DEX-mod} + @{init-misc}" disabled/></span>
 				<span class="sheet-table-data-left" style="width:5%;"><input type="number" title="init-misc" name="attr_init-misc" value="0"/></span>
@@ -1918,15 +1918,15 @@
 				<span class="sheet-table-header" style="text-align:left;"></span>
 			</div>
 			<div class="sheet-table-row">	
-				<span class="sheet-table-data-left"><button title="FortSave" type="roll" name="roll_FortSave" value="Fort save: [[1d20 + @{Fort}]]"></button></span>
+				<span class="sheet-table-data-left"><button title="NPC-FortSave" type="roll" name="roll_NPC-FortSave" value="/w gm @{character_name}'s Fort save: [[1d20 + @{Fort}]]"></button></span>
 				<span class="sheet-table-data-left" ><b>Fort</b></span>
 				<span class="sheet-table-data-left"><input title="Fort" type="number" name="attr_Fort" value="(@{total-Fort} + @{CON-mod} + @{Fort-enhance} + @{Fort-misc} + @{Fort-temp})" disabled></span>
 				<span class="sheet-table-data-left"><input title="Fort-misc" type="number" name="attr_Fort-misc" value="0"></span>
-				<span class="sheet-table-data-left"><button title="RefSave" type="roll" name="roll_RefSave" value="Ref save: [[1d20 + @{Ref}]]"></button></span>
+				<span class="sheet-table-data-left"><button title="NPC-RefSave" type="roll" name="roll_NPC-RefSave" value="/w gm @{character_name}'s Ref save: [[1d20 + @{Ref}]]"></button></span>
 				<span class="sheet-table-data-left" ><b>Ref</b></span>
 				<span class="sheet-table-data-left"><input title="Ref" type="number" name="attr_Ref" value="(@{total-Ref} + @{DEX-mod} + @{Ref-enhance} + @{Ref-misc} + @{Ref-temp})" disabled></span>
 				<span class="sheet-table-data-left"><input title="Ref-misc" type="number" name="attr_Ref-misc" value="0"></span>
-				<span class="sheet-table-data-left"><button title="WillSave" type="roll" name="roll_WillSave" value="Will save: [[1d20 + @{Will}]]"></button></span>
+				<span class="sheet-table-data-left"><button title="NPC-WillSave" type="roll" name="roll_NPC-WillSave" value="/w gm @{character_name}'s Will save: [[1d20 + @{Will}]]"></button></span>
 				<span class="sheet-table-data-left" ><b>Will</b></span>
 				<span class="sheet-table-data-left"><input title="Will" type="number" name="attr_Will" value="(@{total-Will} + @{WIS-mod} + @{Will-enhance} + @{Will-misc} + @{Will-temp})" disabled></span>
 				<span class="sheet-table-data-left"><input title="Will-misc" type="number" name="attr_Will-misc" value="0"></span>
@@ -2013,7 +2013,7 @@
 		<input type="checkbox" class="sheet-npc-special-attacks-show" title="npc-special-attacks-show" name="attr_npc-special-attacks-show" value="1" checked/>
 		<textarea class="sheet-npc-special-attacks" title="npc-special-attacks" name="attr_npc-special-attacks">List all special combat actions here, in alphabetical order. Do not list feats.</textarea> 
 		<br>
-		<b>Spell-Like Abilities</b><button title="SpellClass0CLCheck" type="roll" name="roll_SpellClass0CLCheck" value="@{spellclass-0-name} caster level check: [[1d20 + @{spellclass-0-level}]]"></button> (CL
+		<b>Spell-Like Abilities</b><button title="NPC-SpellClass0CLCheck" type="roll" name="roll_NPC-SpellClass0CLCheck" value="/w gm @{character_name}'s @{spellclass-0-name} caster level check: [[1d20 + @{spellclass-0-level}]]"></button> (CL
 		<input title="spellclass-0-level" type="number" name="attr_spellclass-0-level" value="0">)
 		<input type="checkbox" class="sheet-npc-spell-like-abilities-show" title="npc-spell-like-abilities-show" name="attr_npc-spell-like-abilities-show" value="1" checked/>
 		<div class="sheet-npc-spell-like-abilities">
@@ -2043,7 +2043,7 @@
 				</span>
 			</fieldset>
 		</div>
-		<b>Spells</b><button title="SpellClass1CLCheck" type="roll" name="roll_SpellClass1CLCheck" value="@{spellclass-1-name} caster level check: [[1d20 + @{spellclass-1-level}]]"></button> (CL
+		<b>Spells</b><button title="NPC-SpellClass1CLCheck" type="roll" name="roll_NPC-SpellClass1CLCheck" value="/w gm @{character_name}'s @{spellclass-1-name} caster level check: [[1d20 + @{spellclass-1-level}]]"></button> (CL
 		<input title="spellclass-1-level" type="number" name="attr_spellclass-1-level" value="0">)
 		<input type="checkbox" class="sheet-npc-spells-show" title="npc-spells-show" name="attr_npc-spells-show" value="1" checked/>
 		<div class="sheet-npc-spells">
@@ -2099,22 +2099,22 @@
 	<input type="checkbox" class="sheet-npc-statistics-show" title="npc-statistics-show" name="attr_npc-statistics-show" value="1" checked/>
 	<hr/>
 	<div style="text-align:left;" class="sheet-npc-statistics">
-		<span class="sheet-table-data-center"><button title="STRCheck" type="roll" name="roll_STRCheck" value="STR Check: [[1d20 + @{STR-mod}]]"></button></span>
+		<span class="sheet-table-data-center"><button title="NPC-STRCheck" type="roll" name="roll_NPC-STRCheck" value="/w gm @{character_name}'s STR Check: [[1d20 + @{STR-mod}]]"></button></span>
 		<span class="sheet-table-data-left" ><b>Str</b></span> 
 		<span class="sheet-table-data-left"><input title="STR-base" type="number" name="attr_STR-base" value="10"></span> 
-		<span class="sheet-table-data-center"><button title="DEXCheck" type="roll" name="roll_DEXCheck" value="DEX Check: [[1d20 + @{DEX-mod}]]"></button></span>
+		<span class="sheet-table-data-center"><button title="NPC-DEXCheck" type="roll" name="roll_NPC-DEXCheck" value="/w gm @{character_name}'s DEX Check: [[1d20 + @{DEX-mod}]]"></button></span>
 		<span class="sheet-table-data-left" ><b>Dex</b></span>
 		<span class="sheet-table-data-left"><input title="DEX-base" type="number" name="attr_DEX-base" value="10"></span>  
-		<span class="sheet-table-data-center"><button title="CONCheck" type="roll" name="roll_CONCheck" value="CON Check: [[1d20 + @{CON-mod}]]"></button></span>
+		<span class="sheet-table-data-center"><button title="NPC-CONCheck" type="roll" name="roll_NPC-CONCheck" value="/w gm @{character_name}'s CON Check: [[1d20 + @{CON-mod}]]"></button></span>
 		<span class="sheet-table-data-left" ><b>Con</b></span>
 		<span class="sheet-table-data-left"><input title="CON-base" type="number" name="attr_CON-base" value="10"></span>  
-		<span class="sheet-table-data-center"><button title="INTCheck" type="roll" name="roll_INTCheck" value="INT Check: [[1d20 + @{INT-mod}]]"></button></span>
+		<span class="sheet-table-data-center"><button title="NPC-INTCheck" type="roll" name="roll_NPC-INTCheck" value="/w gm @{character_name}'s INT Check: [[1d20 + @{INT-mod}]]"></button></span>
 		<span class="sheet-table-data-left" ><b>Int</b></span>
 		<span class="sheet-table-data-left"><input title="INT-base" type="number" name="attr_INT-base" value="10"></span>  
-		<span class="sheet-table-data-center"><button title="WISCheck" type="roll" name="roll_WISCheck" value="WIS Check: [[1d20 + @{WIS-mod}]]"></button></span>
+		<span class="sheet-table-data-center"><button title="NPC-WISCheck" type="roll" name="roll_NPC-WISCheck" value="/w gm @{character_name}'s WIS Check: [[1d20 + @{WIS-mod}]]"></button></span>
 		<span class="sheet-table-data-left" ><b>Wis</b></span>
 		<span class="sheet-table-data-left"><input title="WIS-base" type="number" name="attr_WIS-base" value="10"></span>  
-		<span class="sheet-table-data-center"><button title="CHACheck" type="roll" name="roll_CHACheck" value="CHA Check: [[1d20 + @{CHA-mod}]]"></button></span>
+		<span class="sheet-table-data-center"><button title="NPC-CHACheck" type="roll" name="roll_NPC-CHACheck" value="/w gm @{character_name}'s CHA Check: [[1d20 + @{CHA-mod}]]"></button></span>
 		<span class="sheet-table-data-left" ><b>Cha</b></span>
 		<span class="sheet-table-data-left"><input title="CHA-base" type="number" name="attr_CHA-base" value="10"></span> 
 		<br>
@@ -2134,7 +2134,7 @@
 			<div class="sheet-table-row">
 				<span class="sheet-table-data-left" ><b>BAB</b></span>
 				<span class="sheet-table-data-left"><input title="class-0-bab" type="number" name="attr_class-0-bab" value="0"></span> 
-				<span class="sheet-table-data-left"><button type="roll" title="CMB-Check" name="roll_CMB-Check" value="@{character_name}'s CMB check&#x00A;[[1d20 + @{CMB}]] VS @{target|token_name}'s CMD"></button></span>
+				<span class="sheet-table-data-left"><button type="roll" title="NPC-CMB-Check" name="roll_NPC-CMB-Check" value="/w gm @{character_name}'s CMB check&#x00A;[[1d20 + @{CMB}]] VS @{target|token_name}'s CMD"></button></span>
 				<span class="sheet-table-data-left" ><b>CMB</b></span>
 				<span class="sheet-table-data-center"><input title="CMB" type="number" name="attr_CMB" value="(@{bab} + @{attk-CMB-ability} + @{attk-CMB-size} + @{attk-CMB-misc} + @{attk-CMB-temp})" disabled></span>
 				<span class="sheet-table-data-center"><input title="attk-CMB-misc" type="number" name="attr_attk-CMB-misc" value="0"></span>
@@ -2196,175 +2196,175 @@
 				<span class="sheet-table-header">Misc</span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button title="AcrobaticsCheck" type="roll" value="@{character_name}'s Acrobatics check: [[1d20 + @{Acrobatics}]]" name="roll_AcrobaticsCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-AcrobaticsCheck" type="roll" value="/w gm @{character_name}'s Acrobatics check: [[1d20 + @{Acrobatics}]]" name="roll_NPC-AcrobaticsCheck"></button></span>
 				<span class="sheet-table-data-left">Acrobatics</span>
 				<span class="sheet-table-data-center"><input title="Acrobatics" type="number" name="attr_Acrobatics" value="(@{Acrobatics-ranks} + @{DEX-mod} + @{Acrobatics-trained} + @{Acrobatics-misc} + @{acp})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Acrobatics-misc" type="number" name="attr_Acrobatics-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="AppraiseCheck" type="roll" value="@{character_name}'s Appraise check: [[1d20 + @{Appraise}]]" name="roll_AppraiseCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-AppraiseCheck" type="roll" value="/w gm @{character_name}'s Appraise check: [[1d20 + @{Appraise}]]" name="roll_NPC-AppraiseCheck"></button></span>
 				<span class="sheet-table-data-left">Appraise</span>
 				<span class="sheet-table-data-center"><input title="Appraise" type="number" name="attr_Appraise" value="(@{Appraise-ranks} + @{INT-mod} + @{Appraise-trained} + @{Appraise-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Appraise-misc" type="number" name="attr_Appraise-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="BluffCheck" type="roll" value="@{character_name}'s Bluff check: [[1d20 + @{Bluff}]]" name="roll_BluffCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-BluffCheck" type="roll" value="/w gm @{character_name}'s Bluff check: [[1d20 + @{Bluff}]]" name="roll_NPC-BluffCheck"></button></span>
 				<span class="sheet-table-data-left">Bluff</span>
 				<span class="sheet-table-data-center"><input title="Bluff" type="number" name="attr_Bluff" value="(@{Bluff-ranks} + @{CHA-mod} + @{Bluff-trained} + @{Bluff-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Bluff-misc" type="number" name="attr_Bluff-misc" value="0"></span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button title="ClimbCheck" type="roll" value="@{character_name}'s Climb check: [[1d20 + @{Climb}]]" name="roll_ClimbCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-ClimbCheck" type="roll" value="/w gm @{character_name}'s Climb check: [[1d20 + @{Climb}]]" name="roll_NPC-ClimbCheck"></button></span>
 				<span class="sheet-table-data-left">Climb</span>
 				<span class="sheet-table-data-center"><input title="Climb" type="number" name="attr_Climb" value="(@{Climb-ranks} + @{STR-mod} + @{Climb-trained} + @{Climb-misc} + @{acp})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Climb-misc" type="number" name="attr_Climb-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="CraftCheck" type="roll" value="@{character_name}'s Craft check: [[1d20 + @{Craft}]]" name="roll_CraftCheck"></button></span>
-				<span class="sheet-table-data-left">Craft: <input title="Craft-name" type="text" name="attr_Craft-name"></span>
+				<span class="sheet-table-data-center"><button title="NPC-CraftCheck" type="roll" value="/w gm @{character_name}'s Craft check: [[1d20 + @{Craft}]]" name="roll_NPC-CraftCheck"></button></span>
+				<span class="sheet-table-data-left">Craft:<input title="Craft-name" type="text" name="attr_Craft-name"></span>
 				<span class="sheet-table-data-center"><input title="Craft" type="number" name="attr_Craft" value="(@{Craft-ranks} + @{INT-mod} + @{Craft-trained} + @{Craft-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Craft-misc" type="number" name="attr_Craft-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="DiplomacyCheck" type="roll" value="@{character_name}'s Diplomacy check: [[1d20 + @{Diplomacy}]]" name="roll_DiplomacyCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-DiplomacyCheck" type="roll" value="/w gm @{character_name}'s Diplomacy check: [[1d20 + @{Diplomacy}]]" name="roll_NPC-DiplomacyCheck"></button></span>
 				<span class="sheet-table-data-left">Diplomacy</span>
 				<span class="sheet-table-data-center"><input title="Diplomacy" type="number" name="attr_Diplomacy" value="(@{Diplomacy-ranks} + @{CHA-mod} + @{Diplomacy-trained} + @{Diplomacy-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Diplomacy-misc" type="number" name="attr_Diplomacy-misc" value="0"></span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button title="Disable-DeviceCheck" type="roll" value="@{character_name}'s Disable Device check: [[1d20 + @{Disable-Device}]]" name="roll_Disable-DeviceCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-Disable-DeviceCheck" type="roll" value="/w gm @{character_name}'s Disable Device check: [[1d20 + @{Disable-Device}]]" name="roll_NPC-Disable-DeviceCheck"></button></span>
 				<span class="sheet-table-data-left">Disable Device</span>
 				<span class="sheet-table-data-center"><input title="Disable-Device" type="number" name="attr_Disable-Device" value="(@{Disable-Device-ranks} + @{DEX-mod} + @{Disable-Device-trained} + @{Disable-Device-misc} + @{acp})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Disable-Device-misc" type="number" name="attr_Disable-Device-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="DisguiseCheck" type="roll" value="@{character_name}'s Disguise check: [[1d20 + @{Disguise}]]" name="roll_DisguiseCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-DisguiseCheck" type="roll" value="/w gm @{character_name}'s Disguise check: [[1d20 + @{Disguise}]]" name="roll_NPC-DisguiseCheck"></button></span>
 				<span class="sheet-table-data-left">Disguise</span>
 				<span class="sheet-table-data-center"><input title="Disguise" type="number" name="attr_Disguise" value="(@{Disguise-ranks} + @{CHA-mod} + @{Disguise-trained} + @{Disguise-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Disguise-misc" type="number" name="attr_Disguise-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="Escape-ArtistCheck" type="roll" value="@{character_name}'s Escape Artist check: [[1d20 + @{Escape-Artist}]]" name="roll_Escape-ArtistCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-Escape-ArtistCheck" type="roll" value="/w gm @{character_name}'s Escape Artist check: [[1d20 + @{Escape-Artist}]]" name="roll_NPC-Escape-ArtistCheck"></button></span>
 				<span class="sheet-table-data-left">Escape Artist</span>
 				<span class="sheet-table-data-center"><input title="Escape-Artist" type="number" name="attr_Escape-Artist" value="(@{Escape-Artist-ranks} + @{DEX-mod} + @{Escape-Artist-trained} + @{Escape-Artist-misc} + @{acp})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Escape-Artist-misc" type="number" name="attr_Escape-Artist-misc" value="0"></span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button title="FlyCheck" type="roll" value="@{character_name}'s Fly check: [[1d20 + @{Fly}]]" name="roll_FlyCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-FlyCheck" type="roll" value="/w gm @{character_name}'s Fly check: [[1d20 + @{Fly}]]" name="roll_NPC-FlyCheck"></button></span>
 				<span class="sheet-table-data-left">Fly</span>
 				<span class="sheet-table-data-center"><input title="Fly" type="number" name="attr_Fly" value="(@{Fly-ranks} + @{DEX-mod} + @{Fly-trained} + @{Fly-misc} + @{acp})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Fly-misc" type="number" name="attr_Fly-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="Handle-AnimalCheck" type="roll" value="@{character_name}'s Handle Animal check: [[1d20 + @{Handle-Animal}]]" name="roll_Handle-AnimalCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-Handle-AnimalCheck" type="roll" value="/w gm @{character_name}'s Handle Animal check: [[1d20 + @{Handle-Animal}]]" name="roll_NPC-Handle-AnimalCheck"></button></span>
 				<span class="sheet-table-data-left">Handle Animal</span>
 				<span class="sheet-table-data-center"><input title="Handle-Animal" type="number" name="attr_Handle-Animal" value="(@{Handle-Animal-ranks} + @{CHA-mod} + @{Handle-Animal-trained} + @{Handle-Animal-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Handle-Animal-misc" type="number" name="attr_Handle-Animal-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="HealCheck" type="roll" value="@{character_name}'s Heal check: [[1d20 + @{Heal}]]" name="roll_HealCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-HealCheck" type="roll" value="/w gm @{character_name}'s Heal check: [[1d20 + @{Heal}]]" name="roll_NPC-HealCheck"></button></span>
 				<span class="sheet-table-data-left">Heal</span>
 				<span class="sheet-table-data-center"><input title="Heal" type="number" name="attr_Heal" value="(@{Heal-ranks} + @{WIS-mod} + @{Heal-trained} + @{Heal-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Heal-misc" type="number" name="attr_Heal-misc" value="0"></span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button title="IntimidateCheck" type="roll" value="@{character_name}'s Intimidate check: [[1d20 + @{Intimidate}]]" name="roll_IntimidateCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-IntimidateCheck" type="roll" value="/w gm @{character_name}'s Intimidate check: [[1d20 + @{Intimidate}]]" name="roll_NPC-IntimidateCheck"></button></span>
 				<span class="sheet-table-data-left">Intimidate</span>
 				<span class="sheet-table-data-center"><input title="Intimidate" type="number" name="attr_Intimidate" value="(@{Intimidate-ranks} + @{CHA-mod} + @{Intimidate-trained} + @{Intimidate-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Intimidate-misc" type="number" name="attr_Intimidate-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="Knowledge-ArcanaCheck" type="roll" value="@{character_name}'s Knowledge (Arcana) check: [[1d20 + @{Knowledge-Arcana}]]" name="roll_Knowledge-ArcanaCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-Knowledge-ArcanaCheck" type="roll" value="/w gm @{character_name}'s Knowledge (Arcana) check: [[1d20 + @{Knowledge-Arcana}]]" name="roll_NPC-Knowledge-ArcanaCheck"></button></span>
 				<span class="sheet-table-data-left">Knowledge (Arcana)</span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Arcana" type="number" name="attr_Knowledge-Arcana" value="(@{Knowledge-Arcana-ranks} + @{INT-mod} + @{Knowledge-Arcana-trained} + @{Knowledge-Arcana-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Arcana-misc" type="number" name="attr_Knowledge-Arcana-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="Knowledge-DungeoneeringCheck" type="roll" value="@{character_name}'s Knowledge (Dungeoneering) check: [[1d20 + @{Knowledge-Dungeoneering}]]" name="roll_Knowledge-DungeoneeringCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-Knowledge-DungeoneeringCheck" type="roll" value="/w gm @{character_name}'s Knowledge (Dungeoneering) check: [[1d20 + @{Knowledge-Dungeoneering}]]" name="roll_NPC-Knowledge-DungeoneeringCheck"></button></span>
 				<span class="sheet-table-data-left">Knowledge (Dungeoneering)</span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Dungeoneering" type="number" name="attr_Knowledge-Dungeoneering" value="(@{Knowledge-Dungeoneering-ranks} + @{INT-mod} + @{Knowledge-Dungeoneering-trained} + @{Knowledge-Dungeoneering-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Dungeoneering-misc" type="number" name="attr_Knowledge-Dungeoneering-misc" value="0"></span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button title="Knowledge-EngineeringCheck" type="roll" value="@{character_name}'s Knowledge (Engineering) check: [[1d20 + @{Knowledge-Engineering}]]" name="roll_Knowledge-EngineeringCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-Knowledge-EngineeringCheck" type="roll" value="/w gm @{character_name}'s Knowledge (Engineering) check: [[1d20 + @{Knowledge-Engineering}]]" name="roll_NPC-Knowledge-EngineeringCheck"></button></span>
 				<span class="sheet-table-data-left">Knowledge (Engineering)</span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Engineering" type="number" name="attr_Knowledge-Engineering" value="(@{Knowledge-Engineering-ranks} + @{INT-mod} + @{Knowledge-Engineering-trained} + @{Knowledge-Engineering-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Engineering-misc" type="number" name="attr_Knowledge-Engineering-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="Knowledge-GeographyCheck" type="roll" value="@{character_name}'s Knowledge (Geography) check: [[1d20 + @{Knowledge-Geography}]]" name="roll_Knowledge-GeographyCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-Knowledge-GeographyCheck" type="roll" value="/w gm @{character_name}'s Knowledge (Geography) check: [[1d20 + @{Knowledge-Geography}]]" name="roll_NPC-Knowledge-GeographyCheck"></button></span>
 				<span class="sheet-table-data-left">Knowledge (Geography)</span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Geography" type="number" name="attr_Knowledge-Geography" value="(@{Knowledge-Geography-ranks} + @{INT-mod} + @{Knowledge-Geography-trained} + @{Knowledge-Geography-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Geography-misc" type="number" name="attr_Knowledge-Geography-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="Knowledge-HistoryCheck" type="roll" value="@{character_name}'s Knowledge (History) check: [[1d20 + @{Knowledge-History}]]" name="roll_Knowledge-HistoryCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-Knowledge-HistoryCheck" type="roll" value="/w gm @{character_name}'s Knowledge (History) check: [[1d20 + @{Knowledge-History}]]" name="roll_NPC-Knowledge-HistoryCheck"></button></span>
 				<span class="sheet-table-data-left">Knowledge (History)</span>
 				<span class="sheet-table-data-center"><input title="Knowledge-History" type="number" name="attr_Knowledge-History" value="(@{Knowledge-History-ranks} + @{INT-mod} + @{Knowledge-History-trained} + @{Knowledge-History-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Knowledge-History-misc" type="number" name="attr_Knowledge-History-misc" value="0"></span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button title="Knowledge-LocalCheck" type="roll" value="@{character_name}'s Knowledge (Local) check: [[1d20 + @{Knowledge-Local}]]" name="roll_Knowledge-LocalCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-Knowledge-LocalCheck" type="roll" value="/w gm @{character_name}'s Knowledge (Local) check: [[1d20 + @{Knowledge-Local}]]" name="roll_NPC-Knowledge-LocalCheck"></button></span>
 				<span class="sheet-table-data-left">Knowledge (Local)</span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Local" type="number" name="attr_Knowledge-Local" value="(@{Knowledge-Local-ranks} + @{INT-mod} + @{Knowledge-Local-trained} + @{Knowledge-Local-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Local-misc" type="number" name="attr_Knowledge-Local-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="Knowledge-NatureCheck" type="roll" value="@{character_name}'s Knowledge (Nature) check: [[1d20 + @{Knowledge-Nature}]]" name="roll_Knowledge-NatureCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-Knowledge-NatureCheck" type="roll" value="/w gm @{character_name}'s Knowledge (Nature) check: [[1d20 + @{Knowledge-Nature}]]" name="roll_NPC-Knowledge-NatureCheck"></button></span>
 				<span class="sheet-table-data-left">Knowledge (Nature)</span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Nature" type="number" name="attr_Knowledge-Nature" value="(@{Knowledge-Nature-ranks} + @{INT-mod} + @{Knowledge-Nature-trained} + @{Knowledge-Nature-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Nature-misc" type="number" name="attr_Knowledge-Nature-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="Knowledge-NobilityCheck" type="roll" value="@{character_name}'s Knowledge (Nobility) check: [[1d20 + @{Knowledge-Nobility}]]" name="roll_Knowledge-NobilityCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-Knowledge-NobilityCheck" type="roll" value="/w gm @{character_name}'s Knowledge (Nobility) check: [[1d20 + @{Knowledge-Nobility}]]" name="roll_NPC-Knowledge-NobilityCheck"></button></span>
 				<span class="sheet-table-data-left">Knowledge (Nobility)</span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Nobility" type="number" name="attr_Knowledge-Nobility" value="(@{Knowledge-Nobility-ranks} + @{INT-mod} + @{Knowledge-Nobility-trained} + @{Knowledge-Nobility-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Nobility-misc" type="number" name="attr_Knowledge-Nobility-misc" value="0"></span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button title="Knowledge-PlanesCheck" type="roll" value="@{character_name}'s Knowledge (Planes) check: [[1d20 + @{Knowledge-Planes}]]" name="roll_Knowledge-PlanesCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-Knowledge-PlanesCheck" type="roll" value="/w gm @{character_name}'s Knowledge (Planes) check: [[1d20 + @{Knowledge-Planes}]]" name="roll_NPC-Knowledge-PlanesCheck"></button></span>
 				<span class="sheet-table-data-left">Knowledge (Planes)</span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Planes" type="number" name="attr_Knowledge-Planes" value="(@{Knowledge-Planes-ranks} + @{INT-mod} + @{Knowledge-Planes-trained} + @{Knowledge-Planes-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Planes-misc" type="number" name="attr_Knowledge-Planes-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="Knowledge-ReligionCheck" type="roll" value="@{character_name}'s Knowledge (Religion) check: [[1d20 + @{Knowledge-Religion}]]" name="roll_Knowledge-ReligionCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-Knowledge-ReligionCheck" type="roll" value="/w gm @{character_name}'s Knowledge (Religion) check: [[1d20 + @{Knowledge-Religion}]]" name="roll_NPC-Knowledge-ReligionCheck"></button></span>
 				<span class="sheet-table-data-left">Knowledge (Religion)</span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Religion" type="number" name="attr_Knowledge-Religion" value="(@{Knowledge-Religion-ranks} + @{INT-mod} + @{Knowledge-Religion-trained} + @{Knowledge-Religion-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Knowledge-Religion-misc" type="number" name="attr_Knowledge-Religion-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="LinguisticsCheck" type="roll" value="@{character_name}'s Linguistics check: [[1d20 + @{Linguistics}]]" name="roll_LinguisticsCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-LinguisticsCheck" type="roll" value="/w gm @{character_name}'s Linguistics check: [[1d20 + @{Linguistics}]]" name="roll_NPC-LinguisticsCheck"></button></span>
 				<span class="sheet-table-data-left">Linguistics</span>
 				<span class="sheet-table-data-center"><input title="Linguistics" type="number" name="attr_Linguistics" value="(@{Linguistics-ranks} + @{INT-mod} + @{Linguistics-trained} + @{Linguistics-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Linguistics-misc" type="number" name="attr_Linguistics-misc" value="0"></span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button title="PerceptionCheck" type="roll" value="@{character_name}'s Perception check: [[1d20 + @{Perception}]]" name="roll_PerceptionCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-PerceptionCheck" type="roll" value="/w gm @{character_name}'s Perception check: [[1d20 + @{Perception}]]" name="roll_NPC-PerceptionCheck"></button></span>
 				<span class="sheet-table-data-left">Perception</span>
 				<span class="sheet-table-data-center"><input title="Perception" type="number" name="attr_Perception" value="(@{Perception-ranks} + @{WIS-mod} + @{Perception-trained} + @{Perception-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Perception-misc" type="number" name="attr_Perception-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="PerformCheck" type="roll" value="@{character_name}'s Perform check: [[1d20 + @{Perform}]]" name="roll_PerformCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-PerformCheck" type="roll" value="/w gm @{character_name}'s Perform check: [[1d20 + @{Perform}]]" name="roll_NPC-PerformCheck"></button></span>
 				<span class="sheet-table-data-left">Perform:<input title="Perform-name" type="text" name="attr_Perform-name"></span>
 				<span class="sheet-table-data-center"><input title="Perform" type="number" name="attr_Perform" value="(@{Perform-ranks} + @{CHA-mod} + @{Perform-trained} + @{Perform-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Perform-misc" type="number" name="attr_Perform-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="ProfessionCheck" type="roll" value="@{character_name}'s Profession check: [[1d20 + @{Profession}]]" name="roll_ProfessionCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-ProfessionCheck" type="roll" value="/w gm @{character_name}'s Profession check: [[1d20 + @{Profession}]]" name="roll_NPC-ProfessionCheck"></button></span>
 				<span class="sheet-table-data-left">Profession:<input title="Profession-name" type="text" name="attr_Profession-name"></span>
 				<span class="sheet-table-data-center"><input title="Profession" type="number" name="attr_Profession" value="(@{Profession-ranks} + @{WIS-mod} + @{Profession-trained} + @{Profession-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Profession-misc" type="number" name="attr_Profession-misc" value="0"></span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button title="RideCheck" type="roll" value="@{character_name}'s Ride check: [[1d20 + @{Ride}]]" name="roll_RideCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-RideCheck" type="roll" value="/w gm @{character_name}'s Ride check: [[1d20 + @{Ride}]]" name="roll_NPC-RideCheck"></button></span>
 				<span class="sheet-table-data-left">Ride</span>
 				<span class="sheet-table-data-center"><input title="Ride" type="number" name="attr_Ride" value="(@{Ride-ranks} + @{DEX-mod} + @{Ride-trained} + @{Ride-misc} + @{acp})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Ride-misc" type="number" name="attr_Ride-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="Sense-MotiveCheck" type="roll" value="@{character_name}'s Sense-Motive check: [[1d20 + @{Sense-Motive}]]" name="roll_Sense-MotiveCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-Sense-MotiveCheck" type="roll" value="/w gm @{character_name}'s Sense-Motive check: [[1d20 + @{Sense-Motive}]]" name="roll_NPC-Sense-MotiveCheck"></button></span>
 				<span class="sheet-table-data-left">Sense Motive</span>
 				<span class="sheet-table-data-center"><input title="Sense-Motive" type="number" name="attr_Sense-Motive" value="(@{Sense-Motive-ranks} + @{WIS-mod} + @{Sense-Motive-trained} + @{Sense-Motive-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Sense-Motive-misc" type="number" name="attr_Sense-Motive-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="Sleight-of-HandCheck" type="roll" value="@{character_name}'s Sleight of Hand check: [[1d20 + @{Sleight-of-Hand}]]" name="roll_Sleight-of-HandCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-Sleight-of-HandCheck" type="roll" value="/w gm @{character_name}'s Sleight of Hand check: [[1d20 + @{Sleight-of-Hand}]]" name="roll_NPC-Sleight-of-HandCheck"></button></span>
 				<span class="sheet-table-data-left">Sleight of Hand</span>
 				<span class="sheet-table-data-center"><input title="Sleight-of-Hand" type="number" name="attr_Sleight-of-Hand" value="(@{Sleight-of-Hand-ranks} + @{DEX-mod} + @{Sleight-of-Hand-trained} + @{Sleight-of-Hand-misc} + @{acp})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Sleight-of-Hand-misc" type="number" name="attr_Sleight-of-Hand-misc" value="0"></span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button title="SpellcraftCheck" type="roll" value="@{character_name}'s Spellcraft check: [[1d20 + @{Spellcraft}]]" name="roll_SpellcraftCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-SpellcraftCheck" type="roll" value="/w gm @{character_name}'s Spellcraft check: [[1d20 + @{Spellcraft}]]" name="roll_NPC-SpellcraftCheck"></button></span>
 				<span class="sheet-table-data-left">Spellcraft</span>
 				<span class="sheet-table-data-center"><input title="Spellcraft" type="number" name="attr_Spellcraft" value="(@{Spellcraft-ranks} + @{INT-mod} + @{Spellcraft-trained} + @{Spellcraft-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Spellcraft-misc" type="number" name="attr_Spellcraft-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="StealthCheck" type="roll" value="@{character_name}'s Stealth check: [[1d20 + @{Stealth}]]" name="roll_StealthCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-StealthCheck" type="roll" value="/w gm @{character_name}'s Stealth check: [[1d20 + @{Stealth}]]" name="roll_NPC-StealthCheck"></button></span>
 				<span class="sheet-table-data-left">Stealth</span>
 				<span class="sheet-table-data-center"><input title="Stealth" type="number" name="attr_Stealth" value="(@{Stealth-ranks} + @{DEX-mod} + @{Stealth-trained} + @{Stealth-misc} + @{acp})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Stealth-misc" type="number" name="attr_Stealth-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="SurvivalCheck" type="roll" value="@{character_name}'s Survival check: [[1d20 + @{Survival}]]" name="roll_SurvivalCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-SurvivalCheck" type="roll" value="/w gm @{character_name}'s Survival check: [[1d20 + @{Survival}]]" name="roll_NPC-SurvivalCheck"></button></span>
 				<span class="sheet-table-data-left">Survival</span>
 				<span class="sheet-table-data-center"><input title="Survival" type="number" name="attr_Survival" value="(@{Survival-ranks} + @{WIS-mod} + @{Survival-trained} + @{Survival-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Survival-misc" type="number" name="attr_Survival-misc" value="0"></span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button title="SwimCheck" type="roll" value="@{character_name}'s Swim check: [[1d20 + @{Swim}]]" name="roll_SwimCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-SwimCheck" type="roll" value="/w gm @{character_name}'s Swim check: [[1d20 + @{Swim}]]" name="roll_NPC-SwimCheck"></button></span>
 				<span class="sheet-table-data-left">Swim</span>
 				<span class="sheet-table-data-center"><input title="Swim" type="number" name="attr_Swim" value="(@{Swim-ranks} + @{STR-mod} + @{Swim-trained} + @{Swim-misc} + @{acp})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Swim-misc" type="number" name="attr_Swim-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="Use-Magic-DeviceCheck" type="roll" value="@{character_name}'s Use Magic Device check: [[1d20 + @{Use-Magic-Device}]]" name="roll_Use-Magic-DeviceCheck"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-Use-Magic-DeviceCheck" type="roll" value="/w gm @{character_name}'s Use Magic Device check: [[1d20 + @{Use-Magic-Device}]]" name="roll_NPC-Use-Magic-DeviceCheck"></button></span>
 				<span class="sheet-table-data-left">Use Magic Device</span>
 				<span class="sheet-table-data-center"><input title="Use-Magic-Device" type="number" name="attr_Use-Magic-Device" value="(@{Use-Magic-Device-ranks} + @{CHA-mod} + @{Use-Magic-Device-trained} + @{Use-Magic-Device-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Use-Magic-Device-misc" type="number" name="attr_Use-Magic-Device-misc" value="0"></span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button title="ConcentrationCheck-0" type="roll" value="@{character_name}'s Concentration check: [[1d20 + @{Concentration-0}]]" name="roll_ConcentrationCheck-0"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-ConcentrationCheck-0" type="roll" value="/w gm @{character_name}'s Concentration check: [[1d20 + @{Concentration-0}]]" name="roll_NPC-ConcentrationCheck-0"></button></span>
 				<span class="sheet-table-data-left">Concentration:<input title="spellclass-0-name" type="text" name="attr_spellclass-0-name"></span>
 				<span class="sheet-table-data-center"><input title="Concentration-0" type="number" name="attr_Concentration-0" value="(@{spellclass-0-level} + @{Concentration-0-ability} + @{Concentration-0-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Concentration-0-misc" type="number" name="attr_Concentration-0-misc" value="0"></span>
-				<span class="sheet-table-data-center"><button title="ConcentrationCheck-1" type="roll" value="@{character_name}'s Concentration check: [[1d20 + @{Concentration-1}]]" name="roll_ConcentrationCheck-1"></button></span>
+				<span class="sheet-table-data-center"><button title="NPC-ConcentrationCheck-1" type="roll" value="/w gm @{character_name}'s Concentration check: [[1d20 + @{Concentration-1}]]" name="roll_NPC-ConcentrationCheck-1"></button></span>
 				<span class="sheet-table-data-left">Concentration:<input title="spellclass-1-name" type="text" name="attr_spellclass-1-name"></span>
 				<span class="sheet-table-data-center"><input title="Concentration-1" type="number" name="attr_Concentration-1" value="(@{spellclass-1-level} + @{Concentration-1-ability} + @{Concentration-1-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Concentration-1-misc" type="number" name="attr_Concentration-1-misc" value="0"></span>