diff --git a/Pathfinder (Old)/pathfinder-old.css b/Pathfinder (Old)/pathfinder-old.css
index 4aa0997cef..9153c1d2bf 100644
--- a/Pathfinder (Old)/pathfinder-old.css	
+++ b/Pathfinder (Old)/pathfinder-old.css	
@@ -71,6 +71,12 @@ hr {
     width:100%;
 }
 
+.sheet-small-label {
+    font-size: 85%!important;
+    font-style: italic;
+    font-weight: bold;
+}
+
 .sheet-table-name {
     display:table-caption;
     text-align:center;
@@ -87,6 +93,11 @@ hr {
     vertical-align:bottom;
 }
 
+.sheet-table-data {
+    display:table-cell;
+    vertical-align:middle;
+}
+
 .sheet-table-data-left {
     display:table-cell;
     text-align:left;
@@ -111,6 +122,12 @@ hr {
     width:100%;
 }
 
+.sheet-table-row1 {
+    display:table-row;
+    vertical-align:bottom;
+    width:100%;    
+}
+
 .sheet-table-row-name {
     display:table-cell;
     text-align:center;
@@ -120,6 +137,24 @@ hr {
     font-weight:bold;
 }
 
+.sheet-table-row1-name {
+    display:table-cell;
+    text-align:center;
+    vertical-align:middle;
+    color:white;
+    background-color:black;
+    font-weight:bold;
+}
+
+.sheet-center {
+    text-align:center;
+}
+
+.sheet-label {
+    font-weight:bold;
+    text-align:center;
+}
+
 input[type="text"], select {
     width:100%;
     margin:0;
@@ -131,9 +166,9 @@ textarea {
 
 .sheet-text-button {
     font-size:100%;
-	color:white;
-	background-color:black;
-	border:0px;
+    color:white;
+    background-color:black;
+    border:0px;
 }
 
 button,
@@ -141,4 +176,222 @@ button:hover,
 button:active
 {
     background-image: none;
+}
+
+.sheet-rolltemplate-pf_check .sheet-wrapper {
+    background:url(http://i.imgur.com/BLb0XMU.jpg) top left repeat;
+}
+
+.sheet-rolltemplate-pf_check .sheet-border {
+	border-color: #7E2D40;
+	border-style: solid;
+	border-width: 1px;
+    border-top-width: 0px;
+    border-bottom-right-radius: 5px;
+    border-bottom-left-radius: 5px;
+}
+
+.sheet-rolltemplate-pf_check .sheet-header {
+	color: #7E2D40;
+    	padding: 2px 0px 2px 4px;
+	font-size: 1.2em;
+    font-weight: bold;
+	text-align: left;
+	font-family: "Times New Roman", Times, serif;
+    font-variant: small-caps;
+	letter-spacing: 1px;
+}
+
+.sheet-rolltemplate-pf_check .sheet-subheader {
+    color: #7E2D40;
+    	padding: 2px 10px 2px 10px;
+	font-size: 1em;
+	font-weight: bold;
+	text-align: left;
+	font-family: "Times New Roman", Times, serif;
+    font-variant: small-caps;
+	letter-spacing: 1px;
+}
+
+.sheet-rolltemplate-pf_check .sheet-header_background {
+    background-color: transparent;
+    border-color: #7E2D40;
+    border-style: solid;
+    border-width: 0px;
+    border-bottom-width: 3px;
+    border-right-width: 4px;
+    border-top-right-radius: 16px;
+    background-size: auto;
+}
+
+.sheet-rolltemplate-pf_check .sheet-subheader_background {
+    background-color: transparent;
+	text-align: center;
+    border-color: #7E2D40;
+    border-style: solid;
+    border-width: 0px;
+    border-right-width: 4px;
+	background-size: contain;
+}
+
+.sheet-rolltemplate-pf_check .sheet-tcat {
+	font-weight: bold;
+}
+ 
+.sheet-rolltemplate-pf_check .sheet-content {
+	padding: 1px 5px 1px 5px;
+	font-size: 0.9em;
+    text-align: center;
+}
+ 
+.sheet-rolltemplate-pf_check .inlinerollresult  {
+    	background-color: transparent;
+    	border: none;
+}
+ 
+.sheet-rolltemplate-pf_check .inlinerollresult.fullcrit {
+	color: #3FB315;
+    	border: none;
+}
+ 
+.sheet-rolltemplate-pf_check .inlinerollresult.fullfail {
+	color: #B31515;
+    	border: none;
+}
+ 
+.sheet-rolltemplate-pf_check .inlinerollresult.importantroll {
+	color: #4A57ED;
+    	border: none;
+}
+
+.sheet-rolltemplate-PFAttack .sheet-wrapper {
+    background:url(http://i.imgur.com/BLb0XMU.jpg) top left repeat;
+}
+
+.sheet-rolltemplate-PFAttack table {
+    width: 100%;
+    padding: 2px;
+}
+
+.sheet-rolltemplate-PFAttack .sheet-border {
+    border-color: #7E2D40;
+	border-style: solid;
+	border-width: 1px;
+    border-radius: 5px;
+}
+
+.sheet-rolltemplate-PFAttack th {
+	color: rgb(126, 45, 64);
+    padding-left: 5px;
+	line-height: 1.6em;
+	font-size: 1.2em;
+    text-align: left;
+	font-family: "Times New Roman", Times, serif;
+    font-variant: small-caps;
+}
+ 
+.sheet-rolltemplate-PFAttack .sheet-subheader {
+    color: #000;
+    font-size: 1em;
+    font-style: italic;
+}
+ 
+.sheet-rolltemplate-PFAttack .sheet-arrow-right {
+    border-top: 3px solid transparent;
+    border-bottom: 3px solid transparent;
+	border-left: 180px solid rgb(126, 45, 64);
+}
+ 
+.sheet-rolltemplate-PFAttack .sheet-tcat {
+    font-style: italic;
+}
+ 
+.sheet-rolltemplate-PFAttack td {
+    padding-left: 5px;
+}
+ 
+.sheet-rolltemplate-PFAttack .inlinerollresult  {
+    background-color: transparent;
+    border: none;
+}
+ 
+.sheet-rolltemplate-PFAttack .inlinerollresult.fullcrit {
+    background-color: transparent;
+	color: #3FB315;
+    border: none;
+}
+ 
+.sheet-rolltemplate-PFAttack .inlinerollresult.fullfail {
+    background-color: transparent;
+	color: #B31515;
+    border: none;
+}
+ 
+.sheet-rolltemplate-PFAttack .inlinerollresult.importantroll {
+    background-color: transparent;
+	color: #4A57ED;
+    border: none;
+}
+
+.sheet-rolltemplate-pf_spell .sheet-wrapper {
+    background:url(http://i.imgur.com/BLb0XMU.jpg) top left repeat;
+}
+
+.sheet-rolltemplate-pf_spell table {
+    width: 100%;
+    padding: 2px;
+}
+
+.sheet-rolltemplate-pf_spell .sheet-border {
+    border-color: #7E2D40;
+    border-style: solid;
+	border-width: 1px;
+    border-bottom-right-radius: 5px;
+    border-bottom-left-radius: 5px;
+}
+
+.sheet-rolltemplate-pf_spell th {
+    color: rgb(233, 223, 151);
+    background-color: #7E2D40;
+    padding-left: 5px;
+	line-height: 1.1em;
+	font-size: 1em;
+    text-align: left;
+	font-family: "Arial", Helvetica, sans-serif;
+    text-transform: uppercase;
+}
+ 
+.sheet-rolltemplate-pf_spell .sheet-arrow-right {
+    border-top: 3px solid transparent;
+    border-bottom: 3px solid transparent;
+	border-left: 180px solid rgb(126, 45, 64);
+}
+ 
+.sheet-rolltemplate-pf_spell .sheet-tcat {
+    font-weight: bold;
+}
+ 
+.sheet-rolltemplate-pf_spell td {
+    padding-left: 5px;
+    font-size: 0.9em;
+}
+ 
+.sheet-rolltemplate-pf_spell .inlinerollresult  {
+    background-color: transparent;
+    border: none;
+}
+ 
+.sheet-rolltemplate-pf_spell .inlinerollresult.fullcrit {
+	color: #3FB315;
+    border: none;
+}
+ 
+.sheet-rolltemplate-pf_spell .inlinerollresult.fullfail {
+	color: #B31515;
+    border: none;
+}
+ 
+.sheet-rolltemplate-pf_spell .inlinerollresult.importantroll {
+	color: #4A57ED;
+    border: none;
 }
\ No newline at end of file
diff --git a/Pathfinder (Old)/pathfinder-old.html b/Pathfinder (Old)/pathfinder-old.html
index be9977715b..bc4a19bd98 100644
--- a/Pathfinder (Old)/pathfinder-old.html	
+++ b/Pathfinder (Old)/pathfinder-old.html	
@@ -2,8 +2,8 @@
 <input type="radio" class="isNPC" value="0" name="attr_pc"> NPC
 <div class="sheet-1colrow" style="text-align:center;">
   <div class="sheet-col">
-  	<p style="text-align: center;">
-			<img src="http://paizo.com/image/content/Logos/PathfinderRPGLogo_500.jpeg" style="max-height: 100px;" alt="Pathfinder RPG Character Sheet" />
+      <p style="text-align: center;">
+        	<img src="http://paizo.com/image/content/Logos/PathfinderRPGLogo_500.jpeg" style="max-height: 100px;" alt="Pathfinder RPG Character Sheet" />
 		</p>
 	</div>
 </div>
@@ -85,7 +85,7 @@
 						<span class="sheet-table-header">Temp</span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-row-name"><button class="sheet-text-button" title="STR-Check" type="roll" name="roll_STR-Check" value="@{character_name}'s STR Check: [[1d20 + @{STR-mod}]]">STR</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="STR-Check" type="roll" name="roll_STR-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=STR Check}} {{skill_chk=[[d20 + @{STR-mod}]]}}">STR</button></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>
 						<span class="sheet-table-data-center"><input title="STR-base" type="number" name="attr_STR-base" value="10"></span>
@@ -94,7 +94,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-row-name"><button class="sheet-text-button" title="DEX-Check" type="roll" name="roll_DEX-Check" value="@{character_name}'s DEX Check: [[1d20 + @{DEX-mod}]]">DEX</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="DEX-Check" type="roll" name="roll_DEX-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=DEX Check}} {{skill_chk=[[d20 + @{DEX-mod}]]}}">DEX</button></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>
 						<span class="sheet-table-data-center"><input title="DEX-base" type="number" name="attr_DEX-base" value="10"></span>
@@ -103,7 +103,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-row-name"><button class="sheet-text-button" title="CON-Check" type="roll" name="roll_CON-Check" value="@{character_name}'s CON Check: [[1d20 + @{CON-mod}]]">CON</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="CON-Check" type="roll" name="roll_CON-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=CON Check}} {{skill_chk=[[d20 + @{CON-mod}]]}}">CON</button></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>
 						<span class="sheet-table-data-center"><input title="CON-base" type="number" name="attr_CON-base" value="10"></span>
@@ -112,7 +112,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-row-name"><button class="sheet-text-button" title="INT-Check" type="roll" name="roll_INT-Check" value="@{character_name}'s INT Check: [[1d20 + @{INT-mod}]]">INT</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="INT-Check" type="roll" name="roll_INT-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check= INT Check}} {{skill_chk=[[d20 + @{INT-mod}]]}}">INT</button></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>
 						<span class="sheet-table-data-center"><input title="INT-base" type="number" name="attr_INT-base" value="10"></span>
@@ -121,7 +121,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-row-name"><button class="sheet-text-button" title="WIS-Check" type="roll" name="roll_WIS-Check" value="@{character_name}'s WIS Check: [[1d20 + @{WIS-mod}]]">WIS</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="WIS-Check" type="roll" name="roll_WIS-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=WIS Check}} {{skill_chk=[[d20 + @{WIS-mod}]]}}">WIS</button></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>
 						<span class="sheet-table-data-center"><input title="WIS-base" type="number" name="attr_WIS-base" value="10"></span>
@@ -130,7 +130,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-row-name"><button class="sheet-text-button" title="CHA-Check" type="roll" name="roll_CHA-Check" value="@{character_name}'s CHA Check: [[1d20 + @{CHA-mod}]]">CHA</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="CHA-Check" type="roll" name="roll_CHA-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=CHA Check}} {{skill_chk=[[d20 + @{CHA-mod}]]}}">CHA</button></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>
 						<span class="sheet-table-data-center"><input title="CHA-base" type="number" name="attr_CHA-base" value="10"></span>
@@ -210,7 +210,7 @@
 						<span class="sheet-table-data-center" style="width:10%;"><input title="total-hp" type="number" name="attr_total-hp" value="(@{class-0-hp} + @{class-1-hp} + @{class-2-hp} + @{class-3-hp} + @{class-4-hp})" disabled></span>
 						<span class="sheet-table-data-center" style="width:30%;"><input title="class-favored" type="text" name="attr_class-favored" placeholder="Favored Class(es)"></span>
 						<span class="sheet-table-data-center" style="width:10%;"><input title="bab" type="number" name="attr_bab" value="(@{class-0-bab} + @{class-1-bab} + @{class-2-bab} + @{class-3-bab} + @{class-4-bab})" disabled></span>
-						<span class="sheet-table-data-center" style="width:10%;"><input title="total-skill" type="number" name="attr_total-skill" value="(@{class-0-skill} + @{class-1-skill} + @{class-2-skill} + @{class-3-skill} + @{class-4-skill})) + (@{INT-mod} * @{level})" disabled></span>
+						<span class="sheet-table-data-center" style="width:10%;"><input title="total-skill" type="number" name="attr_total-skill" value="(@{class-0-skill}*@{class-0-level} + @{class-1-skill}*@{class-1-level} + @{class-2-skill}*@{class-2-level} + @{class-3-skill}*@{class-3-level} + @{class-4-skill}*@{class-4-level} + @{INT-mod}*@{level})" disabled></span>
 						<span class="sheet-table-data-center" style="width:10%;"><input title="total-Fort" type="number" name="attr_total-Fort" value="(@{class-0-Fort} + @{class-1-Fort} + @{class-2-Fort} + @{class-3-Fort} + @{class-4-Fort})" disabled></span>
 						<span class="sheet-table-data-center" style="width:10%;"><input title="total-Ref" type="number" name="attr_total-Ref" value="(@{class-0-Ref} + @{class-1-Ref} + @{class-2-Ref} + @{class-3-Ref} + @{class-4-Ref})" disabled></span>
 						<span class="sheet-table-data-center" style="width:10%;"><input title="total-Will" type="number" name="attr_total-Will" value="(@{class-0-Will} + @{class-1-Will} + @{class-2-Will} + @{class-3-Will} + @{class-4-Will})" disabled></span>
@@ -345,7 +345,7 @@
 						<option value="1">Heavy Load</option>
 					</select>					
 				</span>
-				<span class="sheet-table-row-name"><button class="sheet-text-button" type="roll" title="Spell-Fail-Check" name="roll_Spell-Fail-Check" value="@{character_name}'s spell fail check&#x00A;Spell fail chance: [[@{spell-fail}]]&#37;&#x00A;/r 1d100>[[@{spell-fail}]]">Spell Fail</button></span>
+				<span class="sheet-table-row-name"><button class="sheet-text-button" type="roll" title="Spell-Fail-Check" name="roll_Spell-Fail-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=spell fail check}} {{spell_fail=[[@{spell-fail}]]&#37;}} {{spell_chk=[[d100]] > [[@{spell-fail}]]}}">Spell Fail</button></span>
 				<span class="sheet-table-data-center" style="text-align:center;"><input title="spell-fail" type="number" name="attr_spell-fail" value="((@{armor-spell-fail} * @{armor-equipped}) + (@{shield-spell-fail} * @{shield-equipped}))" disabled></span>
 			</div>
 		</div>
@@ -368,7 +368,7 @@
 						<span class="sheet-table-header">Temp</span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-row-name"><button class="sheet-text-button" title="Fort-Save" type="roll" name="roll_Fort-Save" value="@{character_name}'s Fortitude save: [[1d20 + @{Fort}]]">Fort</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="Fort-Save" type="roll" name="roll_Fort-Save" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Fort save}} {{skill_chk=[[1d20 + @{Fort}]]}}">Fort</button></span>
 						<span class="sheet-table-data-center"><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-center"><input title="total-Fort" type="number" name="attr_Fort-base" value="@{total-Fort}" disabled></span>
 						<span class="sheet-table-data-center"><input title="CON-mod" type="number" name="attr_Fort-ability" value="@{CON-mod}" disabled></span>
@@ -377,7 +377,7 @@
 						<span class="sheet-table-data-center"><input title="Fort-temp" type="number" name="attr_Fort-temp" value="0"></span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-row-name"><button class="sheet-text-button" title="Ref-Save" type="roll" name="roll_Ref-Save" value="@{character_name}'s Reflex save: [[1d20 + @{Ref}]]">Ref</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="Ref-Save" type="roll" name="roll_Ref-Save" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Ref save}} {{skill_chk=[[1d20 + @{Ref}]]}}">Ref</button></span>
 						<span class="sheet-table-data-center"><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-center"><input title="total-Ref" type="number" name="attr_Ref-base" value="@{total-Ref}" disabled></span>
 						<span class="sheet-table-data-center"><input title="DEX-mod" type="number" name="attr_Ref-ability" value="@{DEX-mod}" disabled></span>
@@ -386,7 +386,7 @@
 						<span class="sheet-table-data-center"><input title="Ref-temp" type="number" name="attr_Ref-temp" value="0"></span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-row-name"><button class="sheet-text-button" title="Will-Save" type="roll" name="roll_Will-Save" value="@{character_name}'s Will save: [[1d20 + @{Will}]]">Will</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="Will-Save" type="roll" name="roll_Will-Save" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Will save}} {{skill_chk=[[1d20 + @{Will}]]}}">Will</button></span>
 						<span class="sheet-table-data-center"><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-center"><input title="total-Will" type="number" name="attr_Will-base" value="@{total-Will}" disabled></span>
 						<span class="sheet-table-data-center"><input title="WIS-mod" type="number" name="attr_Will-ability" value="@{WIS-mod}" disabled></span>
@@ -409,7 +409,7 @@
 						<span class="sheet-table-header">Temp</span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-row-name"><button class="sheet-text-button" type="roll" title="Melee-Attack-Roll" name="roll_Melee-Attack-Roll" value="@{character_name}'s Melee Attack result: [[1d20 + @{attk-melee}]]">Melee</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" type="roll" title="Melee-Attack-Roll" name="roll_Melee-Attack-Roll" value="&{template:PFAttack} {{name=@{character_name}'s Attack}} {{subtags=Melee}} {{attack=[[1d20 + @{attk-melee}]]}} {{attk-notes=@{attack-notes}}}">Melee</button></span>
 						<span class="sheet-table-data-center"><input title="attk-melee" type="number" name="attr_attk-melee" value="(@{bab} + @{attk-melee-ability} + @{size} + @{attk-melee-misc} + @{attk-melee-temp})" disabled></span>
 						<span class="sheet-table-data-center"><input title="bab" type="number" name="attr_attk-melee-bab" value="@{bab}" disabled></span>
 						<span class="sheet-table-data-center">
@@ -429,7 +429,7 @@
 						<span class="sheet-table-data-center"><input title="attk-melee-temp" type="number" name="attr_attk-melee-temp" value="0"></span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-row-name"><button class="sheet-text-button" type="roll" title="Ranged-Attack-Roll" name="roll_Ranged-Attack-Roll" value="@{character_name}'s Ranged Attack result: [[1d20 + @{attk-ranged}]]">Ranged</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" type="roll" title="Ranged-Attack-Roll" name="roll_Ranged-Attack-Roll" value="&{template:PFAttack} {{name=@{character_name}'s Attack}} {{subtags=Ranged}} {{attack=[[1d20 + @{attk-ranged}]]}} {{attk-notes=@{attack-notes}}}">Ranged</button></span>
 						<span class="sheet-table-data-center"><input title="attk-ranged" type="number" name="attr_attk-ranged" value="(@{bab} + @{attk-ranged-ability} + @{size} + @{attk-ranged-misc} + @{attk-ranged-temp})" disabled></span>
 						<span class="sheet-table-data-center"><input title="bab" type="number" name="attr_attk-ranged-bab" value="@{bab}" disabled></span>
 						<span class="sheet-table-data-center">
@@ -449,7 +449,7 @@
 						<span class="sheet-table-data-center"><input title="attk-ranged-temp" type="number" name="attr_attk-ranged-temp" value="0"></span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-row-name"><button class="sheet-text-button" type="roll" title="CMB-Check" name="roll_CMB-Check" value="@{character_name}'s CMB check&#x00A;[[1d20 + @{CMB}]]">CMB</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" type="roll" title="CMB-Check" name="roll_CMB-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Combat Manuever}} {{skill_chk=[[1d20 + @{CMB}]]}}">CMB</button></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="bab" type="number" name="attr_attk-CMB-bab" value="@{bab}" disabled></span>
 						<span class="sheet-table-data-center">
@@ -546,7 +546,7 @@
 						<span class="sheet-table-header">Misc</span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-row-name" style="width:5%;"><button class="sheet-text-button" title="Roll-for-initiative" type="roll" name="roll_Roll-for-initiative" value="@{character_name}'s Initiative result: [[1d20 + @{init} &amp;{tracker}]] &#x00A;Initiative bonus: [[@{init}]]">Initiative</button></span>
+						<span class="sheet-table-row-name" style="width:5%;"><button class="sheet-text-button" title="Roll-for-initiative" type="roll" name="roll_Roll-for-initiative" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Initiative Roll}} {{init=[[1d20 + @{init} + 0.01 * @{init} &{tracker}]]}}">Initiative</button></span>
 						<span class="sheet-table-data-center"><input title="init" type="number" name="attr_init" value="(@{DEX-mod} + @{init-misc})" disabled></span>
 						<span class="sheet-table-data-center"><input title="DEX-mod" type="number" name="attr_init-DEX" value="@{DEX-mod}" disabled></span>
 						<span class="sheet-table-data-center"><input title="init-misc" type="number" name="attr_init-misc" value="0"></span>
@@ -645,7 +645,7 @@
 					<span class="sheet-table-header">Misc</span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Acrobatics-Check" type="roll" value="@{character_name}'s Acrobatics check: [[1d20 + @{Acrobatics}]]" name="roll_Acrobatics-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Acrobatics-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Acrobatics Check}} {{skill_chk=[[1d20 + @{Acrobatics}]]}}" name="roll_Acrobatics-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Acrobatics-cs" type="checkbox" name="attr_Acrobatics-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Acrobatics &bull;</span>
@@ -655,7 +655,7 @@
 					<span class="sheet-table-data-center"><input title="Acrobatics-misc" type="number" name="attr_Acrobatics-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Appraise-Check" type="roll" value="@{character_name}'s Appraise check: [[1d20 + @{Appraise}]]" name="roll_Appraise-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Appraise-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Appraise Check}} {{skill_chk=[[1d20 + @{Appraise}]]}}" name="roll_Appraise-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Appraise-cs" type="checkbox" name="attr_Appraise-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Appraise</span>
@@ -665,7 +665,7 @@
 					<span class="sheet-table-data-center"><input title="Appraise-misc" type="number" name="attr_Appraise-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Bluff-Check" type="roll" value="@{character_name}'s Bluff check: [[1d20 + @{Bluff}]]" name="roll_Bluff-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Bluff-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Bluff Check}} {{skill_chk=[[1d20 + @{Bluff}]]}}" name="roll_Bluff-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Bluff-cs" type="checkbox" name="attr_Bluff-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Bluff</span>
@@ -675,7 +675,7 @@
 					<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 style="font-size:100%;" title="Climb-Check" type="roll" value="@{character_name}'s Climb check: [[1d20 + @{Climb}]]" name="roll_Climb-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Climb-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Climb Check}} {{skill_chk=[[1d20 + @{Climb}]]}}" name="roll_Climb-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Climb-cs" type="checkbox" name="attr_Climb-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Climb &bull;</span>
@@ -685,7 +685,7 @@
 					<span class="sheet-table-data-center"><input title="Climb-misc" type="number" name="attr_Climb-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Craft-Check" type="roll" value="@{character_name}'s Craft: @{Craft-name} check: [[1d20 + @{Craft}]]" name="roll_Craft-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Craft-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Craft: @{Craft-name} Check}} {{skill_chk=[[1d20 + @{Craft}]]}}" name="roll_Craft-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Craft-cs" type="checkbox" name="attr_Craft-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Craft: <input title="Craft-name" type="text" name="attr_Craft-name"></span>
@@ -695,7 +695,7 @@
 					<span class="sheet-table-data-center"><input title="Craft-misc" type="number" name="attr_Craft-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Craft2-Check" type="roll" value="@{character_name}'s Craft: @{Craft2-name} check: [[1d20 + @{Craft2}]]" name="roll_Craft2-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Craft2-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Craft: @{Craft2-name} Check}} {{skill_chk=[[1d20 + @{Craft2}]]}}" name="roll_Craft2-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Craft2-cs" type="checkbox" name="attr_Craft2-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Craft: <input title="Craft2-name" type="text" name="attr_Craft2-name"></span>
@@ -705,7 +705,7 @@
 					<span class="sheet-table-data-center"><input title="Craft2-misc" type="number" name="attr_Craft2-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Diplomacy-Check" type="roll" value="@{character_name}'s Diplomacy check: [[1d20 + @{Diplomacy}]]" name="roll_Diplomacy-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Diplomacy-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Diplomacy Check}} {{skill_chk=[[1d20 + @{Diplomacy}]]}}" name="roll_Diplomacy-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Diplomacy-cs" type="checkbox" name="attr_Diplomacy-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Diplomacy</span>
@@ -715,7 +715,7 @@
 					<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 style="font-size:100%;" title="Disable-Device-Check" type="roll" value="@{character_name}'s Disable Device check: [[1d20 + @{Disable-Device}]]" name="roll_Disable-Device-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Disable-Device-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Disable Device Check}} {{skill_chk=[[1d20 + @{Disable-Device}]]}}"></button></span>
 					<span class="sheet-table-data-center"><input title="Disable-Device-cs" type="checkbox" name="attr_Disable-Device-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Disable Device &bull;</span>
@@ -725,7 +725,7 @@
 					<span class="sheet-table-data-center"><input title="Disable-Device-misc" type="number" name="attr_Disable-Device-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Disguise-Check" type="roll" value="@{character_name}'s Disguise check: [[1d20 + @{Disguise}]]" name="roll_Disguise-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Disguise-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Disguise Check}} {{skill_chk=[[1d20 + @{Disguise}]]}}" name="roll_Disguise-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Disguise-cs" type="checkbox" name="attr_Disguise-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Disguise</span>
@@ -735,7 +735,7 @@
 					<span class="sheet-table-data-center"><input title="Disguise-misc" type="number" name="attr_Disguise-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Escape-Artist-Check" type="roll" value="@{character_name}'s Escape Artist check: [[1d20 + @{Escape-Artist}]]" name="roll_Escape-Artist-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Escape-Artist-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Escape Artist Check}} {{skill_chk=[[1d20 + @{Escape-Artist}]]}}" name="roll_Escape-Artist-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Escape-Artist-cs" type="checkbox" name="attr_Escape-Artist-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Escape Artist &bull;</span>
@@ -745,7 +745,7 @@
 					<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 style="font-size:100%;" title="Fly-Check" type="roll" value="@{character_name}'s Fly check: [[1d20 + @{Fly}]]" name="roll_Fly-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Fly-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Fly Check}} {{skill_chk=[[1d20 + @{Fly}]]}}" name="roll_Fly-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Fly-cs" type="checkbox" name="attr_Fly-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Fly &bull;</span>
@@ -755,7 +755,7 @@
 					<span class="sheet-table-data-center"><input title="Fly-misc" type="number" name="attr_Fly-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Handle-Animal-Check" type="roll" value="@{character_name}'s Handle Animal check: [[1d20 + @{Handle-Animal}]]" name="roll_Handle-Animal-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Handle-Animal-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Handle Animal Check}} {{skill_chk=[[1d20 + @{Handle-Animal}]]}}" name="roll_Handle-Animal-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Handle-Animal-cs" type="checkbox" name="attr_Handle-Animal-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Handle Animal</span>
@@ -765,7 +765,7 @@
 					<span class="sheet-table-data-center"><input title="Handle-Animal-misc" type="number" name="attr_Handle-Animal-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Heal-Check" type="roll" value="@{character_name}'s Heal check: [[1d20 + @{Heal}]]" name="roll_Heal-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Heal-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Heal Check}} {{skill_chk=[[1d20 + @{Heal}]]}}" name="roll_Heal-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Heal-cs" type="checkbox" name="attr_Heal-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Heal</span>
@@ -775,7 +775,7 @@
 					<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 style="font-size:100%;" title="Intimidate-Check" type="roll" value="@{character_name}'s Intimidate check: [[1d20 + @{Intimidate}]]" name="roll_Intimidate-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Intimidate-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Intimidate Check}} {{skill_chk=[[1d20 + @{Intimidate}]]}}" name="roll_Intimidate-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Intimidate-cs" type="checkbox" name="attr_Intimidate-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Intimidate</span>
@@ -785,7 +785,7 @@
 					<span class="sheet-table-data-center"><input title="Intimidate-misc" type="number" name="attr_Intimidate-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-Arcana-Check" type="roll" value="@{character_name}'s Knowledge (Arcana) check: [[1d20 + @{Knowledge-Arcana}]]" name="roll_Knowledge-Arcana-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-Arcana-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Arcana) Check}} {{skill_chk=[[1d20 + @{Knowledge-Arcana}]]}}" name="roll_Knowledge-Arcana-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Knowledge-Arcana-cs" type="checkbox" name="attr_Knowledge-Arcana-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Knowledge (Arcana)</span>
@@ -795,7 +795,7 @@
 					<span class="sheet-table-data-center"><input title="Knowledge-Arcana-misc" type="number" name="attr_Knowledge-Arcana-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-Dungeoneering-Check" type="roll" value="@{character_name}'s Knowledge (Dungeoneering) check: [[1d20 + @{Knowledge-Dungeoneering}]]" name="roll_Knowledge-Dungeoneering-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-Dungeoneering-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Dungeoneering) Check}} {{skill_chk=[[1d20 + @{Knowledge-Dungeoneering}]]}}" name="roll_Knowledge-Dungeoneering-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Knowledge-Dungeoneering-cs" type="checkbox" name="attr_Knowledge-Dungeoneering-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Knowledge (Dungeoneering)</span>
@@ -805,7 +805,7 @@
 					<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 style="font-size:100%;" title="Knowledge-Engineering-Check" type="roll" value="@{character_name}'s Knowledge (Engineering) check: [[1d20 + @{Knowledge-Engineering}]]" name="roll_Knowledge-Engineering-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-Engineering-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Engineering) Check}} {{skill_chk=[[1d20 + @{Knowledge-Engineering}]]}}" name="roll_Knowledge-Engineering-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Knowledge-Engineering-cs" type="checkbox" name="attr_Knowledge-Engineering-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Knowledge (Engineering)</span>
@@ -815,7 +815,7 @@
 					<span class="sheet-table-data-center"><input title="Knowledge-Engineering-misc" type="number" name="attr_Knowledge-Engineering-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-Geography-Check" type="roll" value="@{character_name}'s Knowledge (Geography) check: [[1d20 + @{Knowledge-Geography}]]" name="roll_Knowledge-Geography-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-Geography-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Geography) Check}} {{skill_chk=[[1d20 + @{Knowledge-Geography}]]}}" name="roll_Knowledge-Geography-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Knowledge-Geography-cs" type="checkbox" name="attr_Knowledge-Geography-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Knowledge (Geography)</span>
@@ -825,7 +825,7 @@
 					<span class="sheet-table-data-center"><input title="Knowledge-Geography-misc" type="number" name="attr_Knowledge-Geography-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-History-Check" type="roll" value="@{character_name}'s Knowledge (History) check: [[1d20 + @{Knowledge-History}]]" name="roll_Knowledge-History-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-History-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (History) Check}} {{skill_chk=[[1d20 + @{Knowledge-History}]]}}" name="roll_Knowledge-History-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Knowledge-History-cs" type="checkbox" name="attr_Knowledge-History-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Knowledge (History)</span>
@@ -835,7 +835,7 @@
 					<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 style="font-size:100%;" title="Knowledge-Local-Check" type="roll" value="@{character_name}'s Knowledge (Local) check: [[1d20 + @{Knowledge-Local}]]" name="roll_Knowledge-Local-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-Local-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Local) Check}} {{skill_chk=[[1d20 + @{Knowledge-Local}]]}}" name="roll_Knowledge-Local-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Knowledge-Local-cs" type="checkbox" name="attr_Knowledge-Local-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Knowledge (Local)</span>
@@ -845,7 +845,7 @@
 					<span class="sheet-table-data-center"><input title="Knowledge-Local-misc" type="number" name="attr_Knowledge-Local-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-Nature-Check" type="roll" value="@{character_name}'s Knowledge (Nature) check: [[1d20 + @{Knowledge-Nature}]]" name="roll_Knowledge-Nature-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-Nature-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Nature) Check}} {{skill_chk=[[1d20 + @{Knowledge-Nature}]]}}" name="roll_Knowledge-Nature-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Knowledge-Nature-cs" type="checkbox" name="attr_Knowledge-Nature-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Knowledge (Nature)</span>
@@ -855,7 +855,7 @@
 					<span class="sheet-table-data-center"><input title="Knowledge-Nature-misc" type="number" name="attr_Knowledge-Nature-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-Nobility-Check" type="roll" value="@{character_name}'s Knowledge (Nobility) check: [[1d20 + @{Knowledge-Nobility}]]" name="roll_Knowledge-Nobility-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-Nobility-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Nobility) Check}} {{skill_chk=[[1d20 + @{Knowledge-Nobility}]]}}" name="roll_Knowledge-Nobility-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Knowledge-Nobility-cs" type="checkbox" name="attr_Knowledge-Nobility-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Knowledge (Nobility)</span>
@@ -865,7 +865,7 @@
 					<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 style="font-size:100%;" title="Knowledge-Planes-Check" type="roll" value="@{character_name}'s Knowledge (Planes) check: [[1d20 + @{Knowledge-Planes}]]" name="roll_Knowledge-Planes-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-Planes-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Planes) Check}} {{skill_chk=[[1d20 + @{Knowledge-Planes}]]}}" name="roll_Knowledge-Planes-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Knowledge-Planes-cs" type="checkbox" name="attr_Knowledge-Planes-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Knowledge (Planes)</span>
@@ -875,7 +875,7 @@
 					<span class="sheet-table-data-center"><input title="Knowledge-Planes-misc" type="number" name="attr_Knowledge-Planes-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-Religion-Check" type="roll" value="@{character_name}'s Knowledge (Religion) check: [[1d20 + @{Knowledge-Religion}]]" name="roll_Knowledge-Religion-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Knowledge-Religion-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Religion) Check}} {{skill_chk=[[1d20 + @{Knowledge-Religion}]]}}" name="roll_Knowledge-Religion-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Knowledge-Religion-cs" type="checkbox" name="attr_Knowledge-Religion-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Knowledge (Religion)</span>
@@ -885,7 +885,7 @@
 					<span class="sheet-table-data-center"><input title="Knowledge-Religion-misc" type="number" name="attr_Knowledge-Religion-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Linguistics-Check" type="roll" value="@{character_name}'s Linguistics check: [[1d20 + @{Linguistics}]]" name="roll_Linguistics-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Linguistics-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Linguistics Check}} {{skill_chk=[[1d20 + @{Linguistics}]]}}" name="roll_Linguistics-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Linguistics-cs" type="checkbox" name="attr_Linguistics-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Linguistics</span>
@@ -895,7 +895,7 @@
 					<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 style="font-size:100%;" title="Perception-Check" type="roll" value="@{character_name}'s Perception check: [[1d20 + @{Perception}]]" name="roll_Perception-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Perception-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Perception Check}} {{skill_chk=[[1d20 + @{Perception}]]}}" name="roll_Perception-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Perception-cs" type="checkbox" name="attr_Perception-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Perception</span>
@@ -905,7 +905,7 @@
 					<span class="sheet-table-data-center"><input title="Perception-misc" type="number" name="attr_Perception-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Perform-Check" type="roll" value="@{character_name}'s Perform: @{Perform-name} check: [[1d20 + @{Perform}]]" name="roll_Perform-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Perform-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Perform: @{Perform-name} Check}} {{skill_chk=[[1d20 + @{Perform}]]}}" name="roll_Perform-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Perform-cs" type="checkbox" name="attr_Perform-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Perform:<input title="Perform-name" type="text" name="attr_Perform-name"></span>
@@ -915,7 +915,7 @@
 					<span class="sheet-table-data-center"><input title="Perform-misc" type="number" name="attr_Perform-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Perform2-Check" type="roll" value="@{character_name}'s Perform: @{Perform2-name} check: [[1d20 + @{Perform2}]]" name="roll_Perform2-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Perform2-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Perform: @{Perform2-name} Check}} {{skill_chk=[[1d20 + @{Perform2}]]}}" name="roll_Perform2-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Perform2-cs" type="checkbox" name="attr_Perform2-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Perform:<input title="Perform2-name" type="text" name="attr_Perform2-name"></span>
@@ -925,7 +925,7 @@
 					<span class="sheet-table-data-center"><input title="Perform2-misc" type="number" name="attr_Perform2-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Profession-Check" type="roll" value="@{character_name}'s Profession: @{Profession-name} check: [[1d20 + @{Profession}]]" name="roll_Profession-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Profession-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Profession: @{Profession-name} Check}} {{skill_chk=[[1d20 + @{Profession}]]}}" name="roll_Profession-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Profession-cs" type="checkbox" name="attr_Profession-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Profession:<input title="Profession-name" type="text" name="attr_Profession-name"></span>
@@ -935,7 +935,7 @@
 					<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 style="font-size:100%;" title="Profession2-Check" type="roll" value="@{character_name}'s Profession: @{Profession2-name} check: [[1d20 + @{Profession2}]]" name="roll_Profession2-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Profession2-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Profession: @{Profession2-name} Check}} {{skill_chk=[[1d20 + @{Profession2}]]}}" name="roll_Profession2-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Profession2-cs" type="checkbox" name="attr_Profession2-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Profession:<input title="Profession2-name" type="text" name="attr_Profession2-name"></span>
@@ -945,7 +945,7 @@
 					<span class="sheet-table-data-center"><input title="Profession2-misc" type="number" name="attr_Profession2-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Ride-Check" type="roll" value="@{character_name}'s Ride check: [[1d20 + @{Ride}]]" name="roll_Ride-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Ride-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Ride Check}} {{skill_chk=[[1d20 + @{Ride}]]}}" name="roll_Ride-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Ride-cs" type="checkbox" name="attr_Ride-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Ride &bull;</span>
@@ -955,7 +955,7 @@
 					<span class="sheet-table-data-center"><input title="Ride-misc" type="number" name="attr_Ride-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Sense-Motive-Check" type="roll" value="@{character_name}'s Sense-Motive check: [[1d20 + @{Sense-Motive}]]" name="roll_Sense-Motive-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Sense-Motive-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Sense Motive Check}} {{skill_chk=[[1d20 + @{Sense-Motive}]]}}" name="roll_Sense-Motive-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Sense-Motive-cs" type="checkbox" name="attr_Sense-Motive-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Sense Motive</span>
@@ -965,7 +965,7 @@
 					<span class="sheet-table-data-center"><input title="Sense-Motive-misc" type="number" name="attr_Sense-Motive-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Sleight-of-Hand-Check" type="roll" value="@{character_name}'s Sleight of Hand check: [[1d20 + @{Sleight-of-Hand}]]" name="roll_Sleight-of-Hand-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Sleight-of-Hand-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Sleight of Hand Check}} {{skill_chk=[[1d20 + @{Sleight-of-Hand}]]}}" name="roll_Sleight-of-Hand-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Sleight-of-Hand-cs" type="checkbox" name="attr_Sleight-of-Hand-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Sleight of Hand &bull;</span>
@@ -975,7 +975,7 @@
 					<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 style="font-size:100%;" title="Spellcraft-Check" type="roll" value="@{character_name}'s Spellcraft check: [[1d20 + @{Spellcraft}]]" name="roll_Spellcraft-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Spellcraft-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Spellcraft Check}} {{skill_chk=[[1d20 + @{Spellcraft}]]}}" name="roll_Spellcraft-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Spellcraft-cs" type="checkbox" name="attr_Spellcraft-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Spellcraft</span>
@@ -985,7 +985,7 @@
 					<span class="sheet-table-data-center"><input title="Spellcraft-misc" type="number" name="attr_Spellcraft-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Stealth-Check" type="roll" value="@{character_name}'s Stealth check: [[1d20 + @{Stealth}]]" name="roll_Stealth-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Stealth-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Stealth Check}} {{skill_chk=[[1d20 + @{Stealth}]]}}" name="roll_Stealth-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Stealth-cs" type="checkbox" name="attr_Stealth-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Stealth &bull;</span>
@@ -995,7 +995,7 @@
 					<span class="sheet-table-data-center"><input title="Stealth-misc" type="number" name="attr_Stealth-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Survival-Check" type="roll" value="@{character_name}'s Survival check: [[1d20 + @{Survival}]]" name="roll_Survival-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Survival-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Survival Check}} {{skill_chk=[[1d20 + @{Survival}]]}}" name="roll_Survival-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Survival-cs" type="checkbox" name="attr_Survival-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Survival</span>
@@ -1005,7 +1005,7 @@
 					<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 style="font-size:100%;" title="Swim-Check" type="roll" value="@{character_name}'s Swim check: [[1d20 + @{Swim}]]" name="roll_Swim-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Swim-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Swim Check}} {{skill_chk=[[1d20 + @{Swim}]]}}" name="roll_Swim-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Swim-cs" type="checkbox" name="attr_Swim-cs" value="1" /></span>
 					<span class="sheet-table-data-center">*</span>
 					<span class="sheet-table-data-left">Swim &bull;</span>
@@ -1015,7 +1015,7 @@
 					<span class="sheet-table-data-center"><input title="Swim-misc" type="number" name="attr_Swim-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Use-Magic-Device-Check" type="roll" value="@{character_name}'s Use Magic Device check: [[1d20 + @{Use-Magic-Device}]]" name="roll_Use-Magic-Device-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Use-Magic-Device-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Use Magic Device Check}} {{skill_chk=[[1d20 + @{Use-Magic-Device}]]}}" name="roll_Use-Magic-Device-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Use-Magic-Device-cs" type="checkbox" name="attr_Use-Magic-Device-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Use Magic Device</span>
@@ -1025,7 +1025,7 @@
 					<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 style="font-size:100%;" title="Misc-Skill-0-Check" type="roll" value="@{character_name}'s @{Misc-Skill-0-name} check: [[1d20 + @{Misc-Skill-0}]]" name="roll_Misc-Skill-0-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Misc-Skill-0-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=@{Misc-Skill-0-name} Check}} {{skill_chk=[[1d20 + @{Misc-Skill-0}]]}}" name="roll_Misc-Skill-0-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Misc-Skill-0-cs" type="checkbox" name="attr_Misc-Skill-0-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left"><input type="text" title="Misc-Skill-0-name" name="attr_Misc-Skill-0-name"></span>
@@ -1045,7 +1045,7 @@
 					<span class="sheet-table-data-center"><input title="Misc-Skill-0-misc" type="number" name="attr_Misc-Skill-0-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Misc-Skill-1-Check" type="roll" value="@{character_name}'s @{Misc-Skill-1-name} check: [[1d20 + @{Misc-Skill-1}]]" name="roll_Misc-Skill-1-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Misc-Skill-1-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=@{Misc-Skill-1-name} Check}} {{skill_chk=[[1d20 + @{Misc-Skill-1}]]}}" name="roll_Misc-Skill-1-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Misc-Skill-1-cs" type="checkbox" name="attr_Misc-Skill-1-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left"><input type="text" title="Misc-Skill-1-name" name="attr_Misc-Skill-1-name"></span>
@@ -1065,7 +1065,7 @@
 					<span class="sheet-table-data-center"><input title="Misc-Skill-1-misc" type="number" name="attr_Misc-Skill-1-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Misc-Skill-2-Check" type="roll" value="@{character_name}'s @{Misc-Skill-2-name} check: [[1d20 + @{Misc-Skill-2}]]" name="roll_Misc-Skill-2-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Misc-Skill-2-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=@{Misc-Skill-2-name} Check}} {{skill_chk=[[1d20 + @{Misc-Skill-2}]]}}" name="roll_Misc-Skill-2-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Misc-Skill-2-cs" type="checkbox" name="attr_Misc-Skill-2-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left"><input type="text" title="Misc-Skill-2-name" name="attr_Misc-Skill-2-name"></span>
@@ -1085,7 +1085,7 @@
 					<span class="sheet-table-data-center"><input title="Misc-Skill-2-misc" type="number" name="attr_Misc-Skill-2-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Misc-Skill-3-Check" type="roll" value="@{character_name}'s @{Misc-Skill-3-name} check: [[1d20 + @{Misc-Skill-3}]]" name="roll_Misc-Skill-3-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Misc-Skill-3-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=@{Misc-Skill-3-name} Check}} {{skill_chk=[[1d20 + @{Misc-Skill-3}]]}}" name="roll_Misc-Skill-3-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Misc-Skill-3-cs" type="checkbox" name="attr_Misc-Skill-3-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left"><input type="text" title="Misc-Skill-3-name" name="attr_Misc-Skill-3-name"></span>
@@ -1105,7 +1105,7 @@
 					<span class="sheet-table-data-center"><input title="Misc-Skill-3-misc" type="number" name="attr_Misc-Skill-3-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Misc-Skill-4-Check" type="roll" value="@{character_name}'s @{Misc-Skill-4-name} check: [[1d20 + @{Misc-Skill-4}]]" name="roll_Misc-Skill-4-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Misc-Skill-4-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=@{Misc-Skill-4-name} Check}} {{skill_chk=[[1d20 + @{Misc-Skill-4}]]}}" name="roll_Misc-Skill-4-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Misc-Skill-4-cs" type="checkbox" name="attr_Misc-Skill-4-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left"><input type="text" title="Misc-Skill-4-name" name="attr_Misc-Skill-4-name"></span>
@@ -1125,7 +1125,7 @@
 					<span class="sheet-table-data-center"><input title="Misc-Skill-4-misc" type="number" name="attr_Misc-Skill-4-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Misc-Skill-5-Check" type="roll" value="@{character_name}'s @{Misc-Skill-5-name} check: [[1d20 + @{Misc-Skill-5}]]" name="roll_Misc-Skill-5-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Misc-Skill-5-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=@{Misc-Skill-5-name} Check}} {{skill_chk=[[1d20 + @{Misc-Skill-5}]]}}" name="roll_Misc-Skill-5-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Misc-Skill-5-cs" type="checkbox" name="attr_Misc-Skill-5-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left"><input type="text" title="Misc-Skill-5-name" name="attr_Misc-Skill-5-name"></span>
@@ -1175,58 +1175,83 @@
 	<div class="sheet-pc-weapons">
 		<div class="sheet-table">
 			<span class="sheet-table-name">Weapons</span>
-			<div class="sheet-table-row">
-				<span class="sheet-table-header" style="width:5%;"></span>
-				<span class="sheet-table-header" style="width:20%;">Name & Description</span>
-				<span class="sheet-table-header" style="width:15%;">Attack</span>
-				<span class="sheet-table-header" style="width:20%;">Damage</span>
-				<span class="sheet-table-header" style="width:10%;">Crit</span>
-				<span class="sheet-table-header" style="width:5%;">Range</span>
-				<span class="sheet-table-header" style="width:5%;">Type</span>
-				<span class="sheet-table-header" style="width:5%;">Wt</span>
-				<span class="sheet-table-header" style="width:5%;">Ammo</span>
-				<span class="sheet-table-header" style="width:10%;">Notes</span>
-			</div>
-		</div>
-		<div class="sheet-table">
-			<fieldset class="repeating_weapon">  
-				<span class="sheet-table-data-center" style="width:5%;"><button style="font-size:100%;" title="Attack-Roll (not useable in macros or abilities)" type="roll" name="roll_Attack-Roll" value="@{macro-text}"></button></span>
-				<span class="sheet-table-data-center" style="width:20%;"><input title="repeating_weapon_X_name" type="text" name="attr_name"></span>
-				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_weapon_X_attack" type="number" name="attr_attack" value="0"></span>
-				<span class="sheet-table-data-center" style="width:10%;">
-					<select title="repeating_weapon_X_attack-type" name="attr_attack-type">
-						<option value="0" selected>None</option>
-						<option value="@{attk-melee}">+Melee</option>
-						<option value="@{attk-ranged}">+Ranged</option>
-					</select>
-				</span>
-				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_weapon_X_damage" type="text" name="attr_damage" value="0d0 + 0"></span>
-				<span class="sheet-table-data-center" style="width:10%;">
-					<select title="repeating_weapon_X_damage-ability" name="attr_damage-ability">
-						<option value="0" selected>None</option>
-						<option value="@{STR-mod}">+STR</option>
-						<option value="@{DEX-mod}">+DEX</option>
-						<option value="@{CON-mod}">+CON</option>
-						<option value="@{INT-mod}">+INT</option>
-						<option value="@{WIS-mod}">+WIS</option>
-						<option value="@{CHA-mod}">+CHA</option>
-						<option value="floor(1.5 * @{STR-mod})">+(1.5 * STR)</option>
-						<option value="floor(1.5 * @{DEX-mod})">+(1.5 * DEX)</option>
-						<option value="floor(1.5 * @{CON-mod})">+(1.5 * CON)</option>
-						<option value="floor(1.5 * @{INT-mod})">+(1.5 * INT)</option>
-						<option value="floor(1.5 * @{WIS-mod})">+(1.5 * WIS)</option>
-						<option value="floor(1.5 * @{CHA-mod})">+(1.5 * CHA)</option>
-					</select>
-				</span>
-				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_weapon_X_crit" type="text" name="attr_crit" value="20/x2"></span>
-				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_weapon_X_range" type="number" name="attr_range" value="0"></span>
-				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_weapon_X_type" type="text" name="attr_type" value="PSB"></span>
-				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_weapon_X_weight" type="number" name="attr_weight" step="any" value="0"></span>
-				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_weapon_X_ammo" type="number" name="attr_ammo" value="0"></span>
-				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_weapon_X_notes" type="text" name="attr_notes"></span>
-        <b>Show Macro Text?</b>
-				<input type="checkbox" class="sheet-section-show" title="repeating_weapon_X_macro-text-show" name="attr_macro-text-show" value="1" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;"/><span></span>
-				<textarea class="sheet-section" title="repeating_weapon_X_macro-text" name="attr_macro-text">/em is attacking with @{name}&#x00A;Attack Result: [[1d20 + @{attack-type} + @{attack}]]&#x00A;Damage Result: [[@{damage} + @{damage-ability}]]&#x00A;Crit: @{crit}&#x00A;Type: @{type}&#x00A;Notes: @{notes}&#x00A;Attack notes: @{attack-notes}</textarea>
+            <fieldset class="repeating_weapon">  
+    			<div class="sheet-table">
+					<div class="sheet-table-row1">
+						<span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" min="0" name="attr_enhance" title="@{repeating_weapon_X_enhance}"><br>Enhance</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="checkbox" name="attr_masterwork" title="@{repeating_weapon_X_masterwork}" value="1"><br>Mwk</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_name" title="@{repeating_weapon_X_name}" placeholder="Name"><br>Name</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_attack" title="@{repeating_weapon_X_attack}" placeholder="Attack Modifiers"><br>Attack Mods</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;">
+							<select title="@{repeating_weapon_X_attack-type}" name="attr_attack-type">
+								<option value="0" selected>None</option>
+								<option value="@{attk-melee}">Melee</option>
+								<option value="@{attk-ranged}">Ranged</option>
+							</select>
+							<br>Attack Type
+						</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_total-attack" title="@{repeating_weapon_X_total-attack}" value="(@{proficiency} + (((@{enhance} + @{masterwork}) + abs(@{enhance} - @{masterwork})) / 2) + @{attack} + @{attack-type})" disabled><br>ATK</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_damage-dice-num" title="@{repeating_weapon_X_damage-dice-num}" min="0"><br>Dice</span>
+						<span class="sheet-table-data sheet-center" style="vertical-align:middle;font-size:150%;width:2%;">d</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_damage-die" title="@{repeating_weapon_X_damage-die}" min="0"><br>Die</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_damage" title="@{repeating_weapon_X_damage}" placeholder="Damage Modifiers"><br>Damage Mods</span>
+						<span class="sheet-table-data sheet-center" style="width:15%;">
+							<select title="@{repeating_weapon_X_damage-ability}" name="attr_damage-ability">
+								<option value="0" selected>None</option>
+								<option value="floor(0.5 * @{STR-mod})">1/2 STR</option>
+								<option value="floor(0.5 * @{DEX-mod})">1/2 DEX</option>
+								<option value="floor(0.5 * @{CON-mod})">1/2 CON</option>
+								<option value="floor(0.5 * @{INT-mod})">1/2 INT</option>
+								<option value="floor(0.5 * @{WIS-mod})">1/2 WIS</option>
+								<option value="floor(0.5 * @{CHA-mod})">1/2 CHA</option>
+								<option value="@{STR-mod}">STR</option>
+								<option value="@{DEX-mod}">DEX</option>
+								<option value="@{CON-mod}">CON</option>
+								<option value="@{INT-mod}">INT</option>
+								<option value="@{WIS-mod}">WIS</option>
+								<option value="@{CHA-mod}">CHA</option>
+								<option value="floor(1.5 * @{STR-mod})">1.5x STR</option>
+								<option value="floor(1.5 * @{DEX-mod})">1.5x DEX</option>
+								<option value="floor(1.5 * @{CON-mod})">1.5x CON</option>
+								<option value="floor(1.5 * @{INT-mod})">1.5x INT</option>
+								<option value="floor(1.5 * @{WIS-mod})">1.5x WIS</option>
+								<option value="floor(1.5 * @{CHA-mod})">1.5x CHA</option>
+								<option value="floor(2 * @{STR-mod})">2x STR</option>
+								<option value="floor(2 * @{DEX-mod})">2x DEX</option>
+								<option value="floor(2 * @{CON-mod})">2x CON</option>
+								<option value="floor(2 * @{INT-mod})">2x INT</option>
+								<option value="floor(2 * @{WIS-mod})">2x WIS</option>
+								<option value="floor(2 * @{CHA-mod})">2x CHA</option>
+							</select>
+							<br>Damage Ability
+						</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_total-damage" title="@{repeating_weapon_X_total-damage}" value="(@{enhance} + @{damage} + @{damage-ability})" disabled><br>DMG</span>
+					</div>
+				</div>
+				<div class="sheet-table">
+					<div class="sheet-table-row1">
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_crit-target" title="@{repeating_weapon_X_crit-target}" min="0" max="20"><br>Crit</span>
+						<span class="sheet-table-data sheet-center" style="vertical-align:middle;font-size:150%;width:2%;"><b>/x</b></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_crit-multiplier" title="@{repeating_weapon_X_crit-multiplier}" min="0"><br>Multiplier</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_range" title="@{repeating_weapon_X_range}" value="0" min="0"><br>Range</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_type" title="@{repeating_weapon_X_type}" placeholder="Damage Type"><br>Damage Type</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_weight" title="@{repeating_weapon_X_weight}" value="0" step="any" min="0"><br>Weight</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_ammo" title="@{repeating_weapon_X_ammo}" value="0"><br>Ammo</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;">
+							<select title="@{repeating_weapon_X_proficiency}" name="attr_proficiency">
+								<option value="0">Yes</option>
+								<option value="-4" selected>No</option>
+							</select>
+							<br>Proficiency
+						</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:48%;"><input type="text" name="attr_notes" title="@{repeating_weapon_X_notes}" placeholder="Attack Notes"><br>Notes</span>
+					</div>
+				</div>
+				<b>Macro Text&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
+				<input type="checkbox" class="sheet-macro-show" title="@{repeating_weapon_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" /><span></span>
+				<textarea class="sheet-macro" title="@{repeating_weapon_X_macro-text}" name="attr_macro-text">/em is attacking with @{name}&#x00A;&{template:PFAttack} {{name=@{character_name}'s @{name}}} {{subtags=@{type}}} {{attack=[[1d20cs>@{crit-target}+@{total-attack}]]}} {{damage=[[@{damage-dice-num}d@{damage-die}+@{total-damage}]]}} {{confirm=[[1d20+@{total-attack}]]}} {{dmgcrit=[[(@{damage-dice-num} * (@{crit-multiplier} - 1))d@{damage-die} + (@{total-damage} * (@{crit-multiplier} - 1))]]}} {{notes=@{notes}}} {{attk-notes=@{attack-notes}}}}</textarea>
+				<hr>		
 			</fieldset>
 		</div>
 	</div>
@@ -1379,7 +1404,7 @@
 						</div>
 						<div class="sheet-table-row">
 							<span class="sheet-table-data-left"><input title="spellclass-0-name" type="text" name="attr_spellclass-0-name"></span>
-							<span class="sheet-table-data-left"><button style="font-size:100%;" title="Spell-Class-0-CL-Check" type="roll" name="roll_Spell-Class-0-CL-Check" value="@{character_name}'s @{spellclass-0-name} caster level check: [[1d20 + @{spellclass-0-level} + @{spellclass-0-level-misc}]]">Caster Level</button></span>
+							<span class="sheet-table-data-left"><button style="font-size:100%;" title="Spell-Class-0-CL-Check" type="roll" name="roll_Spell-Class-0-CL-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Caster Level Check}} {{caster_class=@{spellclass-0-name} **@{spellclass-0-level}**}} {{caster_lvl_chk=[[1d20 + @{spellclass-0-level} + @{spellclass-0-level-misc}]]}}">Caster Level</button></span>
 							<span class="sheet-table-data-left"><input title="spellclass-0-level-total" type="number" name="attr_spellclass-0-level-total" value="(@{spellclass-0-level} + @{spellclass-0-level-misc})" disabled></span>
 							<span class="sheet-table-data-left">=</span>
 							<span class="sheet-table-data-left"><input title="spellclass-0-level" type="number" name="attr_spellclass-0-level" value="0"></span>
@@ -1406,7 +1431,7 @@
 									<option value="(@{CHA-mod})">CHA</option>
 								</select>
 							</span>
-							<span class="sheet-table-data-center"><button style="font-size:100%;" title="Concentration-Check-0" type="roll" value="@{character_name}'s Concentration check: [[1d20 + @{Concentration-0}]]" name="roll_Concentration-Check-0">Concentration</button></span>
+							<span class="sheet-table-data-center"><button style="font-size:100%;" title="Concentration-Check-0" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Concentration Check}} {{caster_class=@{spellclass-0-name} **@{spellclass-0-level}**}} {{concentration_chk=[[1d20 + @{Concentration-0}]]}}" name="roll_Concentration-Check-0}}">Concentration</button></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>
 						</div>
@@ -1561,7 +1586,7 @@
 						</div>
 						<div class="sheet-table-row">
 							<span class="sheet-table-data-left"><input title="spellclass-1-name" type="text" name="attr_spellclass-1-name"></span>
-							<span class="sheet-table-data-left"><button style="font-size:100%;" title="Spell-Class-1-CL-Check" type="roll" name="roll_Spell-Class-1-CL-Check" value="@{character_name}'s @{spellclass-1-name} caster level check: [[1d20 + @{spellclass-1-level} + @{spellclass-1-level-misc}]]">Caster Level</button></span>
+							<span class="sheet-table-data-left"><button style="font-size:100%;" title="Spell-Class-1-CL-Check" type="roll" name="roll_Spell-Class-1-CL-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Caster Level Check}} {{caster_class=@{spellclass-1-name} **@{spellclass-1-level}**}} {{caster_lvl_chk=[[1d20 + @{spellclass-1-level} + @{spellclass-1-level-misc}]]}}">Caster Level</button></span>
 							<span class="sheet-table-data-left"><input title="spellclass-1-level-total" type="number" name="attr_spellclass-1-level-total" value="(@{spellclass-1-level} + @{spellclass-1-level-misc})" disabled></span>
 							<span class="sheet-table-data-left">=</span>
 							<span class="sheet-table-data-left"><input title="spellclass-1-level" type="number" name="attr_spellclass-1-level" value="0"></span>
@@ -1588,7 +1613,7 @@
 									<option value="(@{CHA-mod})">CHA</option>
 								</select>
 							</span>
-							<span class="sheet-table-data-center"><button style="font-size:100%;" title="Concentration-Check-1" type="roll" value="@{character_name}'s Concentration check: [[1d20 + @{Concentration-1}]]" name="roll_Concentration-Check-1">Concentration</button></span>
+							<span class="sheet-table-data-center"><button style="font-size:100%;" title="Concentration-Check-1" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Concentration Check}} {{caster_class=@{spellclass-1-name} **@{spellclass-1-level}**}} {{concentration_chk=[[1d20 + @{Concentration-1}]]}}" name="roll_Concentration-Check-1">Concentration</button></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>
 						</div>
@@ -1772,7 +1797,7 @@
 					<br>
 					<b>Show Macro Text?</b>
 					<input type="checkbox" class="sheet-macro-show" title="repeating_lvl-0-spells_X_macro-text-show" name="attr_macro-text-show" value="1" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;"/><span></span>
-					<textarea class="sheet-macro" title="repeating_lvl-0-spells_X_macro-text" name="attr_macro-text">/em casts @{name}!&#x00A;School: @{school}; Level 0&#x00A;Casting Time: @{cast-time}&#x00A;Components: @{components}&#x00A;Range: @{range}&#x00A;Targets/Area: @{targets}&#x00A;Duration: @{duration}&#x00A;Saving Throw: DC [[@{spellclass-0-level-0-savedc}]], @{save}; Spell Resistance: @{sr}&#x00A;&#x00A;@{description}</textarea>
+					<textarea class="sheet-macro" title="Remove Melee and Ranged Attack and Damage as appropriate" name="attr_macro-text">/em casts @{name}!&#x00A;&{template:pf_spell} {{name=@{name}}}{{school=@{school}}} {{level=@{spellclass-0-name} 0}} {{casting_time=@{cast-time}}} {{components=@{components}}} {{range=@{range}}} {{target=@{targets}}} {{duration=@{duration}}} {{saving_throw=@{save}}} {{sr=@{sr}}} {{mel_attack=[[1d20+@{attk-melee}]]}} {{rng_attack=[[1d20 + @{attk-ranged}]]}} {{damage=1d3([[1d3]])}} {{spell_description=@{description}}}</textarea>
 					<hr>
 				</fieldset>
 			</div>
@@ -1821,7 +1846,7 @@
 					<br>
 					<b>Show Macro Text?</b>
 					<input type="checkbox" class="sheet-macro-show" title="repeating_lvl-1-spells_X_macro-text-show" name="attr_macro-text-show" value="1" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;"/><span></span>
-					<textarea class="sheet-macro" title="repeating_lvl-1-spells_X_macro-text" name="attr_macro-text">/em casts @{name}!&#x00A;School: @{school}; Level 1&#x00A;Casting Time: @{cast-time}&#x00A;Components: @{components}&#x00A;Range: @{range}&#x00A;Targets/Area: @{targets}&#x00A;Duration: @{duration}&#x00A;Saving Throw: DC [[@{spellclass-0-level-1-savedc}]], @{save}; Spell Resistance: @{sr}&#x00A;Uses Remaining: [[@{used} - 1]]&#x00A;&#x00A;@{description}</textarea>
+					<textarea class="sheet-macro" title="Remove Melee and Ranged Attack and Damage as appropriate" name="attr_macro-text">/em casts @{name}!&#x00A;&{template:pf_spell} {{name=@{name}}} {{school=@{school}}} {{level=@{spellclass-0-name} 1}} {{casting_time=@{cast-time}}} {{components=@{components}}} {{range=@{range}}} {{target=@{targets}}} {{duration=@{duration}}} {{saving_throw=@{save}}} {{sr=@{sr}}} {{mel_attack=[[1d20+@{attk-melee}]]}} {{rng_attack=[[1d20 + @{attk-ranged}]]}} {{damage=1d3([[1d3]])}} {{spell_description=@{description}}}</textarea>
 					<hr>
 				</fieldset>
 			</div>
@@ -1870,7 +1895,7 @@
 					<br>
 					<b>Show Macro Text?</b>
 					<input type="checkbox" class="sheet-macro-show" title="repeating_lvl-2-spells_X_macro-text-show" name="attr_macro-text-show" value="1" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;"/><span></span>
-					<textarea class="sheet-macro" title="repeating_lvl-2-spells_X_macro-text" name="attr_macro-text">/em casts @{name}!&#x00A;School: @{school}; Level 2&#x00A;Casting Time: @{cast-time}&#x00A;Components: @{components}&#x00A;Range: @{range}&#x00A;Targets/Area: @{targets}&#x00A;Duration: @{duration}&#x00A;Saving Throw: DC [[@{spellclass-0-level-2-savedc}]], @{save}; Spell Resistance: @{sr}&#x00A;Uses Remaining: [[@{used} - 1]]&#x00A;&#x00A;@{description}</textarea>
+					<textarea class="sheet-macro" title="Remove Melee and Ranged Attack and Damage as appropriate" name="attr_macro-text">/em casts @{name}!&#x00A;&{template:pf_spell} {{name=@{name}}}{{school=@{school}}} {{level=@{spellclass-0-name} 2}} {{casting_time=@{cast-time}}} {{components=@{components}}} {{range=@{range}}} {{target=@{targets}}} {{duration=@{duration}}} {{saving_throw=@{save}}} {{sr=@{sr}}} {{mel_attack=[[1d20+@{attk-melee}]]}} {{rng_attack=[[1d20 + @{attk-ranged}]]}} {{damage=1d3([[1d3]])}} {{spell_description=@{description}}}</textarea>
 					<hr>
 				</fieldset>
 			</div>
@@ -1919,7 +1944,7 @@
 					<br>
 					<b>Show Macro Text?</b>
 					<input type="checkbox" class="sheet-macro-show" title="repeating_lvl-3-spells_X_macro-text-show" name="attr_macro-text-show" value="1" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;"/><span></span>
-					<textarea class="sheet-macro" title="repeating_lvl-3-spells_X_macro-text" name="attr_macro-text">/em casts @{name}!&#x00A;School: @{school}; Level 3&#x00A;Casting Time: @{cast-time}&#x00A;Components: @{components}&#x00A;Range: @{range}&#x00A;Targets/Area: @{targets}&#x00A;Duration: @{duration}&#x00A;Saving Throw: DC [[@{spellclass-0-level-3-savedc}]], @{save}; Spell Resistance: @{sr}&#x00A;Uses Remaining: [[@{used} - 1]]&#x00A;&#x00A;@{description}</textarea>
+					<textarea class="sheet-macro" title="Remove Melee and Ranged Attack and Damage as appropriate" name="attr_macro-text">/em casts @{name}!&#x00A;&{template:pf_spell} {{name=@{name}}}{{school=@{school}}} {{level=@{spellclass-0-name} 3}} {{casting_time=@{cast-time}}} {{components=@{components}}} {{range=@{range}}} {{target=@{targets}}} {{duration=@{duration}}} {{saving_throw=@{save}}} {{sr=@{sr}}} {{mel_attack=[[1d20+@{attk-melee}]]}} {{rng_attack=[[1d20 + @{attk-ranged}]]}} {{damage=1d3([[1d3]])}} {{spell_description=@{description}}}</textarea>
 					<hr>
 				</fieldset>
 			</div>
@@ -1968,7 +1993,7 @@
 					<br>
 					<b>Show Macro Text?</b>
 					<input type="checkbox" class="sheet-macro-show" title="repeating_lvl-4-spells_X_macro-text-show" name="attr_macro-text-show" value="1" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;"/><span></span>
-					<textarea class="sheet-macro" title="repeating_lvl-4-spells_X_macro-text" name="attr_macro-text">/em casts @{name}!&#x00A;School: @{school}; Level 4&#x00A;Casting Time: @{cast-time}&#x00A;Components: @{components}&#x00A;Range: @{range}&#x00A;Targets/Area: @{targets}&#x00A;Duration: @{duration}&#x00A;Saving Throw: DC [[@{spellclass-0-level-4-savedc}]], @{save}; Spell Resistance: @{sr}&#x00A;Uses Remaining: [[@{used} - 1]]&#x00A;&#x00A;@{description}</textarea>
+					<textarea class="sheet-macro" title="Remove Melee and Ranged Attack and Damage as appropriate" name="attr_macro-text">/em casts @{name}!&#x00A;&{template:pf_spell} {{name=@{name}}}{{school=@{school}}} {{level=@{spellclass-0-name} 4}} {{casting_time=@{cast-time}}} {{components=@{components}}} {{range=@{range}}} {{target=@{targets}}} {{duration=@{duration}}} {{saving_throw=@{save}}} {{sr=@{sr}}} {{mel_attack=[[1d20+@{attk-melee}]]}} {{rng_attack=[[1d20 + @{attk-ranged}]]}} {{damage=1d3([[1d3]])}} {{spell_description=@{description}}}</textarea>
 					<hr>
 				</fieldset>
 			</div>
@@ -2017,7 +2042,7 @@
 					<br>
 					<b>Show Macro Text?</b>
 					<input type="checkbox" class="sheet-macro-show" title="repeating_lvl-5-spells_X_macro-text-show" name="attr_macro-text-show" value="1" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;"/><span></span>
-					<textarea class="sheet-macro" title="repeating_lvl-5-spells_X_macro-text" name="attr_macro-text">/em casts @{name}!&#x00A;School: @{school}; Level 5&#x00A;Casting Time: @{cast-time}&#x00A;Components: @{components}&#x00A;Range: @{range}&#x00A;Targets/Area: @{targets}&#x00A;Duration: @{duration}&#x00A;Saving Throw: DC [[@{spellclass-0-level-5-savedc}]], @{save}; Spell Resistance: @{sr}&#x00A;Uses Remaining: [[@{used} - 1]]&#x00A;&#x00A;@{description}</textarea>
+					<textarea class="sheet-macro" title="Remove Melee and Ranged Attack and Damage as appropriate" name="attr_macro-text">/em casts @{name}!&#x00A;&{template:pf_spell} {{name=@{name}}}{{school=@{school}}} {{level=@{spellclass-0-name} 5}} {{casting_time=@{cast-time}}} {{components=@{components}}} {{range=@{range}}} {{target=@{targets}}} {{duration=@{duration}}} {{saving_throw=@{save}}} {{sr=@{sr}}} {{mel_attack=[[1d20+@{attk-melee}]]}} {{rng_attack=[[1d20 + @{attk-ranged}]]}} {{damage=1d3([[1d3]])}} {{spell_description=@{description}}}</textarea>
 					<hr>
 				</fieldset>
 			</div>
@@ -2066,7 +2091,7 @@
 					<br>
 					<b>Show Macro Text?</b>
 					<input type="checkbox" class="sheet-macro-show" title="repeating_lvl-6-spells_X_macro-text-show" name="attr_macro-text-show" value="1" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;"/><span></span>
-					<textarea class="sheet-macro" title="repeating_lvl-6-spells_X_macro-text" name="attr_macro-text">/em casts @{name}!&#x00A;School: @{school}; Level 6&#x00A;Casting Time: @{cast-time}&#x00A;Components: @{components}&#x00A;Range: @{range}&#x00A;Targets/Area: @{targets}&#x00A;Duration: @{duration}&#x00A;Saving Throw: DC [[@{spellclass-0-level-6-savedc}]], @{save}; Spell Resistance: @{sr}&#x00A;Uses Remaining: [[@{used} - 1]]&#x00A;&#x00A;@{description}</textarea>
+					<textarea class="sheet-macro" title="Remove Melee and Ranged Attack and Damage as appropriate" name="attr_macro-text">/em casts @{name}!&#x00A;&{template:pf_spell} {{name=@{name}}}{{school=@{school}}} {{level=@{spellclass-0-name} 6}} {{casting_time=@{cast-time}}} {{components=@{components}}} {{range=@{range}}} {{target=@{targets}}} {{duration=@{duration}}} {{saving_throw=@{save}}} {{sr=@{sr}}} {{mel_attack=[[1d20+@{attk-melee}]]}} {{rng_attack=[[1d20 + @{attk-ranged}]]}} {{damage=1d3([[1d3]])}} {{spell_description=@{description}}}</textarea>
 					<hr>
 				</fieldset>
 			</div>
@@ -2115,7 +2140,7 @@
 					<br>
 					<b>Show Macro Text?</b>
 					<input type="checkbox" class="sheet-macro-show" title="repeating_lvl-7-spells_X_macro-text-show" name="attr_macro-text-show" value="1" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;"/><span></span>
-					<textarea class="sheet-macro" title="repeating_lvl-7-spells_X_macro-text" name="attr_macro-text">/em casts @{name}!&#x00A;School: @{school}; Level 7&#x00A;Casting Time: @{cast-time}&#x00A;Components: @{components}&#x00A;Range: @{range}&#x00A;Targets/Area: @{targets}&#x00A;Duration: @{duration}&#x00A;Saving Throw: DC [[@{spellclass-0-level-7-savedc}]], @{save}; Spell Resistance: @{sr}&#x00A;Uses Remaining: [[@{used} - 1]]&#x00A;&#x00A;@{description}</textarea>
+					<textarea class="sheet-macro" title="Remove Melee and Ranged Attack and Damage as appropriate" name="attr_macro-text">/em casts @{name}!&#x00A;&{template:pf_spell} {{name=@{name}}}{{school=@{school}}} {{level=@{spellclass-0-name} 7}} {{casting_time=@{cast-time}}} {{components=@{components}}} {{range=@{range}}} {{target=@{targets}}} {{duration=@{duration}}} {{saving_throw=@{save}}} {{sr=@{sr}}} {{mel_attack=[[1d20+@{attk-melee}]]}} {{rng_attack=[[1d20 + @{attk-ranged}]]}} {{damage=1d3([[1d3]])}} {{spell_description=@{description}}}</textarea>
 					<hr>
 				</fieldset>
 			</div>
@@ -2164,7 +2189,7 @@
 					<br>
 					<b>Show Macro Text?</b>
 					<input type="checkbox" class="sheet-macro-show" title="repeating_lvl-8-spells_X_macro-text-show" name="attr_macro-text-show" value="1" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;"/><span></span>
-					<textarea class="sheet-macro" title="repeating_lvl-8-spells_X_macro-text" name="attr_macro-text">/em casts @{name}!&#x00A;School: @{school}; Level 8&#x00A;Casting Time: @{cast-time}&#x00A;Components: @{components}&#x00A;Range: @{range}&#x00A;Targets/Area: @{targets}&#x00A;Duration: @{duration}&#x00A;Saving Throw: DC [[@{spellclass-0-level-8-savedc}]], @{save}; Spell Resistance: @{sr}&#x00A;Uses Remaining: [[@{used} - 1]]&#x00A;&#x00A;@{description}</textarea>
+					<textarea class="sheet-macro" title="Remove Melee and Ranged Attack and Damage as appropriate" name="attr_macro-text">/em casts @{name}!&#x00A;&{template:pf_spell} {{name=@{name}}}{{school=@{school}}} {{level=@{spellclass-0-name} 8}} {{casting_time=@{cast-time}}} {{components=@{components}}} {{range=@{range}}} {{target=@{targets}}} {{duration=@{duration}}} {{saving_throw=@{save}}} {{sr=@{sr}}} {{mel_attack=[[1d20+@{attk-melee}]]}} {{rng_attack=[[1d20 + @{attk-ranged}]]}} {{damage=1d3([[1d3]])}} {{spell_description=@{description}}}</textarea>
 					<hr>
 				</fieldset>
 			</div>
@@ -2213,7 +2238,7 @@
 					<br>
 					<b>Show Macro Text?</b>
 					<input type="checkbox" class="sheet-macro-show" title="repeating_lvl-9-spells_X_macro-text-show" name="attr_macro-text-show" value="1" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;"/><span></span>
-					<textarea class="sheet-macro" title="repeating_lvl-9-spells_X_macro-text" name="attr_macro-text">/em casts @{name}!&#x00A;School: @{school}; Level 9&#x00A;Casting Time: @{cast-time}&#x00A;Components: @{components}&#x00A;Range: @{range}&#x00A;Targets/Area: @{targets}&#x00A;Duration: @{duration}&#x00A;Saving Throw: DC [[@{spellclass-0-level-9-savedc}]], @{save}; Spell Resistance: @{sr}&#x00A;Uses Remaining: [[@{used} - 1]]&#x00A;&#x00A;@{description}</textarea>
+					<textarea class="sheet-macro" title="Remove Melee and Ranged Attack and Damage as appropriate" name="attr_macro-text">/em casts @{name}!&#x00A;&{template:pf_spell} {{name=@{name}}}{{school=@{school}}} {{level=@{spellclass-0-name} 9}} {{casting_time=@{cast-time}}} {{components=@{components}}} {{range=@{range}}} {{target=@{targets}}} {{duration=@{duration}}} {{saving_throw=@{save}}} {{sr=@{sr}}} {{mel_attack=[[1d20+@{attk-melee}]]}} {{rng_attack=[[1d20 + @{attk-ranged}]]}} {{damage=1d3([[1d3]])}} {{spell_description=@{description}}}</textarea>
 					<hr>
 				</fieldset>
 			</div>
@@ -2239,11 +2264,7 @@
 			</div>
 			<div class="sheet-table-row">
 				<span class="sheet-table-data-left" style="width:15%;">
-					<select title="gender" name="attr_gender">
-						<option value="none">None</option>
-						<option value="male">Male</option>
-						<option value="female">Female</option>
-					</select>  
+					<input type="text" title="gender" name="attr_gender"> 
 				</span> 
 				<span class="sheet-table-data-center"><input type="text" title="class-0-name" name="attr_class-0-name"/></span>
 				<span class="sheet-table-data-center" style="width:5%;"><input type="number" title="class-0-level" name="attr_class-0-level" value="0"/></span>
@@ -2294,7 +2315,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 style="font-size:100%;" title="NPC-Initiative-Roll" type="roll" name="roll_NPC-Initiative-Roll" value="/w gm @{character_name}'s Initiative result: [[1d20 + @{init} &amp;{tracker}]]&#x00A;/w gm Initiative bonus: [[@{init}]]">Init</button></span>
+				<span class="sheet-table-data-left" style="width:5%;"><button style="font-size:100%;" title="NPC-Initiative-Roll" type="roll" name="roll_NPC-Initiative-Roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Initiative Roll}} {{init=[[1d20 + @{init} + 0.01 * @{init} &{tracker}]]}}">Init</button></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>
 				<span class="sheet-table-data-left" style="width:7%;"><b>Senses </b></span>
@@ -2379,13 +2400,13 @@
 				<span class="sheet-table-header" style="text-align:left;"></span>
 			</div>
 			<div class="sheet-table-row">	
-				<span class="sheet-table-data-left"><button style="font-size:100%;" title="NPC-Fort-Save" type="roll" name="roll_NPC-Fort-Save" value="/w gm @{character_name}'s Fort save: [[1d20 + @{Fort}]]">Fort</button></span>
+				<span class="sheet-table-data-left"><button style="font-size:100%;" title="NPC-Fort-Save" type="roll" name="roll_NPC-Fort-Save" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Fort save}} {{skill_chk=[[1d20 + @{Fort}]]}}">Fort</button></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 style="font-size:100%;" title="NPC-Ref-Save" type="roll" name="roll_NPC-Ref-Save" value="/w gm @{character_name}'s Ref save: [[1d20 + @{Ref}]]">Ref</button></span>
+				<span class="sheet-table-data-left"><button style="font-size:100%;" title="NPC-Ref-Save" type="roll" name="roll_NPC-Ref-Save" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Ref save}} {{skill_chk=[[1d20 + @{Ref}]]}}">Ref</button></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 style="font-size:100%;" title="NPC-Will-Save" type="roll" name="roll_NPC-Will-Save" value="/w gm @{character_name}'s Will save: [[1d20 + @{Will}]]">Will</button></span>
+				<span class="sheet-table-data-left"><button style="font-size:100%;" title="NPC-Will-Save" type="roll" name="roll_NPC-Will-Save" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Will save}} {{skill_chk=[[1d20 + @{Will}]]}}">Will</button></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>
 				<span class="sheet-table-data-left"><input type="text" title="npc-racial-save-mods" name="attr_npc-racial-save-mods" value="Racial save modifiers"></span>
@@ -2446,29 +2467,83 @@
 		<br>
 		<b>Weapons/Attacks</b>
 		<input type="checkbox" class="sheet-npc-weapons-show" title="npc-weapons-show" name="attr_npc-weapons-show" value="1" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;" checked/><span></span>
-		<div class="sheet-npc-weapons">
-			<div class="sheet-table">
-				<div class="sheet-table-row">
-					<span class="sheet-table-header" style="width:5%;"></span>
-					<span class="sheet-table-header">Name</span>
-					<span class="sheet-table-header" style="width:5%;">Attack</span>
-					<span class="sheet-table-header" style="width:10%;">Damage</span>
-					<span class="sheet-table-header" style="width:10%;">Crit</span>
-					<span class="sheet-table-header" style="width:10%;">Notes</span>
+		<div class="sheet-npc-weapons"><fieldset class="repeating_weapon">  
+        		<div class="sheet-table">
+					<div class="sheet-table-row1">
+						<span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" min="0" name="attr_enhance" title="@{repeating_weapon_X_enhance}"><br>Enhance</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="checkbox" name="attr_masterwork" title="@{repeating_weapon_X_masterwork}" value="1"><br>Mwk</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_name" title="@{repeating_weapon_X_name}" placeholder="Name"><br>Name</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_attack" title="@{repeating_weapon_X_attack}" placeholder="Attack Modifiers"><br>Attack Mods</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;">
+							<select title="@{repeating_weapon_X_attack-type}" name="attr_attack-type">
+								<option value="0" selected>None</option>
+								<option value="@{attk-melee}">Melee</option>
+								<option value="@{attk-ranged}">Ranged</option>
+							</select>
+							<br>Attack Type
+						</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_total-attack" title="@{repeating_weapon_X_total-attack}" value="(@{proficiency} + (((@{enhance} + @{masterwork}) + abs(@{enhance} - @{masterwork})) / 2) + @{attack} + @{attack-type})" disabled><br>ATK</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_damage-dice-num" title="@{repeating_weapon_X_damage-dice-num}" min="0"><br>Dice</span>
+						<span class="sheet-table-data sheet-center" style="vertical-align:middle;font-size:150%;width:2%;">d</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_damage-die" title="@{repeating_weapon_X_damage-die}" min="0"><br>Die</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_damage" title="@{repeating_weapon_X_damage}" placeholder="Damage Modifiers"><br>Damage Mods</span>
+						<span class="sheet-table-data sheet-center" style="width:15%;">
+							<select title="@{repeating_weapon_X_damage-ability}" name="attr_damage-ability">
+								<option value="0" selected>None</option>
+								<option value="floor(0.5 * @{STR-mod})">1/2 STR</option>
+								<option value="floor(0.5 * @{DEX-mod})">1/2 DEX</option>
+								<option value="floor(0.5 * @{CON-mod})">1/2 CON</option>
+								<option value="floor(0.5 * @{INT-mod})">1/2 INT</option>
+								<option value="floor(0.5 * @{WIS-mod})">1/2 WIS</option>
+								<option value="floor(0.5 * @{CHA-mod})">1/2 CHA</option>
+								<option value="@{STR-mod}">STR</option>
+								<option value="@{DEX-mod}">DEX</option>
+								<option value="@{CON-mod}">CON</option>
+								<option value="@{INT-mod}">INT</option>
+								<option value="@{WIS-mod}">WIS</option>
+								<option value="@{CHA-mod}">CHA</option>
+								<option value="floor(1.5 * @{STR-mod})">1.5x STR</option>
+								<option value="floor(1.5 * @{DEX-mod})">1.5x DEX</option>
+								<option value="floor(1.5 * @{CON-mod})">1.5x CON</option>
+								<option value="floor(1.5 * @{INT-mod})">1.5x INT</option>
+								<option value="floor(1.5 * @{WIS-mod})">1.5x WIS</option>
+								<option value="floor(1.5 * @{CHA-mod})">1.5x CHA</option>
+								<option value="floor(2 * @{STR-mod})">2x STR</option>
+								<option value="floor(2 * @{DEX-mod})">2x DEX</option>
+								<option value="floor(2 * @{CON-mod})">2x CON</option>
+								<option value="floor(2 * @{INT-mod})">2x INT</option>
+								<option value="floor(2 * @{WIS-mod})">2x WIS</option>
+								<option value="floor(2 * @{CHA-mod})">2x CHA</option>
+							</select>
+							<br>Damage Ability
+						</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_total-damage" title="@{repeating_weapon_X_total-damage}" value="(@{enhance} + @{damage} + @{damage-ability})" disabled><br>DMG</span>
+					</div>
 				</div>
-			</div>
-			<fieldset class="repeating_weapon">  
-				<span class="sheet-table-data-center" style="width:5%;"><button style="font-size:100%;" title="NPC-Attack-Roll (not useable in macros or abilities)" type="roll" name="roll_NPC-Attack-Roll" value="@{macro-text}"></button></span>
-				<span class="sheet-table-data-center"><input title="repeating_weapon_X_name" type="text" name="attr_name"></span>
-				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_weapon_X_attack" type="number" name="attr_attack" value="0"></span>
-				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_weapon_X_damage" type="text" name="attr_damage" value="0d0 + 0"></span>
-				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_weapon_X_crit" type="text" name="attr_crit" value="20/x2"></span>
-				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_weapon_X_notes" type="text" name="attr_notes"></span>
-        <b>Show Macro Text?</b>
-				<input type="checkbox" class="sheet-section-show" title="repeating_weapon_X_macro-text-show" name="attr_macro-text-show" value="1" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;"/><span></span>
-				<textarea class="sheet-section" title="repeating_weapon_X_macro-text" name="attr_macro-text">/w gm @{character_name} is attacking with @{name}&#x00A;/w gm Attack Result: [[1d20 + @{attack}]]&#x00A;/w gm Damage Result: [[@{damage}]]&#x00A;/w gm Crit: @{crit}&#x00A;/w gm Notes: @{notes}</textarea>
-				<br>
-				<span>&nbsp;</span>
+				<div class="sheet-table">
+					<div class="sheet-table-row1">
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_crit-target" title="@{repeating_weapon_X_crit-target}" min="0" max="20"><br>Crit</span>
+						<span class="sheet-table-data sheet-center" style="vertical-align:middle;font-size:150%;width:2%;"><b>/x</b></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_crit-multiplier" title="@{repeating_weapon_X_crit-multiplier}" min="0"><br>Multiplier</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_range" title="@{repeating_weapon_X_range}" value="0" min="0"><br>Range</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_type" title="@{repeating_weapon_X_type}" placeholder="Damage Type"><br>Damage Type</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_weight" title="@{repeating_weapon_X_weight}" value="0" step="any" min="0"><br>Weight</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_ammo" title="@{repeating_weapon_X_ammo}" value="0"><br>Ammo</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;">
+							<select title="@{repeating_weapon_X_proficiency}" name="attr_proficiency">
+								<option value="0">Yes</option>
+								<option value="-4" selected>No</option>
+							</select>
+							<br>Proficiency
+						</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:48%;"><input type="text" name="attr_notes" title="@{repeating_weapon_X_notes}" placeholder="Attack Notes"><br>Notes</span>
+					</div>
+				</div>
+				<b>Macro Text&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
+				<input type="checkbox" class="sheet-macro-show" title="@{repeating_weapon_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" /><span></span>
+				<textarea class="sheet-macro" title="@{repeating_weapon_X_macro-text}" name="attr_macro-text">/w gm &{template:PFAttack} {{name=@{character_name}'s @{name}}} {{subtags=@{type}}} {{attack=[[1d20cs>@{crit-target}+@{total-attack}]]}} {{damage=[[@{damage-dice-num}d@{damage-die}+@{total-damage}]]}} {{confirm=[[1d20+@{total-attack}]]}} {{dmgcrit=[[(@{damage-dice-num} * (@{crit-multiplier} - 1))d@{damage-die} + (@{total-damage} * (@{crit-multiplier} - 1))]]}} {{notes=@{notes}}} {{attk-notes=@{attack-notes}}}}</textarea>
+				<hr>		
 			</fieldset>
 		</div>
 		<br>
@@ -2482,9 +2557,18 @@
 		<input type="checkbox" class="sheet-npc-special-attacks-show" title="npc-special-attacks-show" name="attr_npc-special-attacks-show" value="1" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;" checked/><span></span>		
 		<textarea style="height:50px;" 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 style="font-size:100%;" title="NPC-Spell-Class-0-CL-Check" type="roll" name="roll_NPC-Spell-Class-0-CL-Check" value="/w gm @{character_name}'s @{spellclass-0-name} caster level check: [[1d20 + @{spellclass-0-level}]]">CL</button>
-		<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" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;" checked/><span></span>
+        <b>Spell-Like Abilities</b> (<button style="font-size:100%;" title="NPC-Spell-Class-0-CL-Check" type="roll" name="roll_NPC-Spell-Class-0-CL-Check" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Caster Level Check}} {{caster_class=@{spellclass-1-name} **@{spellclass-1-level}**}} {{caster_lvl_chk=[[1d20 + @{spellclass-1-level}]]}}">CL</button></span>
+        <select style="width:100px;align:left;" title="Caster Class" name="attr_spellclass-0-name">
+            <option>Bard</option>
+		    <option>Cleric</option>
+            <option>Druid</option>
+            <option>Paladin</option>
+            <option>Ranger</option>
+            <option>Sorcerer</option>
+            <option selected>Wizard</option>
+		</select>
+        <input title="spellclass-0-level" type="number" name="attr_spellclass-0-level" value="0">)</span>
+	    <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" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;" checked/><span> </span></span>
 		<div class="sheet-npc-spell-like-abilities">
 			<div class="sheet-table">
 				<div class="sheet-table-row">
@@ -2515,9 +2599,18 @@
 			</fieldset>
 		</div>
 		<br>
-		<b>Spells</b> (<button style="font-size:100%;" title="NPC-Spell-Class-1-CL-Check" type="roll" name="roll_NPC-Spell-Class-1-CL-Check" value="/w gm @{character_name}'s @{spellclass-1-name} caster level check: [[1d20 + @{spellclass-1-level}]]">CL</button>
-		<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" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;" checked/><span></span>
+		<b>Spells</b> (<button style="font-size:100%;" title="NPC-Spell-Class-1-CL-Check" type="roll" name="roll_NPC-Spell-Class-1-CL-Check" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Caster Level Check}} {{caster_class=@{spellclass-1-name} **@{spellclass-1-level}**}} {{caster_lvl_chk=[[1d20 + @{spellclass-1-level}]]}}">CL</button></span>
+		<select style="width:100px;align:left;" title="Caster Class" name="attr_spellclass-1-name">
+            <option>Bard</option>
+		    <option>Cleric</option>
+            <option>Druid</option>
+            <option>Paladin</option>
+            <option>Ranger</option>
+            <option>Sorcerer</option>
+            <option selected>Wizard</option>
+		</select>
+		<input title="spellclass-1-level" type="number" name="attr_spellclass-1-level" value="0">)</span>
+		<input type="checkbox" class="sheet-npc-spells-show" title="npc-spells-show" name="attr_npc-spells-show" value="1" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;" checked/><span></span></span>
 		<div class="sheet-npc-spells">
 			<div class="sheet-table">
 				<div class="sheet-table-row">
@@ -2573,17 +2666,17 @@
 	<input type="checkbox" class="sheet-npc-statistics-show" title="npc-statistics-show" name="attr_npc-statistics-show" value="1" style="opacity:0;width: 16px;height: 16px;position: relative;top: 5px;left: 6px;margin: -10px;cursor: pointer;z-index: 1;" checked/><span></span>
 	<hr/>
 	<div style="text-align:left;" class="sheet-npc-statistics">
-		<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-STR-Check" type="roll" name="roll_NPC-STR-Check" value="/w gm @{character_name}'s STR Check: [[1d20 + @{STR-mod}]]">Str</button></span>
+		<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-STR-Check" type="roll" name="roll_NPC-STR-Check" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=STR Check}} {{skill_chk=[[1d20 + @{STR-mod}]]}}">Str</button></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 style="font-size:100%;" title="NPC-DEX-Check" type="roll" name="roll_NPC-DEX-Check" value="/w gm @{character_name}'s DEX Check: [[1d20 + @{DEX-mod}]]">Dex</button></span>
+		<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-DEX-Check" type="roll" name="roll_NPC-DEX-Check" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=DEX Check}} {{skill_chk=[[1d20 + @{DEX-mod}]]}}">Dex</button></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 style="font-size:100%;" title="NPC-CON-Check" type="roll" name="roll_NPC-CON-Check" value="/w gm @{character_name}'s CON Check: [[1d20 + @{CON-mod}]]">Con</button></span>
+		<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-CON-Check" type="roll" name="roll_NPC-CON-Check" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=CON Check}} {{skill_chk=[[1d20 + @{CON-mod}]]}}">Con</button></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 style="font-size:100%;" title="NPC-INT-Check" type="roll" name="roll_NPC-INT-Check" value="/w gm @{character_name}'s INT Check: [[1d20 + @{INT-mod}]]">Int</button></span>
+		<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-INT-Check" type="roll" name="roll_NPC-INT-Check" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=INT Check}} {{skill_chk=[[1d20 + @{INT-mod}]]}}">Int</button></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 style="font-size:100%;" title="NPC-WIS-Check" type="roll" name="roll_NPC-WIS-Check" value="/w gm @{character_name}'s WIS Check: [[1d20 + @{WIS-mod}]]">Wis</button></span>
+		<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-WIS-Check" type="roll" name="roll_NPC-WIS-Check" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=WIS Check}} {{skill_chk=[[1d20 + @{WIS-mod}]]}}">Wis</button></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 style="font-size:100%;" title="NPC-CHA-Check" type="roll" name="roll_NPC-CHA-Check" value="/w gm @{character_name}'s CHA Check: [[1d20 + @{CHA-mod}]]">Cha</button></span>
+		<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-CHA-Check" type="roll" name="roll_NPC-CHA-Check" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=CHA Check}} {{skill_chk=[[1d20 + @{CHA-mod}]]}}">Cha</button></span>
 		<span class="sheet-table-data-left"><input title="CHA-base" type="number" name="attr_CHA-base" value="10"></span> 
 		<br>
 		<div class="sheet-table">
@@ -2602,7 +2695,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 style="font-size:100%;" type="roll" title="NPC-CMB-Check" name="roll_NPC-CMB-Check" value="/w gm @{character_name}'s CMB check: [[1d20 + @{CMB}]]">CMB</button></span>
+				<span class="sheet-table-data-left"><button style="font-size:100%;" type="roll" title="NPC-CMB-Check" name="roll_NPC-CMB-Check" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Combat Manuever}} {{skill_chk=[[1d20 + @{CMB}]]}}">CMB</button></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>
 				<span class="sheet-table-data-left" ><b>CMD</b></span> 
@@ -2665,241 +2758,241 @@
 				<span class="sheet-table-header">Misc</span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Acrobatics-Check" type="roll" value="/w gm @{character_name}'s Acrobatics check: [[1d20 + @{Acrobatics}]]" name="roll_NPC-Acrobatics-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Acrobatics-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Acrobatics check}} {{skill_chk=[[1d20 + @{Acrobatics}]]}}" name="roll_NPC-Acrobatics-Check"></button></span>
 				<span class="sheet-table-data-left">Acrobatics &bull;</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 style="font-size:100%;" title="NPC-Appraise-Check" type="roll" value="/w gm @{character_name}'s Appraise check: [[1d20 + @{Appraise}]]" name="roll_NPC-Appraise-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Appraise-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Appraise check}} {{skill_chk=[[1d20 + @{Appraise}]]}}" name="roll_NPC-Appraise-Check"></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 style="font-size:100%;" title="NPC-Bluff-Check" type="roll" value="/w gm @{character_name}'s Bluff check: [[1d20 + @{Bluff}]]" name="roll_NPC-Bluff-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Bluff-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Bluff check}} {{skill_chk=[[1d20 + @{Bluff}]]}}" name="roll_NPC-Bluff-Check"></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 style="font-size:100%;" title="NPC-Climb-Check" type="roll" value="/w gm @{character_name}'s Climb check: [[1d20 + @{Climb}]]" name="roll_NPC-Climb-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Climb-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Climb check}} {{skill_chk=[[1d20 + @{Climb}]]}}" name="roll_NPC-Climb-Check"></button></span>
 				<span class="sheet-table-data-left">Climb &bull;</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 style="font-size:100%;" title="NPC-Craft-Check" type="roll" value="/w gm @{character_name}'s Craft: @{Craft-name} check: [[1d20 + @{Craft}]]" name="roll_NPC-Craft-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Craft-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Craft: @{Craft-name} check}} {{skill_chk=[[1d20 + @{Craft}]]}}" name="roll_NPC-Craft-Check"></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 style="font-size:100%;" title="NPC-Craft2-Check" type="roll" value="/w gm @{character_name}'s Craft: @{Craft2-name} check: [[1d20 + @{Craft2}]]" name="roll_NPC-Craft2-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Craft2-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Craft: @{Craft2-name} check}} {{skill_chk=[[1d20 + @{Craft2}]]}}" name="roll_NPC-Craft2-Check"></button></span>
 				<span class="sheet-table-data-left">Craft: <input title="Craft2-name" type="text" name="attr_Craft2-name"></span>
 				<span class="sheet-table-data-center"><input title="Craft2" type="number" name="attr_Craft2" value="(@{Craft2-ranks} + @{INT-mod} + @{Craft2-trained} + @{Craft2-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Craft2-misc" type="number" name="attr_Craft2-misc" value="0"></span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Diplomacy-Check" type="roll" value="/w gm @{character_name}'s Diplomacy check: [[1d20 + @{Diplomacy}]]" name="roll_NPC-Diplomacy-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Diplomacy-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Diplomacy check}} {{skill_chk=[[1d20 + @{Diplomacy}]]}}" name="roll_NPC-Diplomacy-Check"></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>
 
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Disable-Device-Check" type="roll" value="/w gm @{character_name}'s Disable Device check: [[1d20 + @{Disable-Device}]]" name="roll_NPC-Disable-Device-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Disable-Device-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Disable Device check}} {{skill_chk=[[1d20 + @{Disable-Device}]]}}" name="roll_NPC-Disable-Device-Check"></button></span>
 				<span class="sheet-table-data-left">Disable Device &bull;</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 style="font-size:100%;" title="NPC-Disguise-Check" type="roll" value="/w gm @{character_name}'s Disguise check: [[1d20 + @{Disguise}]]" name="roll_NPC-Disguise-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Disguise-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Disguise check}} {{skill_chk=[[1d20 + @{Disguise}]]}}" name="roll_NPC-Disguise-Check"></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>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Escape-Artist-Check" type="roll" value="/w gm @{character_name}'s Escape Artist check: [[1d20 + @{Escape-Artist}]]" name="roll_NPC-Escape-Artist-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Escape-Artist-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Escape Artist check}} {{skill_chk=[[1d20 + @{Escape-Artist}]]}}" name="roll_NPC-Escape-Artist-Check"></button></span>
 				<span class="sheet-table-data-left">Escape Artist &bull;</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>
 
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Fly-Check" type="roll" value="/w gm @{character_name}'s Fly check: [[1d20 + @{Fly}]]" name="roll_NPC-Fly-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Fly-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Fly check}} {{skill_chk=[[1d20 + @{Fly}]]}}" name="roll_NPC-Fly-Check"></button></span>
 				<span class="sheet-table-data-left">Fly &bull;</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 style="font-size:100%;" title="NPC-Handle-Animal-Check" type="roll" value="/w gm @{character_name}'s Handle Animal check: [[1d20 + @{Handle-Animal}]]" name="roll_NPC-Handle-Animal-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Handle-Animal-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Handle Animal check}} {{skill_chk=[[1d20 + @{Handle-Animal}]]}}" name="roll_NPC-Handle-Animal-Check"></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>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Heal-Check" type="roll" value="/w gm @{character_name}'s Heal check: [[1d20 + @{Heal}]]" name="roll_NPC-Heal-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Heal-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Heal check}} {{skill_chk=[[1d20 + @{Heal}]]}}" name="roll_NPC-Heal-Check"></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>
 
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Intimidate-Check" type="roll" value="/w gm @{character_name}'s Intimidate check: [[1d20 + @{Intimidate}]]" name="roll_NPC-Intimidate-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Intimidate-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Intimidate check}} {{skill_chk=[[1d20 + @{Intimidate}]]}}]" name="roll_NPC-Intimidate-Check"></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 style="font-size:100%;" title="NPC-Knowledge-Arcana-Check" type="roll" value="/w gm @{character_name}'s Knowledge (Arcana) check: [[1d20 + @{Knowledge-Arcana}]]" name="roll_NPC-Knowledge-Arcana-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Knowledge-Arcana-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Arcana) check}} {{skill_chk=[[1d20 + @{Knowledge-Arcana}]]}}" name="roll_NPC-Knowledge-Arcana-Check"></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>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Knowledge-Dungeoneering-Check" type="roll" value="/w gm @{character_name}'s Knowledge (Dungeoneering) check: [[1d20 + @{Knowledge-Dungeoneering}]]" name="roll_NPC-Knowledge-Dungeoneering-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Knowledge-Dungeoneering-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Dungeoneering) check}} {{skill_chk=[[1d20 + @{Knowledge-Dungeoneering}]]}}" name="roll_NPC-Knowledge-Dungeoneering-Check"></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>
 
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Knowledge-Engineering-Check" type="roll" value="/w gm @{character_name}'s Knowledge (Engineering) check: [[1d20 + @{Knowledge-Engineering}]]" name="roll_NPC-Knowledge-Engineering-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Knowledge-Engineering-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Engineering) check}} {{skill_chk=[[1d20 + @{Knowledge-Engineering}]]}}" name="roll_NPC-Knowledge-Engineering-Check"></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 style="font-size:100%;" title="NPC-Knowledge-Geography-Check" type="roll" value="/w gm @{character_name}'s Knowledge (Geography) check: [[1d20 + @{Knowledge-Geography}]]" name="roll_NPC-Knowledge-Geography-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Knowledge-Geography-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Geography) check}} {{skill_chk=[[1d20 + @{Knowledge-Geography}]]}}" name="roll_NPC-Knowledge-Geography-Check"></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>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Knowledge-History-Check" type="roll" value="/w gm @{character_name}'s Knowledge (History) check: [[1d20 + @{Knowledge-History}]]" name="roll_NPC-Knowledge-History-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Knowledge-History-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (History) check}} {{skill_chk=[[1d20 + @{Knowledge-History}]]}}" name="roll_NPC-Knowledge-History-Check"></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>
 
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Knowledge-Local-Check" type="roll" value="/w gm @{character_name}'s Knowledge (Local) check: [[1d20 + @{Knowledge-Local}]]" name="roll_NPC-Knowledge-Local-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Knowledge-Local-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Local) check}} {{skill_chk=[[1d20 + @{Knowledge-Local}]]}}" name="roll_NPC-Knowledge-Local-Check"></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 style="font-size:100%;" title="NPC-Knowledge-Nature-Check" type="roll" value="/w gm @{character_name}'s Knowledge (Nature) check: [[1d20 + @{Knowledge-Nature}]]" name="roll_NPC-Knowledge-Nature-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Knowledge-Nature-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Nature) check}} {{skill_chk=[[1d20 + @{Knowledge-Nature}]]}}" name="roll_NPC-Knowledge-Nature-Check"></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>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Knowledge-Nobility-Check" type="roll" value="/w gm @{character_name}'s Knowledge (Nobility) check: [[1d20 + @{Knowledge-Nobility}]]" name="roll_NPC-Knowledge-Nobility-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Knowledge-Nobility-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Nobility) check}} {{skill_chk=[[1d20 + @{Knowledge-Nobility}]]}}" name="roll_NPC-Knowledge-Nobility-Check"></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>
 
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Knowledge-Planes-Check" type="roll" value="/w gm @{character_name}'s Knowledge (Planes) check: [[1d20 + @{Knowledge-Planes}]]" name="roll_NPC-Knowledge-Planes-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Knowledge-Planes-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Planes) check}} {{skill_chk=[[1d20 + @{Knowledge-Planes}]]}}" name="roll_NPC-Knowledge-Planes-Check"></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 style="font-size:100%;" title="NPC-Knowledge-Religion-Check" type="roll" value="/w gm @{character_name}'s Knowledge (Religion) check: [[1d20 + @{Knowledge-Religion}]]" name="roll_NPC-Knowledge-Religion-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Knowledge-Religion-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Knowledge (Religion) check}} {{skill_chk=[[1d20 + @{Knowledge-Religion}]]}}" name="roll_NPC-Knowledge-Religion-Check"></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>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Linguistics-Check" type="roll" value="/w gm @{character_name}'s Linguistics check: [[1d20 + @{Linguistics}]]" name="roll_NPC-Linguistics-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Linguistics-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Linguistics check}} {{skill_chk=[[1d20 + @{Linguistics}]]}}" name="roll_NPC-Linguistics-Check"></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>
 
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Perception-Check" type="roll" value="/w gm @{character_name}'s Perception check: [[1d20 + @{Perception}]]" name="roll_NPC-Perception-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Perception-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Perception check}} {{skill_chk=[[1d20 + @{Perception}]]}}" name="roll_NPC-Perception-Check"></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 style="font-size:100%;" title="NPC-Perform-Check" type="roll" value="/w gm @{character_name}'s Perform: @{Perform-name} check: [[1d20 + @{Perform}]]" name="roll_NPC-Perform-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Perform-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Perform: @{Perform-name} check}} {{skill_chk=[[1d20 + @{Perform}]]}}" name="roll_NPC-Perform-Check"></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>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Perform2-Check" type="roll" value="/w gm @{character_name}'s Perform: @{Perform2-name} check: [[1d20 + @{Perform2}]]" name="roll_NPC-Perform2-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Perform2-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Perform: @{Perform2-name} check}} {{skill_chk=[[1d20 + @{Perform2}]]}}" name="roll_NPC-Perform2-Check"></button></span>
 				<span class="sheet-table-data-left">Perform:<input title="Perform2-name" type="text" name="attr_Perform2-name"></span>
 				<span class="sheet-table-data-center"><input title="Perform2" type="number" name="attr_Perform2" value="(@{Perform2-ranks} + @{CHA-mod} + @{Perform2-trained} + @{Perform2-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Perform2-misc" type="number" name="attr_Perform2-misc" value="0"></span>
 
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Profession-Check" type="roll" value="/w gm @{character_name}'s Profession: @{Profession-name} check: [[1d20 + @{Profession}]]" name="roll_NPC-Profession-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Profession-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Profession: @{Profession-name} check}} {{skill_chk=[[1d20 + @{Profession}]]}}" name="roll_NPC-Profession-Check"></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>
 
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Profession2-Check" type="roll" value="/w gm @{character_name}'s Profession: @{Profession2-name} check: [[1d20 + @{Profession2}]]" name="roll_NPC-Profession2-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Profession2-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Profession: @{Profession2-name} check}} {{skill_chk=[[1d20 + @{Profession2}]]}}" name="roll_NPC-Profession2-Check"></button></span>
 				<span class="sheet-table-data-left">Profession:<input title="Profession2-name" type="text" name="attr_Profession2-name"></span>
 				<span class="sheet-table-data-center"><input title="Profession2" type="number" name="attr_Profession2" value="(@{Profession2-ranks} + @{WIS-mod} + @{Profession2-trained} + @{Profession2-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Profession2-misc" type="number" name="attr_Profession2-misc" value="0"></span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Ride-Check" type="roll" value="/w gm @{character_name}'s Ride check: [[1d20 + @{Ride}]]" name="roll_NPC-Ride-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Ride-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Ride check}} {{skill_chk=[[1d20 + @{Ride}]]}}" name="roll_NPC-Ride-Check"></button></span>
 				<span class="sheet-table-data-left">Ride &bull;</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 style="font-size:100%;" title="NPC-Sense-Motive-Check" type="roll" value="/w gm @{character_name}'s Sense-Motive check: [[1d20 + @{Sense-Motive}]]" name="roll_NPC-Sense-Motive-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Sense-Motive-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Sense Motive check}} {{skill_chk=[[1d20 + @{Sense-Motive}]]}}" name="roll_NPC-Sense-Motive-Check"></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 style="font-size:100%;" title="NPC-Sleight-of-Hand-Check" type="roll" value="/w gm @{character_name}'s Sleight of Hand check: [[1d20 + @{Sleight-of-Hand}]]" name="roll_NPC-Sleight-of-Hand-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Sleight-of-Hand-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Sleight of Hand check}} {{skill_chk=[[1d20 + @{Sleight-of-Hand}]]}}" name="roll_NPC-Sleight-of-Hand-Check"></button></span>
 				<span class="sheet-table-data-left">Sleight of Hand &bull;</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 style="font-size:100%;" title="NPC-Spellcraft-Check" type="roll" value="/w gm @{character_name}'s Spellcraft check: [[1d20 + @{Spellcraft}]]" name="roll_NPC-Spellcraft-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Spellcraft-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Spellcraft check}} {{skill_chk=[[1d20 + @{Spellcraft}]]}}" name="roll_NPC-Spellcraft-Check"></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 style="font-size:100%;" title="NPC-Stealth-Check" type="roll" value="/w gm @{character_name}'s Stealth check: [[1d20 + @{Stealth}]]" name="roll_NPC-Stealth-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Stealth-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Stealth check}} {{skill_chk=[[1d20 + @{Stealth}]]}}" name="roll_NPC-Stealth-Check"></button></span>
 				<span class="sheet-table-data-left">Stealth &bull;</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 style="font-size:100%;" title="NPC-Survival-Check" type="roll" value="/w gm @{character_name}'s Survival check: [[1d20 + @{Survival}]]" name="roll_NPC-Survival-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Survival-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Survival check}} {{skill_chk=[[1d20 + @{Survival}]]}}" name="roll_NPC-Survival-Check"></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 style="font-size:100%;" title="NPC-Swim-Check" type="roll" value="/w gm @{character_name}'s Swim check: [[1d20 + @{Swim}]]" name="roll_NPC-Swim-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Swim-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Swim check}} {{skill_chk=[[1d20 + @{Swim}]]}}" name="roll_NPC-Swim-Check"></button></span>
 				<span class="sheet-table-data-left">Swim &bull;</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 style="font-size:100%;" title="NPC-Use-Magic-Device-Check" type="roll" value="/w gm @{character_name}'s Use Magic Device check: [[1d20 + @{Use-Magic-Device}]]" name="roll_NPC-Use-Magic-Device-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Use-Magic-Device-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Use Magic Device check}} {{skill_chk=[[1d20 + @{Use-Magic-Device}]]}}" name="roll_NPC-Use-Magic-Device-Check"></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>
 				
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Concentration-Check" type="roll" value="/w gm @{character_name}'s Concentration check: [[1d20 + @{Concentration}]]" name="roll_NPC-Concentration-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Concentration-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=Concentration check}} {{skill_chk=[[1d20 + @{Concentration}]]}}" name="roll_NPC-Concentration-Check"></button></span>
 				<span class="sheet-table-data-left">Concentration</span>
 				<span class="sheet-table-data-center"><input title="Concentration" type="number" name="attr_Concentration" value="(@{Concentration-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Concentration-misc" type="number" name="attr_Concentration-misc" value="0"></span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Misc-Skill-0-Check" type="roll" value="/w gm @{character_name}'s @{Misc-Skill-0-name} check: [[1d20 + @{Misc-Skill-0}]]" name="roll_NPC-Misc-Skill-0-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Misc-Skill-0-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=@{Misc-Skill-0-name} check}} {{skill_chk=[[1d20 + @{Misc-Skill-0}]]}}" name="roll_NPC-Misc-Skill-0-Check"></button></span>
 				<span class="sheet-table-data-left"><input type="text" title="Misc-Skill-0-name" name="attr_Misc-Skill-0-name"></span>
 				<span class="sheet-table-data-center"><input title="Misc-Skill-0" type="number" name="attr_Misc-Skill-0" value="(@{Misc-Skill-0-ranks} + @{Misc-Skill-0-ability} + @{Misc-Skill-0-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Misc-Skill-0-misc" type="number" name="attr_Misc-Skill-0-misc" value="0"></span>
 
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Misc-Skill-1-Check" type="roll" value="/w gm @{character_name}'s @{Misc-Skill-1-name} check: [[1d20 + @{Misc-Skill-1}]]" name="roll_NPC-Misc-Skill-1-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Misc-Skill-1-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=@{Misc-Skill-1-name} check}} {{skill_chk=[[1d20 + @{Misc-Skill-1}]]}}" name="roll_NPC-Misc-Skill-1-Check"></button></span>
 				<span class="sheet-table-data-left"><input type="text" title="Misc-Skill-1-name" name="attr_Misc-Skill-1-name"></span>
 				<span class="sheet-table-data-center"><input title="Misc-Skill-1" type="number" name="attr_Misc-Skill-1" value="(@{Misc-Skill-1-ranks} + @{Misc-Skill-1-ability} + @{Misc-Skill-1-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Misc-Skill-1-misc" type="number" name="attr_Misc-Skill-1-misc" value="0"></span>
 
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Misc-Skill-2-Check" type="roll" value="/w gm @{character_name}'s @{Misc-Skill-2-name} check: [[1d20 + @{Misc-Skill-2}]]" name="roll_NPC-Misc-Skill-2-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Misc-Skill-2-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=@{Misc-Skill-2-name} check}} {{skill_chk=[[1d20 + @{Misc-Skill-2}]]}}" name="roll_NPC-Misc-Skill-2-Check"></button></span>
 				<span class="sheet-table-data-left"><input type="text" title="Misc-Skill-2-name" name="attr_Misc-Skill-2-name"></span>
 				<span class="sheet-table-data-center"><input title="Misc-Skill-2" type="number" name="attr_Misc-Skill-2" value="(@{Misc-Skill-2-ranks} + @{Misc-Skill-2-ability} + @{Misc-Skill-2-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Misc-Skill-2-misc" type="number" name="attr_Misc-Skill-2-misc" value="0"></span>
 			</div>
 			<div class="sheet-table-row">
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Misc-Skill-3-Check" type="roll" value="/w gm @{character_name}'s @{Misc-Skill-3-name} check: [[1d20 + @{Misc-Skill-3}]]" name="roll_NPC-Misc-Skill-3-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Misc-Skill-3-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=@{Misc-Skill-3-name} check}} {{skill_chk=[[1d20 + @{Misc-Skill-3}]]}}" name="roll_NPC-Misc-Skill-3-Check"></button></span>
 				<span class="sheet-table-data-left"><input type="text" title="Misc-Skill-3-name" name="attr_Misc-Skill-3-name"></span>
 				<span class="sheet-table-data-center"><input title="Misc-Skill-3" type="number" name="attr_Misc-Skill-3" value="(@{Misc-Skill-3-ranks} + @{Misc-Skill-3-ability} + @{Misc-Skill-3-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Misc-Skill-3-misc" type="number" name="attr_Misc-Skill-3-misc" value="0"></span>
 
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Misc-Skill-4-Check" type="roll" value="/w gm @{character_name}'s @{Misc-Skill-4-name} check: [[1d20 + @{Misc-Skill-4}]]" name="roll_NPC-Misc-Skill-4-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Misc-Skill-4-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=@{Misc-Skill-4-name} check}} {{skill_chk=[[1d20 + @{Misc-Skill-4}]]}}" name="roll_NPC-Misc-Skill-4-Check"></button></span>
 				<span class="sheet-table-data-left"><input type="text" title="Misc-Skill-4-name" name="attr_Misc-Skill-4-name"></span>
 				<span class="sheet-table-data-center"><input title="Misc-Skill-4" type="number" name="attr_Misc-Skill-4" value="(@{Misc-Skill-4-ranks} + @{Misc-Skill-4-ability} + @{Misc-Skill-4-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Misc-Skill-4-misc" type="number" name="attr_Misc-Skill-4-misc" value="0"></span>
 
-				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Misc-Skill-5-Check" type="roll" value="/w gm @{character_name}'s @{Misc-Skill-5-name} check: [[1d20 + @{Misc-Skill-5}]]" name="roll_NPC-Misc-Skill-5-Check"></button></span>
+				<span class="sheet-table-data-center"><button style="font-size:100%;" title="NPC-Misc-Skill-5-Check" type="roll" value="/w gm &{template:pf_check} {{name=@{character_name}'s}} {{check=@{Misc-Skill-5-name} check}} {{skill_chk=[[1d20 + @{Misc-Skill-5}]]}}" name="roll_NPC-Misc-Skill-5-Check"></button></span>
 				<span class="sheet-table-data-left"><input type="text" title="Misc-Skill-5-name" name="attr_Misc-Skill-5-name"></span>
 				<span class="sheet-table-data-center"><input title="Misc-Skill-5" type="number" name="attr_Misc-Skill-5" value="(@{Misc-Skill-5-ranks} + @{Misc-Skill-5-ability} + @{Misc-Skill-5-misc})" disabled></span>
 				<span class="sheet-table-data-center"><input title="Misc-Skill-5-misc" type="number" name="attr_Misc-Skill-5-misc" value="0"></span>
@@ -2950,3 +3043,98 @@
 		</fieldset>
 	</div>
 </div>
+<rolltemplate class="sheet-rolltemplate-pf_check">
+    <div class="sheet-wrapper">
+        <div class="sheet-header_background"><div class="sheet-header">{{check}}</div></div>
+        <div class="sheet-border">
+            {{#init}}
+            <div class="sheet-content"><span class="tcat">Initiative:</span> {{init}}</div>{{/init}}
+            {{#spell_fail}}
+            <div class="sheet-content"><span class="tcat">Spell Fail Chance:</span> {{spell_fail}}</div>{{/spell_fail}}
+            {{#spell_chk}}
+            <div class="sheet-content"><span class="tcat">Successful if:</span> {{spell_chk}}</div>{{/spell_chk}}
+            {{#skill_chk}}
+            <div class="sheet-content"><span class="tcat">Check Result:</span> {{skill_chk}}</div>{{/skill_chk}}
+            {{#caster_class}}
+            <div class="sheet-content"><span class="tcat">Caster's Class/Lvl:</span> {{caster_class}}</div>{{/caster_class}}
+            {{#caster_lvl_chk}}
+            <div class="sheet-content"><span class="tcat">Caster Level Check:</span> {{caster_lvl_chk}}</div>{{/caster_lvl_chk}}
+            {{#concentration_chk}}
+            <div class="sheet-content"><span class="tcat">Concentration Check:</span> {{concentration_chk}}</div>{{/concentration_chk}}
+        </div>
+    </div>
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-PFAttack">
+    <div class="sheet-wrapper">
+    <div class="sheet-border">
+        <table>
+            <tr><th>{{name}}</th></tr>
+            <tr><td class="subheader">{{subtags}}</td></tr>
+            <tr class="arrow-container"><td><div class="arrow-right"></div></td></tr>
+    	    <tr class="rowcolor"><td><span class="tcat">Attack: </span>{{attack}}</td></tr>
+			    <tr>
+        	    {{#damage}}
+        		    <td>
+                        <span class="tcat">Damage: </span>{{damage}}
+                    </td>
+        	    {{/damage}}
+	    	    </tr>
+                {{#rollWasCrit() attack}}
+    		    <tr>
+    		        <td>
+                        <span class="tcat">Confirm: </span>{{confirm}}
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span class="tcat">Crit: </span>{{dmgcrit}}
+                    </td>
+	    	    </tr>
+                {{/rollWasCrit() attack}}
+                {{#notes}}
+                <tr><td><span class="tcat">Notes: </span>{{notes}}</td></tr>{{/notes}}
+                {{#attk-notes}}
+                <tr><td><span class="tcat">Attack Notes: </span>{{attk-notes}}</td></tr>{{/attk-notes}}
+        </table>
+    </div>
+    </div>
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-pf_spell">
+    <div class="sheet-wrapper">
+    <div class="sheet-border">
+        <table>
+            <tr><th>{{name}}</th></tr>
+            <tr>
+                <td><span class="tcat">School </span>{{school}}; <span class="tcat">Level </span>{{level}}</td>        
+            </tr>
+            <tr>
+                <td><span class="tcat">Casting Time </span>{{casting_time}}</td>        
+            </tr>
+            <tr>
+                <td><span class="tcat">Components </span>{{components}}</td>        
+            </tr>
+            <tr>
+                <td><span class="tcat">Range </span>{{range}}</td>        
+            </tr>
+            <tr>
+                <td><span class="tcat">Effect/Target </span>{{target}}</td>        
+            </tr>
+            <tr>
+                <td><span class="tcat">Duration </span>{{duration}}</td>        
+            </tr>
+            <tr>
+                <td><span class="tcat">Saving Throw </span>{{saving_throw}}; <span class="tcat">Spell Resistance </span>{{sr}}</td>         
+            </tr>
+            {{#rng_attack}}
+                <tr><td><span class="tcat">Ranged Attack </span>{{rng_attack}}</td></tr>{{/rng_attack}}
+            {{#mel_attack}}
+                <tr><td><span class="tcat">Melee Attack </span>{{mel_attack}}</td></tr>{{/mel_attack}}
+        	{{#damage}}
+        		<tr><td><span class="tcat">Damage: </span>{{damage}}</td></tr>{{/damage}}
+            <tr>
+                <td>{{spell_description}}</td>        
+            </tr>
+        </table>
+    </div>
+    </div>
+</rolltemplate>
\ No newline at end of file