diff --git a/SLA Industries 2ed/sla.html b/SLA Industries 2ed/sla.html
index 13d55d258f..3bd52332ca 100644
--- a/SLA Industries 2ed/sla.html	
+++ b/SLA Industries 2ed/sla.html	
@@ -83,147 +83,147 @@
   <div class="sheet-skill1ranktitle">RANK</div>
   <div class="sheet-skill1stattitle">STAT</div>
   <div class="sheet-skill1bonustitle">BONUS</div>
-  <div class="sheet-acrobaticsbutton"><button type="roll"value="&{template:skill} {{name=acrobatics}}{{success=[[{1d10+@{acrobatics_total}}>?{target|10}]]}}{{skill=[[{[[@{acrobatics}+1]]d10+@{acrobatics_total}}>?{target|10}]]}}">Acrobatics</button></div>
+  <div class="sheet-acrobaticsbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=acrobatics}}{{success=[[{1d10+@{acrobatics_total}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{acrobatics}+1]]d10+@{acrobatics_total}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Acrobatics</button></div>
   <div class="sheet-acrobaticsrank"><input name="attr_acrobatics" type="number" min=0 max=4><input name="attr_acrobatics+1" type="hidden"></div>
   <div class="sheet-acrobaticsstat">Dexterity</div>
   <div class="sheet-acrobaticsbonus"><input name="attr_acrobatics_total" type="text" readonly></div>
-  <div class="sheet-adminbutton"><button type="roll"value="&{template:skill} {{name=admin}}{{success=[[{1d10+@{admin_total}}>?{target|10}]]}}{{skill=[[{[[@{admin}+1]]d10+@{admin_total}}>?{target|10}]]}}">Admin & Finance</button></div>
+  <div class="sheet-adminbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=admin}}{{success=[[{1d10+@{admin_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{admin}+1]]d10+@{admin_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Admin & Finance</button></div>
   <div class="sheet-adminrank"><input name="attr_admin" type="number" min=0 max=4><input name="attr_admin+1" type="hidden"></div>
   <div class="sheet-adminstat">Knowledge</div>
   <div class="sheet-adminbonus"><input name="attr_admin_total" type="text" readonly></div>
-  <div class="sheet-appraisalbutton"><button type="roll"value="&{template:skill} {{name=appraisal}}{{success=[[{1d10+@{appraisal_total}}>?{target|10}]]}}{{skill=[[{[[@{appraisal}+1]]d10+@{appraisal_total}}>?{target|10}]]}}">Appraisal</button></div>
+  <div class="sheet-appraisalbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=appraisal}}{{success=[[{1d10+@{appraisal_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{appraisal}+1]]d10+@{appraisal_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Appraisal</button></div>
   <div class="sheet-appraisalrank"><input name="attr_appraisal" type="number" min=0 max=4><input name="attr_appraisal+1" type="hidden"></div>
   <div class="sheet-appraisalstat">Concentration</div>
   <div class="sheet-appraisalbonus"><input name="attr_appraisal_total" type="text" readonly></div>
-  <div class="sheet-athleticsbutton"><button type="roll"value="&{template:skill} {{name=athletics}}{{success=[[{1d10+@{athletics_total}}>?{target|10}]]}}{{skill=[[{[[@{athletics}+1]]d10+@{athletics_total}}>?{target|10}]]}}">Athletics</button></div>
+  <div class="sheet-athleticsbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=athletics}}{{success=[[{1d10+@{athletics_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{athletics}+1]]d10+@{athletics_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Athletics</button></div>
   <div class="sheet-athleticsrank"><input name="attr_athletics" type="number" min=0 max=4><input name="attr_athletics+1" type="hidden"></div>
   <div class="sheet-athleticsstat">Dexterity</div>
   <div class="sheet-athleticsbonus"><input name="attr_athletics_total" type="text" readonly></div>
-  <div class="sheet-briberybutton"><button type="roll"value="&{template:skill} {{name=bribery}}{{success=[[{1d10+@{bribery_total}}>?{target|10}]]}}{{skill=[[{[[@{bribery}+1]]d10+@{bribery_total}}>?{target|10}]]}}">Bribery</button></div>
+  <div class="sheet-briberybutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=bribery}}{{success=[[{1d10+@{bribery_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{bribery}+1]]d10+@{bribery_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Bribery</button></div>
   <div class="sheet-briberyrank"><input name="attr_bribery" type="number" min=0 max=4><input name="attr_bribery+1" type="hidden"></div>
   <div class="sheet-briberystat">Cool</div>
   <div class="sheet-briberybonus"><input name="attr_bribery_total" type="text" readonly></div>
-  <div class="sheet-climbingbutton"><button type="roll"value="&{template:skill} {{name=climbing}}{{success=[[{1d10+@{climbing_total}}>?{target|10}]]}}{{skill=[[{[[@{climbing}+1]]d10+@{climbing_total}}>?{target|10}]]}}">Climbing</button></div>
+  <div class="sheet-climbingbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=climbing}}{{success=[[{1d10+@{climbing_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{climbing}+1]]d10+@{climbing_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Climbing</button></div>
   <div class="sheet-climbingrank"><input name="attr_climbing" type="number" min=0 max=4><input name="attr_climbing+1" type="hidden"></div>
   <div class="sheet-climbingstat">Strength</div>
   <div class="sheet-climbingbonus"><input name="attr_climbing_total" type="text" readonly></div>
-  <div class="sheet-computerbutton"><button type="roll"value="&{template:skill} {{name=computer}}{{success=[[{1d10+@{computer_total}}>?{target|10}]]}}{{skill=[[{[[@{computer}+1]]d10+@{computer_total}}>?{target|10}]]}}">Computer</button></div>
+  <div class="sheet-computerbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=computer}}{{success=[[{1d10+@{computer_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{computer}+1]]d10+@{computer_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Computer</button></div>
   <div class="sheet-computerrank"><input name="attr_computer" type="number" min=0 max=4><input name="attr_computer+1" type="hidden"></div>
   <div class="sheet-computerstat">Knowledge</div>
   <div class="sheet-computerbonus"><input name="attr_computer_total" type="text" readonly></div>
-  <div class="sheet-demolitionsbutton"><button type="roll"value="&{template:skill} {{name=demolitions}}{{success=[[{1d10+@{demolitions_total}}>?{target|10}]]}}{{skill=[[{[[@{demolitions}+1]]d10+@{demolitions_total}}>?{target|10}]]}}">Demolitions</button></div>
+  <div class="sheet-demolitionsbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=demolitions}}{{success=[[{1d10+@{demolitions_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{demolitions}+1]]d10+@{demolitions_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Demolitions</button></div>
   <div class="sheet-demolitionsrank"><input name="attr_demolitions" type="number" min=0 max=4><input name="attr_demolitions+1" type="hidden"></div>
   <div class="sheet-demolitionsstat">Concentration</div>
   <div class="sheet-demolitionsbonus"><input name="attr_demolitions_total" type="text" readonly></div>
-  <div class="sheet-detectbutton"><button type="roll"value="&{template:skill} {{name=detect}}{{success=[[{1d10+@{detect_total}}>?{target|10}]]}}{{skill=[[{[[@{detect}+1]]d10+@{detect_total}}>?{target|10}]]}}">Detect</button></div>
+  <div class="sheet-detectbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=detect}}{{success=[[{1d10+@{detect_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{detect}+1]]d10+@{detect_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Detect</button></div>
   <div class="sheet-detectrank"><input name="attr_detect" type="number" min=0 max=4><input name="attr_detect+1" type="hidden"></div>
   <div class="sheet-detectstat">Concentration</div>
   <div class="sheet-detectbonus"><input name="attr_detect_total" type="text" readonly></div>
-  <div class="sheet-diplomacybutton"><button type="roll"value="&{template:skill} {{name=diplomacy}}{{success=[[{1d10+@{diplomacy_total}}>?{target|10}]]}}{{skill=[[{[[@{diplomacy}+1]]d10+@{diplomacy_total}}>?{target|10}]]}}">Diplomacy</button></div>
+  <div class="sheet-diplomacybutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=diplomacy}}{{success=[[{1d10+@{diplomacy_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{diplomacy}+1]]d10+@{diplomacy_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Diplomacy</button></div>
   <div class="sheet-diplomacyrank"><input name="attr_diplomacy" type="number" min=0 max=4><input name="attr_diplomacy+1" type="hidden"></div>
   <div class="sheet-diplomacystat">Charisma</div>
   <div class="sheet-diplomacybonus"><input name="attr_diplomacy_total" type="text" readonly></div>
-  <div class="sheet-drivecivbutton"><button type="roll"value="&{template:skill} {{name=driveciv}}{{success=[[{1d10+@{driveciv_total}}>?{target|10}]]}}{{skill=[[{[[@{driveciv}+1]]d10+@{driveciv_total}}>?{target|10}]]}}">Drive Civilian</button></div>
+  <div class="sheet-drivecivbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=driveciv}}{{success=[[{1d10+@{driveciv_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{driveciv}+1]]d10+@{driveciv_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Drive Civilian</button></div>
   <div class="sheet-drivecivrank"><input name="attr_driveciv" type="number" min=0 max=4><input name="attr_driveciv+1" type="hidden"></div>
   <div class="sheet-drivecivstat">Concentration</div>
   <div class="sheet-drivecivbonus"><input name="attr_driveciv_total" type="text" readonly></div>
-  <div class="sheet-drivemilbutton"><button type="roll"value="&{template:skill} {{name=drivemil}}{{success=[[{1d10+@{drivemil_total}}>?{target|10}]]}}{{skill=[[{[[@{drivemil}+1]]d10+@{drivemil_total}}>?{target|10}]]}}">Drive Militart</button></div>
+  <div class="sheet-drivemilbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=drivemil}}{{success=[[{1d10+@{drivemil_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{drivemil}+1]]d10+@{drivemil_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Drive Militart</button></div>
   <div class="sheet-drivemilrank"><input name="attr_drivemil" type="number" min=0 max=4><input name="attr_drivemil+1" type="hidden"></div>
   <div class="sheet-drivemilstat">Concentration</div>
   <div class="sheet-drivemilbonus"><input name="attr_drivemil_total" type="text" readonly></div>
-  <div class="sheet-drivepilbutton"><button type="roll"value="&{template:skill} {{name=drivepil}}{{success=[[{1d10+@{drivepil_total}}>?{target|10}]]}}{{skill=[[{[[@{drivepil}+1]]d10+@{drivepil_total}}>?{target|10}]]}}">Drive Pilot</button></div>
+  <div class="sheet-drivepilbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=drivepil}}{{success=[[{1d10+@{drivepil_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{drivepil}+1]]d10+@{drivepil_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Drive Pilot</button></div>
   <div class="sheet-drivepilrank"><input name="attr_drivepil" type="number" min=0 max=4><input name="attr_drivepil+1" type="hidden"></div>
   <div class="sheet-drivepilstat">Concentration</div>
   <div class="sheet-drivepilbonus"><input name="attr_drivepil_total" type="text" readonly></div>
-  <div class="sheet-drivemotbutton"><button type="roll"value="&{template:skill} {{name=drivemot}}{{success=[[{1d10+@{drivemot_total}}>?{target|10}]]}}{{skill=[[{[[@{drivemot}+1]]d10+@{drivemot_total}}>?{target|10}]]}}">Drive Motorcycle</button></div>
+  <div class="sheet-drivemotbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=drivemot}}{{success=[[{1d10+@{drivemot_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{drivemot}+1]]d10+@{drivemot_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Drive Motorcycle</button></div>
   <div class="sheet-drivemotrank"><input name="attr_drivemot" type="number" min=0 max=4><input name="attr_drivemot+1" type="hidden"></div>
   <div class="sheet-drivemotstat">Dexterity</div>
   <div class="sheet-drivemotbonus"><input name="attr_drivemot_total" type="text" readonly></div>
-  <div class="sheet-eduacadbutton"><button type="roll"value="&{template:skill} {{name=eduacad}}{{success=[[{1d10+@{eduacad_total}}>?{target|10}]]}}{{skill=[[{[[@{eduacad}+1]]d10+@{eduacad_total}}>?{target|10}]]}}">Edu Academic</button></div>
+  <div class="sheet-eduacadbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=eduacad}}{{success=[[{1d10+@{eduacad_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{eduacad}+1]]d10+@{eduacad_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Edu Academic</button></div>
   <div class="sheet-eduacadrank"><input name="attr_eduacad" type="number" min=0 max=4><input name="attr_eduacad+1" type="hidden"></div>
   <div class="sheet-eduacadstat">Knowledge</div>
   <div class="sheet-eduacadbonus"><input name="attr_eduacad_total" type="text" readonly></div>
-  <div class="sheet-edunatbutton"><button type="roll"value="&{template:skill} {{name=edunat}}{{success=[[{1d10+@{edunat_total}}>?{target|10}]]}}{{skill=[[{[[@{edunat}+1]]d10+@{edunat_total}}>?{target|10}]]}}">Edu Natural</button></div>
+  <div class="sheet-edunatbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=edunat}}{{success=[[{1d10+@{edunat_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{edunat}+1]]d10+@{edunat_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Edu Natural</button></div>
   <div class="sheet-edunatrank"><input name="attr_edunat" type="number" min=0 max=4><input name="attr_edunat+1" type="hidden"></div>
   <div class="sheet-edunatstat">Knowledge</div>
   <div class="sheet-edunatbonus"><input name="attr_edunat_total" type="text" readonly></div>
-  <div class="sheet-forensicsbutton"><button type="roll"value="&{template:skill} {{name=forensics}}{{success=[[{1d10+@{forensics_total}}>?{target|10}]]}}{{skill=[[{[[@{forensics}+1]]d10+@{forensics_total}}>?{target|10}]]}}">Forensics</button></div>
+  <div class="sheet-forensicsbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=forensics}}{{success=[[{1d10+@{forensics_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{forensics}+1]]d10+@{forensics_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Forensics</button></div>
   <div class="sheet-forensicsrank"><input name="attr_forensics" type="number" min=0 max=4><input name="attr_forensics+1" type="hidden"></div>
   <div class="sheet-forensicsstat">Knowledge</div>
   <div class="sheet-forensicsbonus"><input name="attr_forensics_total" type="text" readonly></div>
-  <div class="sheet-forgerybutton"><button type="roll"value="&{template:skill} {{name=forgery}}{{success=[[{1d10+@{forgery_total}}>?{target|10}]]}}{{skill=[[{[[@{forgery}+1]]d10+@{forgery_total}}>?{target|10}]]}}">Forgery</button></div>
+  <div class="sheet-forgerybutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=forgery}}{{success=[[{1d10+@{forgery_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{forgery}+1]]d10+@{forgery_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Forgery</button></div>
   <div class="sheet-forgeryrank"><input name="attr_forgery" type="number" min=0 max=4><input name="attr_forgery+1" type="hidden"></div>
   <div class="sheet-forgerystat">Dexterity</div>
   <div class="sheet-forgerybonus"><input name="attr_forgery_total" type="text" readonly></div>
-  <div class="sheet-gamblingbutton"><button type="roll"value="&{template:skill} {{name=gambling}}{{success=[[{1d10+@{gambling_total}}>?{target|10}]]}}{{skill=[[{[[@{gambling}+1]]d10+@{gambling_total}}>?{target|10}]]}}">Gambling</button></div>
+  <div class="sheet-gamblingbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=gambling}}{{success=[[{1d10+@{gambling_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{gambling}+1]]d10+@{gambling_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Gambling</button></div>
   <div class="sheet-gamblingrank"><input name="attr_gambling" type="number" min=0 max=4><input name="attr_gambling+1" type="hidden"></div>
   <div class="sheet-gamblingstat">Cool</div>
   <div class="sheet-gamblingbonus"><input name="attr_gambling_total" type="text" readonly></div>
-  <div class="sheet-hagglebutton"><button type="roll"value="&{template:skill} {{name=haggle}}{{success=[[{1d10+@{haggle_total}}>?{target|10}]]}}{{skill=[[{[[@{haggle}+1]]d10+@{haggle_total}}>?{target|10}]]}}">Haggle</button></div>
+  <div class="sheet-hagglebutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=haggle}}{{success=[[{1d10+@{haggle_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{haggle}+1]]d10+@{haggle_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Haggle</button></div>
   <div class="sheet-hagglerank"><input name="attr_haggle" type="number" min=0 max=4><input name="attr_haggle+1" type="hidden"></div>
   <div class="sheet-hagglestat">Charisma</div>
   <div class="sheet-hagglebonus"><input name="attr_haggle_total" type="text" readonly></div>
-  <div class="sheet-interrogatebutton"><button type="roll"value="&{template:skill} {{name=interrogate}}{{success=[[{1d10+@{interrogate_total}}>?{target|10}]]}}{{skill=[[{[[@{interrogate}+1]]d10+@{interrogate_total}}>?{target|10}]]}}">Interrogate</button></div>
+  <div class="sheet-interrogatebutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=interrogate}}{{success=[[{1d10+@{interrogate_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{interrogate}+1]]d10+@{interrogate_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Interrogate</button></div>
   <div class="sheet-interrogaterank"><input name="attr_interrogate" type="number" min=0 max=4><input name="attr_interrogate+1" type="hidden"></div>
   <div class="sheet-interrogatestat">Cool</div>
   <div class="sheet-interrogatebonus"><input name="attr_interrogate_total" type="text" readonly></div>
-  <div class="sheet-intimidatebutton"><button type="roll"value="&{template:skill} {{name=intimidate}}{{success=[[{1d10+@{intimidate_total}}>?{target|10}]]}}{{skill=[[{[[@{intimidate}+1]]d10+@{intimidate_total}}>?{target|10}]]}}">Intimidate</button></div>
+  <div class="sheet-intimidatebutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=intimidate}}{{success=[[{1d10+@{intimidate_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{intimidate}+1]]d10+@{intimidate_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Intimidate</button></div>
   <div class="sheet-intimidaterank"><input name="attr_intimidate" type="number" min=0 max=4><input name="attr_intimidate+1" type="hidden"></div>
   <div class="sheet-intimidatestat">Cool</div>
   <div class="sheet-intimidatebonus"><input name="attr_intimidate_total" type="text" readonly></div>
-  <div class="sheet-langbiyabutton"><button type="roll"value="&{template:skill} {{name=langbiya}}{{success=[[{1d10+@{langbiya_total}}>?{target|10}]]}}{{skill=[[{[[@{langbiya}+1]]d10+@{langbiya_total}}>?{target|10}]]}}">Lang Biya</button></div>
+  <div class="sheet-langbiyabutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=langbiya}}{{success=[[{1d10+@{langbiya_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{langbiya}+1]]d10+@{langbiya_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Lang Biya</button></div>
   <div class="sheet-langbiyarank"><input name="attr_langbiya" type="number" min=0 max=4><input name="attr_langbiya+1" type="hidden"></div>
   <div class="sheet-langbiyastat">Knowledge</div>
   <div class="sheet-langbiyabonus"><input name="attr_langbiya_total" type="text" readonly></div>
-  <div class="sheet-langgristlebutton"><button type="roll"value="&{template:skill} {{name=langgristle}}{{success=[[{1d10+@{langgristle_total}}>?{target|10}]]}}{{skill=[[{[[@{langgristle}+1]]d10+@{langgristle_total}}>?{target|10}]]}}">Lang Gristle</button></div>
+  <div class="sheet-langgristlebutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=langgristle}}{{success=[[{1d10+@{langgristle_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{langgristle}+1]]d10+@{langgristle_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Lang Gristle</button></div>
   <div class="sheet-langgristlerank"><input name="attr_langgristle" type="number" min=0 max=4><input name="attr_langgristle+1" type="hidden"></div>
   <div class="sheet-langgristlestat">Knowledge</div>
   <div class="sheet-langgristlebonus"><input name="attr_langgristle_total" type="text" readonly></div>
-  <div class="sheet-langneobutton"><button type="roll"value="&{template:skill} {{name=langneo}}{{success=[[{1d10+@{langneo_total}}>?{target|10}]]}}{{skill=[[{[[@{langneo}+1]]d10+@{langneo_total}}>?{target|10}]]}}">Lang Neophron</button></div>
+  <div class="sheet-langneobutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=langneo}}{{success=[[{1d10+@{langneo_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{langneo}+1]]d10+@{langneo_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Lang Neophron</button></div>
   <div class="sheet-langneorank"><input name="attr_langneo" type="number" min=0 max=4><input name="attr_langneo+1" type="hidden"></div>
   <div class="sheet-langneostat">Knowledge</div>
   <div class="sheet-langneobonus"><input name="attr_langneo_total" type="text" readonly></div>
-  <div class="sheet-langshakbutton"><button type="roll"value="&{template:skill} {{name=langshak}}{{success=[[{1d10+@{langshak_total}}>?{target|10}]]}}{{skill=[[{[[@{langshak}+1]]d10+@{langshak_total}}>?{target|10}]]}}">Lang Shaktarian</button></div>
+  <div class="sheet-langshakbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=langshak}}{{success=[[{1d10+@{langshak_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{langshak}+1]]d10+@{langshak_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Lang Shaktarian</button></div>
   <div class="sheet-langshakrank"><input name="attr_langshak" type="number" min=0 max=4><input name="attr_langshak+1" type="hidden"></div>
   <div class="sheet-langshakstat">Knowledge</div>
   <div class="sheet-langshakbonus"><input name="attr_langshak_total" type="text" readonly></div>
-  <div class="sheet-langsignbutton"><button type="roll"value="&{template:skill} {{name=langsign}}{{success=[[{1d10+@{langsign_total}}>?{target|10}]]}}{{skill=[[{[[@{langsign}+1]]d10+@{langsign_total}}>?{target|10}]]}}">Lang Sign</button></div>
+  <div class="sheet-langsignbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=langsign}}{{success=[[{1d10+@{langsign_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{langsign}+1]]d10+@{langsign_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Lang Sign</button></div>
   <div class="sheet-langsignrank"><input name="attr_langsign" type="number" min=0 max=4><input name="attr_langsign+1" type="hidden"></div>
   <div class="sheet-langsignstat">Knowledge</div>
   <div class="sheet-langsignbonus"><input name="attr_langsign_total" type="text" readonly></div>
-  <div class="sheet-langwraithbutton"><button type="roll"value="&{template:skill} {{name=langwraith}}{{success=[[{1d10+@{langwraith_total}}>?{target|10}]]}}{{skill=[[{[[@{langwraith}+1]]d10+@{langwraith_total}}>?{target|10}]]}}">Lang Wraithen</button></div>
+  <div class="sheet-langwraithbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=langwraith}}{{success=[[{1d10+@{langwraith_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{langwraith}+1]]d10+@{langwraith_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Lang Wraithen</button></div>
   <div class="sheet-langwraithrank"><input name="attr_langwraith" type="number" min=0 max=4><input name="attr_langwraith+1" type="hidden"></div>
   <div class="sheet-langwraithstat">Knowledge</div>
   <div class="sheet-langwraithbonus"><input name="attr_langwraith_total" type="text" readonly></div>
-  <div class="sheet-leadershipbutton"><button type="roll"value="&{template:skill} {{name=leadership}}{{success=[[{1d10+@{leadership_total}}>?{target|10}]]}}{{skill=[[{[[@{leadership}+1]]d10+@{leadership_total}}>?{target|10}]]}}">Leadership</button></div>
+  <div class="sheet-leadershipbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=leadership}}{{success=[[{1d10+@{leadership_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{leadership}+1]]d10+@{leadership_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Leadership</button></div>
   <div class="sheet-leadershiprank"><input name="attr_leadership" type="number" min=0 max=4><input name="attr_leadership+1" type="hidden"></div>
   <div class="sheet-leadershipstat">Charisma</div>
   <div class="sheet-leadershipbonus"><input name="attr_leadership_total" type="text" readonly></div>
-  <div class="sheet-lockpickmanbutton"><button type="roll"value="&{template:skill} {{name=lockpickman}}{{success=[[{1d10+@{lockpickman_total}}>?{target|10}]]}}{{skill=[[{[[@{lockpickman}+1]]d10+@{lockpickman_total}}>?{target|10}]]}}">Lockpick Manual</button></div>
+  <div class="sheet-lockpickmanbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=lockpickman}}{{success=[[{1d10+@{lockpickman_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{lockpickman}+1]]d10+@{lockpickman_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Lockpick Manual</button></div>
   <div class="sheet-lockpickmanrank"><input name="attr_lockpickman" type="number" min=0 max=4><input name="attr_lockpickman+1" type="hidden"></div>
   <div class="sheet-lockpickmanstat">Concentration</div>
   <div class="sheet-lockpickmanbonus"><input name="attr_lockpickman_total" type="text" readonly></div>
-  <div class="sheet-lockpickelecbutton"><button type="roll"value="&{template:skill} {{name=lockpickelec}}{{success=[[{1d10+@{lockpickelec_total}}>?{target|10}]]}}{{skill=[[{[[@{lockpickelec}+1]]d10+@{lockpickelec_total}}>?{target|10}]]}}">Lockpick Elec</button></div>
+  <div class="sheet-lockpickelecbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=lockpickelec}}{{success=[[{1d10+@{lockpickelec_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{lockpickelec}+1]]d10+@{lockpickelec_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Lockpick Elec</button></div>
   <div class="sheet-lockpickelecrank"><input name="attr_lockpickelec" type="number" min=0 max=4><input name="attr_lockpickelec+1" type="hidden"></div>
   <div class="sheet-lockpickelecstat">Concentration</div>
   <div class="sheet-lockpickelecbonus"><input name="attr_lockpickelec_total" type="text" readonly></div>
-  <div class="sheet-lorecultbutton"><button type="roll"value="&{template:skill} {{name=lorecult}}{{success=[[{1d10+@{lorecult_total}}>?{target|10}]]}}{{skill=[[{[[@{lorecult}+1]]d10+@{lorecult_total}}>?{target|10}]]}}">Lore Cult</button></div>
+  <div class="sheet-lorecultbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=lorecult}}{{success=[[{1d10+@{lorecult_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{lorecult}+1]]d10+@{lorecult_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Lore Cult</button></div>
   <div class="sheet-lorecultrank"><input name="attr_lorecult" type="number" min=0 max=4><input name="attr_lorecult+1" type="hidden"></div>
   <div class="sheet-lorecultstat">Knowledge</div>
   <div class="sheet-lorecultbonus"><input name="attr_lorecult_total" type="text" readonly></div>
-  <div class="sheet-loredreambutton"><button type="roll"value="&{template:skill} {{name=loredream}}{{success=[[{1d10+@{loredream_total}}>?{target|10}]]}}{{skill=[[{[[@{loredream}+1]]d10+@{loredream_total}}>?{target|10}]]}}">Lore Dream</button></div>
+  <div class="sheet-loredreambutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=loredream}}{{success=[[{1d10+@{loredream_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{loredream}+1]]d10+@{loredream_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Lore Dream</button></div>
   <div class="sheet-loredreamrank"><input name="attr_loredream" type="number" min=0 max=4><input name="attr_loredream+1" type="hidden"></div>
   <div class="sheet-loredreamstat">Knowledge</div>
   <div class="sheet-loredreambonus"><input name="attr_loredream_total" type="text" readonly></div>
-  <div class="sheet-loresectorbutton"><button type="roll"value="&{template:skill} {{name=loresector}}{{success=[[{1d10+@{loresector_total}}>?{target|10}]]}}{{skill=[[{[[@{loresector}+1]]d10+@{loresector_total}}>?{target|10}]]}}">Lore Sector</button></div>
+  <div class="sheet-loresectorbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=loresector}}{{success=[[{1d10+@{loresector_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{loresector}+1]]d10+@{loresector_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Lore Sector</button></div>
   <div class="sheet-loresectorrank"><input name="attr_loresector" type="number" min=0 max=4><input name="attr_loresector+1" type="hidden"></div>
   <div class="sheet-loresectorstat">Knowledge</div>
   <div class="sheet-loresectorbonus"><input name="attr_loresector_total" type="text" readonly></div>
-  <div class="sheet-medicalbutton"><button type="roll"value="&{template:skill} {{name=medical}}{{success=[[{1d10+@{medical_total}}>?{target|10}]]}}{{skill=[[{[[@{medical}+1]]d10+@{medical_total}}>?{target|10}]]}}">Medical</button></div>
+  <div class="sheet-medicalbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=medical}}{{success=[[{1d10+@{medical_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{medical}+1]]d10+@{medical_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Medical</button></div>
   <div class="sheet-medicalrank"><input name="attr_medical" type="number" min=0 max=4><input name="attr_medical+1" type="hidden"></div>
   <div class="sheet-medicalstat">Knowledge</div>
   <div class="sheet-medicalbonus"><input name="attr_medical_total" type="text" readonly></div>
-  <div class="sheet-meleewpnbutton"><button type="roll"value="&{template:skill} {{name=meleewpn}}{{success=[[{1d10+@{meleewpn_total}}>?{target|10}]]}}{{skill=[[{[[@{meleewpn}+1]]d10+@{meleewpn_total}}>?{target|10}]]}}">Melee Weapons</button></div>
+  <div class="sheet-meleewpnbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=meleewpn}}{{success=[[{1d10+@{meleewpn_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{meleewpn}+1]]d10+@{meleewpn_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Melee Weapons</button></div>
   <div class="sheet-meleewpnrank"><input name="attr_meleewpn" type="number" min=0 max=4><input name="attr_meleewpn+1" type="hidden"></div>
   <div class="sheet-meleewpnstat">Strength</div>
   <div class="sheet-meleewpnbonus"><input name="attr_meleewpn_total" type="text" readonly></div>
@@ -231,95 +231,95 @@
   <div class="sheet-skill2ranktitle">RANK</div>
   <div class="sheet-skill2stattitle">STAT</div>
   <div class="sheet-skill2bonustitle">BONUS</div>
-  <div class="sheet-optimisebutton"><button type="roll"value="&{template:skill} {{name=optimise}}{{success=[[{1d10+@{optimise_total}}>?{target|10}]]}}{{skill=[[{[[@{optimise}+1]]d10+@{optimise_total}}>?{target|10}]]}}">Optimise</button></div>
+  <div class="sheet-optimisebutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=optimise}}{{success=[[{1d10+@{optimise_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{optimise}+1]]d10+@{optimise_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Optimise</button></div>
   <div class="sheet-optimiserank"><input name="attr_optimise" type="number" min=0 max=4><input name="attr_optimise+1" type="hidden"></div>
   <div class="sheet-optimisestat">Knowledge</div>
   <div class="sheet-optimisebonus"><input name="attr_optimise_total" type="text" readonly></div>
-  <div class="sheet-oratorybutton"><button type="roll"value="&{template:skill} {{name=oratory}}{{success=[[{1d10+@{oratory_total}}>?{target|10}]]}}{{skill=[[{[[@{oratory}+1]]d10+@{oratory_total}}>?{target|10}]]}}">Oratory</button></div>
+  <div class="sheet-oratorybutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=oratory}}{{success=[[{1d10+@{oratory_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{oratory}+1]]d10+@{oratory_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Oratory</button></div>
   <div class="sheet-oratoryrank"><input name="attr_oratory" type="number" min=0 max=4><input name="attr_oratory+1" type="hidden"></div>
   <div class="sheet-oratorystat">Charisma</div>
   <div class="sheet-oratorybonus"><input name="attr_oratory_total" type="text" readonly></div>
-  <div class="sheet-persuasionbutton"><button type="roll"value="&{template:skill} {{name=persuasion}}{{success=[[{1d10+@{persuasion_total}}>?{target|10}]]}}{{skill=[[{[[@{persuasion}+1]]d10+@{persuasion_total}}>?{target|10}]]}}">Persuasion</button></div>
+  <div class="sheet-persuasionbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=persuasion}}{{success=[[{1d10+@{persuasion_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{persuasion}+1]]d10+@{persuasion_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Persuasion</button></div>
   <div class="sheet-persuasionrank"><input name="attr_persuasion" type="number" min=0 max=4><input name="attr_persuasion+1" type="hidden"></div>
   <div class="sheet-persuasionstat">Charisma</div>
   <div class="sheet-persuasionbonus"><input name="attr_persuasion_total" type="text" readonly></div>
-  <div class="sheet-pistolbutton"><button type="roll"value="&{template:skill} {{name=pistol}}{{success=[[{1d10+@{pistol_total}}>?{target|10}]]}}{{skill=[[{[[@{pistol}+1]]d10+@{pistol_total}}>?{target|10}]]}}">Pistol</button></div>
+  <div class="sheet-pistolbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=pistol}}{{success=[[{1d10+@{pistol_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{pistol}+1]]d10+@{pistol_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Pistol</button></div>
   <div class="sheet-pistolrank"><input name="attr_pistol" type="number" min=0 max=4><input name="attr_pistol+1" type="hidden"></div>
   <div class="sheet-pistolstat">Dexterity</div>
   <div class="sheet-pistolbonus"><input name="attr_pistol_total" type="text" readonly></div>
-  <div class="sheet-polearmbutton"><button type="roll"value="&{template:skill} {{name=polearm}}{{success=[[{1d10+@{polearm_total}}>?{target|10}]]}}{{skill=[[{[[@{polearm}+1]]d10+@{polearm_total}}>?{target|10}]]}}">Polearm</button></div>
+  <div class="sheet-polearmbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=polearm}}{{success=[[{1d10+@{polearm_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{polearm}+1]]d10+@{polearm_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Polearm</button></div>
   <div class="sheet-polearmrank"><input name="attr_polearm" type="number" min=0 max=4><input name="attr_polearm+1" type="hidden"></div>
   <div class="sheet-polearmstat">Strength</div>
   <div class="sheet-polearmbonus"><input name="attr_polearm_total" type="text" readonly></div>
-  <div class="sheet-readlipsbutton"><button type="roll"value="&{template:skill} {{name=readlips}}{{success=[[{1d10+@{readlips_total}}>?{target|10}]]}}{{skill=[[{[[@{readlips}+1]]d10+@{readlips_total}}>?{target|10}]]}}">Read Lips</button></div>
+  <div class="sheet-readlipsbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=readlips}}{{success=[[{1d10+@{readlips_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{readlips}+1]]d10+@{readlips_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Read Lips</button></div>
   <div class="sheet-readlipsrank"><input name="attr_readlips" type="number" min=0 max=4><input name="attr_readlips+1" type="hidden"></div>
   <div class="sheet-readlipsstat">Concentration</div>
   <div class="sheet-readlipsbonus"><input name="attr_readlips_total" type="text" readonly></div>
-  <div class="sheet-riflebutton"><button type="roll"value="&{template:skill} {{name=rifle}}{{success=[[{1d10+@{rifle_total}}>?{target|10}]]}}{{skill=[[{[[@{rifle}+1]]d10+@{rifle_total}}>?{target|10}]]}}">Rifle</button></div>
+  <div class="sheet-riflebutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=rifle}}{{success=[[{1d10+@{rifle_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{rifle}+1]]d10+@{rifle_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Rifle</button></div>
   <div class="sheet-riflerank"><input name="attr_rifle" type="number" min=0 max=4><input name="attr_rifle+1" type="hidden"></div>
   <div class="sheet-riflestat">Dexterity</div>
   <div class="sheet-riflebonus"><input name="attr_rifle_total" type="text" readonly></div>
-  <div class="sheet-seductionbutton"><button type="roll"value="&{template:skill} {{name=seduction}}{{success=[[{1d10+@{seduction_total}}>?{target|10}]]}}{{skill=[[{[[@{seduction}+1]]d10+@{seduction_total}}>?{target|10}]]}}">Seduction</button></div>
+  <div class="sheet-seductionbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=seduction}}{{success=[[{1d10+@{seduction_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{seduction}+1]]d10+@{seduction_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Seduction</button></div>
   <div class="sheet-seductionrank"><input name="attr_seduction" type="number" min=0 max=4><input name="attr_seduction+1" type="hidden"></div>
   <div class="sheet-seductionstat">Charisma</div>
   <div class="sheet-seductionbonus"><input name="attr_seduction_total" type="text" readonly></div>
-  <div class="sheet-shieldcraftbutton"><button type="roll"value="&{template:skill} {{name=shieldcraft}}{{success=[[{1d10+@{shieldcraft_total}}>?{target|10}]]}}{{skill=[[{[[@{shieldcraft}+1]]d10+@{shieldcraft_total}}>?{target|10}]]}}">Shield Craft</button></div>
+  <div class="sheet-shieldcraftbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=shieldcraft}}{{success=[[{1d10+@{shieldcraft_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{shieldcraft}+1]]d10+@{shieldcraft_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Shield Craft</button></div>
   <div class="sheet-shieldcraftrank"><input name="attr_shieldcraft" type="number" min=0 max=4></div>
   <div class="sheet-shieldcraftstat">Strength</div>
   <div class="sheet-shieldcraftbonus"><input name="attr_shieldcraft_total" type="text" readonly></div>
-  <div class="sheet-sleightbutton"><button type="roll"value="&{template:skill} {{name=sleight}}{{success=[[{1d10+@{sleight_total}}>?{target|10}]]}}{{skill=[[{[[@{sleight}+1]]d10+@{sleight_total}}>?{target|10}]]}}">Sleight</button></div>
+  <div class="sheet-sleightbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=sleight}}{{success=[[{1d10+@{sleight_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{sleight}+1]]d10+@{sleight_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Sleight</button></div>
   <div class="sheet-sleightrank"><input name="attr_sleight" type="number" min=0 max=4><input name="attr_sleight+1" type="hidden"></div>
   <div class="sheet-sleightstat">Dexterity</div>
   <div class="sheet-sleightbonus"><input name="attr_sleight_total" type="text" readonly></div>
-  <div class="sheet-stealthbutton"><button type="roll"value="&{template:skill} {{name=stealth}}{{success=[[{1d10+@{stealth_total}}>?{target|10}]]}}{{skill=[[{[[@{stealth}+1]]d10+@{stealth_total}}>?{target|10}]]}}">Stealth</button></div>
+  <div class="sheet-stealthbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=stealth}}{{success=[[{1d10+@{stealth_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{stealth}+1]]d10+@{stealth_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Stealth</button></div>
   <div class="sheet-stealthrank"><input name="attr_stealth" type="number" min=0 max=4><input name="attr_stealth+1" type="hidden"></div>
   <div class="sheet-stealthstat">Dexterity</div>
   <div class="sheet-stealthbonus"><input name="attr_stealth_total" type="text" readonly></div>
-  <div class="sheet-streetwisebutton"><button type="roll"value="&{template:skill} {{name=streetwise}}{{success=[[{1d10+@{streetwise_total}}>?{target|10}]]}}{{skill=[[{[[@{streetwise}+1]]d10+@{streetwise_total}}>?{target|10}]]}}">Streetwise</button></div>
+  <div class="sheet-streetwisebutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=streetwise}}{{success=[[{1d10+@{streetwise_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{streetwise}+1]]d10+@{streetwise_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Streetwise</button></div>
   <div class="sheet-streetwiserank"><input name="attr_streetwise" type="number" min=0 max=4><input name="attr_streetwise+1" type="hidden"></div>
   <div class="sheet-streetwisestat">Knowledge</div>
   <div class="sheet-streetwisebonus"><input name="attr_streetwise_total" type="text" readonly></div>
-  <div class="sheet-supportwpnbutton"><button type="roll"value="&{template:skill} {{name=supportwpn}}{{success=[[{1d10+@{supportwpn_total}}>?{target|10}]]}}{{skill=[[{[[@{supportwpn}+1]]d10+@{supportwpn_total}}>?{target|10}]]}}">Support Weapon</button></div>
+  <div class="sheet-supportwpnbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=supportwpn}}{{success=[[{1d10+@{supportwpn_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{supportwpn}+1]]d10+@{supportwpn_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Support Weapon</button></div>
   <div class="sheet-supportwpnrank"><input name="attr_supportwpn" type="number" min=0 max=4><input name="attr_supportwpn+1" type="hidden"></div>
   <div class="sheet-supportwpnstat">Strength</div>
   <div class="sheet-supportwpnbonus"><input name="attr_supportwpn_total" type="text" readonly></div>
-  <div class="sheet-survivalbutton"><button type="roll"value="&{template:skill} {{name=survival}}{{success=[[{1d10+@{survival_total}}>?{target|10}]]}}{{skill=[[{[[@{survival}+1]]d10+@{survival_total}}>?{target|10}]]}}">Survival</button></div>
+  <div class="sheet-survivalbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=survival}}{{success=[[{1d10+@{survival_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{survival}+1]]d10+@{survival_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Survival</button></div>
   <div class="sheet-survivalrank"><input name="attr_survival" type="number" min=0 max=4><input name="attr_survival+1" type="hidden"></div>
   <div class="sheet-survivalstat">Cool</div>
   <div class="sheet-survivalbonus"><input name="attr_survival_total" type="text" readonly></div>
-  <div class="sheet-swimmingbutton"><button type="roll"value="&{template:skill} {{name=swimming}}{{success=[[{1d10+@{swimming_total}}>?{target|10}]]}}{{skill=[[{[[@{swimming}+1]]d10+@{swimming_total}}>?{target|10}]]}}">Swimming</button></div>
+  <div class="sheet-swimmingbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=swimming}}{{success=[[{1d10+@{swimming_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{swimming}+1]]d10+@{swimming_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Swimming</button></div>
   <div class="sheet-swimmingrank"><input name="attr_swimming" type="number" min=0 max=4><input name="attr_swimming+1" type="hidden"></div>
   <div class="sheet-swimmingstat">Strength</div>
   <div class="sheet-swimmingbonus"><input name="attr_swimming_total" type="text" readonly></div>
-  <div class="sheet-tacticsbutton"><button type="roll"value="&{template:skill} {{name=tactics}}{{success=[[{1d10+@{tactics_total}}>?{target|10}]]}}{{skill=[[{[[@{tactics}+1]]d10+@{tactics_total}}>?{target|10}]]}}">Tactics</button></div>
+  <div class="sheet-tacticsbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=tactics}}{{success=[[{1d10+@{tactics_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{tactics}+1]]d10+@{tactics_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Tactics</button></div>
   <div class="sheet-tacticsrank"><input name="attr_tactics" type="number" min=0 max=4><input name="attr_tactics+1" type="hidden"></div>
   <div class="sheet-tacticsstat">Concentration</div>
   <div class="sheet-tacticsbonus"><input name="attr_tactics_total" type="text" readonly></div>
-  <div class="sheet-techelecbutton"><button type="roll"value="&{template:skill} {{name=techelec}}{{success=[[{1d10+@{techelec_total}}>?{target|10}]]}}{{skill=[[{[[@{techelec}+1]]d10+@{techelec_total}}>?{target|10}]]}}">Tech Electrical</button></div>
+  <div class="sheet-techelecbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=techelec}}{{success=[[{1d10+@{techelec_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{techelec}+1]]d10+@{techelec_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Tech Electrical</button></div>
   <div class="sheet-techelecrank"><input name="attr_techelec" type="number" min=0 max=4><input name="attr_techelec+1" type="hidden"></div>
   <div class="sheet-techelecstat">Concentration</div>
   <div class="sheet-techelecbonus"><input name="attr_techelec_total" type="text" readonly></div>
-  <div class="sheet-techmanbutton"><button type="roll"value="&{template:skill} {{name=techman}}{{success=[[{1d10+@{techman_total}}>?{target|10}]]}}{{skill=[[{[[@{techman}+1]]d10+@{techman_total}}>?{target|10}]]}}">Tech Manual</button></div>
+  <div class="sheet-techmanbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=techman}}{{success=[[{1d10+@{techman_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{techman}+1]]d10+@{techman_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Tech Manual</button></div>
   <div class="sheet-techmanrank"><input name="attr_techman" type="number" min=0 max=4><input name="attr_techman+1" type="hidden"></div>
   <div class="sheet-techmanstat">Concentration</div>
   <div class="sheet-techmanbonus"><input name="attr_techman_total" type="text" readonly></div>
-  <div class="sheet-techwpnbutton"><button type="roll"value="&{template:skill} {{name=techwpn}}{{success=[[{1d10+@{techwpn_total}}>?{target|10}]]}}{{skill=[[{[[@{techwpn}+1]]d10+@{techwpn_total}}>?{target|10}]]}}">Tech Weapons</button></div>
+  <div class="sheet-techwpnbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=techwpn}}{{success=[[{1d10+@{techwpn_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{techwpn}+1]]d10+@{techwpn_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Tech Weapons</button></div>
   <div class="sheet-techwpnrank"><input name="attr_techwpn" type="number" min=0 max=4><input name="attr_techwpn+1" type="hidden"></div>
   <div class="sheet-techwpnstat">Concentration</div>
   <div class="sheet-techwpnbonus"><input name="attr_techwpn_total" type="text" readonly></div>
-  <div class="sheet-throwbutton"><button type="roll"value="&{template:skill} {{name=throw}}{{success=[[{1d10+@{throw_total}}>?{target|10}]]}}{{skill=[[{[[@{throw}+1]]d10+@{throw_total}}>?{target|10}]]}}">Throw</button></div>
+  <div class="sheet-throwbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=throw}}{{success=[[{1d10+@{throw_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{throw}+1]]d10+@{throw_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Throw</button></div>
   <div class="sheet-throwrank"><input name="attr_throw" type="number" min=0 max=4><input name="attr_throw+1" type="hidden"></div>
   <div class="sheet-throwstat">Strength</div>
   <div class="sheet-throwbonus"><input name="attr_throw_total" type="text" readonly></div>
-  <div class="sheet-torturebutton"><button type="roll"value="&{template:skill} {{name=torture}}{{success=[[{1d10+@{torture_total}}>?{target|10}]]}}{{skill=[[{[[@{torture}+1]]d10+@{torture_total}}>?{target|10}]]}}">Torture</button></div>
+  <div class="sheet-torturebutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=torture}}{{success=[[{1d10+@{torture_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{torture}+1]]d10+@{torture_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Torture</button></div>
   <div class="sheet-torturerank"><input name="attr_torture" type="number" min=0 max=4><input name="attr_torture+1" type="hidden"></div>
   <div class="sheet-torturestat">Cool</div>
   <div class="sheet-torturebonus"><input name="attr_torture_total" type="text" readonly></div>
-  <div class="sheet-trackingbutton"><button type="roll"value="&{template:skill} {{name=tracking}}{{success=[[{1d10+@{tracking_total}}>?{target|10}]]}}{{skill=[[{[[@{tracking}+1]]d10+@{tracking_total}}>?{target|10}]]}}">Tracking</button></div>
+  <div class="sheet-trackingbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=tracking}}{{success=[[{1d10+@{tracking_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{tracking}+1]]d10+@{tracking_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Tracking</button></div>
   <div class="sheet-trackingrank"><input name="attr_tracking" type="number" min=0 max=4><input name="attr_tracking+1" type="hidden"></div>
   <div class="sheet-trackingstat">Concentration</div>
   <div class="sheet-trackingbonus"><input name="attr_tracking_total" type="text" readonly></div>
-  <div class="sheet-unarmedbutton"><button type="roll"value="&{template:skill} {{name=unarmed}}{{success=[[{1d10+@{unarmed_total}}>?{target|10}]]}}{{skill=[[{[[@{unarmed}+1]]d10+@{unarmed_total}}>?{target|10}]]}}">Unarmed Cmbt</button></div>
+  <div class="sheet-unarmedbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=unarmed}}{{success=[[{1d10+@{unarmed_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{unarmed}+1]]d10+@{unarmed_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Unarmed Cmbt</button></div>
   <div class="sheet-unarmedrank"><input name="attr_unarmed" type="number" min=0 max=4><input name="attr_unarmed+1" type="hidden"></div>
   <div class="sheet-unarmedstat">Strength</div>
   <div class="sheet-unarmedbonus"><input name="attr_unarmed_total" type="text" readonly></div>
@@ -328,43 +328,43 @@
   <div class="sheet-skillotherranktitle">RANK</div>
   <div class="sheet-skillotherstattitle">STAT</div>
   <div class="sheet-skillotherbonustitle">BONUS</div>
-  <div class="sheet-awarenessbutton"><button type="roll"value="&{template:skill} {{name=awareness}}{{success=[[{1d10+@{awareness_total}}>?{target|10}]]}}{{skill=[[{[[@{awareness}+1]]d10+@{awareness_total}}>?{target|10}]]}}">Awareness</button></div>
+  <div class="sheet-awarenessbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=awareness}}{{success=[[{1d10+@{awareness_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{awareness}+1]]d10+@{awareness_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Awareness</button></div>
   <div class="sheet-awarenessrank"><input name="attr_awareness" type="number" min=0 max=4><input name="attr_awareness+1" type="hidden"></div>
   <div class="sheet-awarenessstat">Concentration</div>
   <div class="sheet-awarenessbonus"><input name="attr_awareness_total" type="text" readonly></div>
-  <div class="sheet-blastbutton"><button type="roll"value="&{template:skill} {{name=blast}}{{success=[[{1d10+@{blast_total}}>?{target|10}]]}}{{skill=[[{[[@{blast}+1]]d10+@{blast_total}}>?{target|10}]]}}">Blast</button></div>
+  <div class="sheet-blastbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=blast}}{{success=[[{1d10+@{blast_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{blast}+1]]d10+@{blast_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Blast</button></div>
   <div class="sheet-blastrank"><input name="attr_blast" type="number" min=0 max=4><input name="attr_blast+1" type="hidden"></div>
   <div class="sheet-blaststat">Concentration</div>
   <div class="sheet-blastbonus"><input name="attr_blast_total" type="text" readonly></div>
-  <div class="sheet-communicatebutton"><button type="roll"value="&{template:skill} {{name=communicate}}{{success=[[{1d10+@{communicate_total}}>?{target|10}]]}}{{skill=[[{[[@{communicate}+1]]d10+@{communicate_total}}>?{target|10}]]}}">Communicate</button></div>
+  <div class="sheet-communicatebutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=communicate}}{{success=[[{1d10+@{communicate_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{communicate}+1]]d10+@{communicate_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Communicate</button></div>
   <div class="sheet-communicaterank"><input name="attr_communicate" type="number" min=0 max=4><input name="attr_communicate+1" type="hidden"></div>
   <div class="sheet-communicatestat">Concentration</div>
   <div class="sheet-communicatebonus"><input name="attr_communicate_total" type="text" readonly></div>
-  <div class="sheet-enhancebutton"><button type="roll"value="&{template:skill} {{name=enhance}}{{success=[[{1d10+@{enhance_total}}>?{target|10}]]}}{{skill=[[{[[@{enhance}+1]]d10+@{enhance_total}}>?{target|10}]]}}">Enhance</button></div>
+  <div class="sheet-enhancebutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=enhance}}{{success=[[{1d10+@{enhance_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{enhance}+1]]d10+@{enhance_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Enhance</button></div>
   <div class="sheet-enhancerank"><input name="attr_enhance" type="number" min=0 max=4><input name="attr_enhance+1" type="hidden"></div>
   <div class="sheet-enhancestat">Concentration</div>
   <div class="sheet-enhancebonus"><input name="attr_enhance_total" type="text" readonly></div>
-  <div class="sheet-healbutton"><button type="roll"value="&{template:skill} {{name=heal}}{{success=[[{1d10+@{heal_total}}>?{target|10}]]}}{{skill=[[{[[@{heal}+1]]d10+@{heal_total}}>?{target|10}]]}}">Heal</button></div>
+  <div class="sheet-healbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=heal}}{{success=[[{1d10+@{heal_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{heal}+1]]d10+@{heal_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Heal</button></div>
   <div class="sheet-healrank"><input name="attr_heal" type="number" min=0 max=4><input name="attr_heal+1" type="hidden"></div>
   <div class="sheet-healstat">Concentration</div>
   <div class="sheet-healbonus"><input name="attr_heal_total" type="text" readonly></div>
-  <div class="sheet-protectbutton"><button type="roll"value="&{template:skill} {{name=protect}}{{success=[[{1d10+@{protect_total}}>?{target|10}]]}}{{skill=[[{[[@{protect}+1]]d10+@{protect_total}}>?{target|10}]]}}">Protect</button></div>
+  <div class="sheet-protectbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=protect}}{{success=[[{1d10+@{protect_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{protect}+1]]d10+@{protect_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Protect</button></div>
   <div class="sheet-protectrank"><input name="attr_protect" type="number" min=0 max=4><input name="attr_protect+1" type="hidden"></div>
   <div class="sheet-protectstat">Concentration</div>
   <div class="sheet-protectbonus"><input name="attr_protect_total" type="text" readonly></div>
-  <div class="sheet-realityfoldbutton"><button type="roll"value="&{template:skill} {{name=realityfold}}{{success=[[{1d10+@{realityfold_total}}>?{target|10}]]}}{{skill=[[{[[@{realityfold}+1]]d10+@{realityfold_total}}>?{target|10}]]}}">Reality Fold</button></div>
+  <div class="sheet-realityfoldbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=realityfold}}{{success=[[{1d10+@{realityfold_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{realityfold}+1]]d10+@{realityfold_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Reality Fold</button></div>
   <div class="sheet-realityfoldrank"><input name="attr_realityfold" type="number" min=0 max=4><input name="attr_realityfold+1" type="hidden"></div>
   <div class="sheet-realityfoldstat">Concentration</div>
   <div class="sheet-realityfoldbonus"><input name="attr_realityfold_total" type="text" readonly></div>
-  <div class="sheet-sensesbutton"><button type="roll"value="&{template:skill} {{name=senses}}{{success=[[{1d10+@{senses_total}}>?{target|10}]]}}{{skill=[[{[[@{senses}+1]]d10+@{senses_total}}>?{target|10}]]}}">Senses</button></div>
+  <div class="sheet-sensesbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=senses}}{{success=[[{1d10+@{senses_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{senses}+1]]d10+@{senses_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Senses</button></div>
   <div class="sheet-sensesrank"><input name="attr_senses" type="number" min=0 max=4><input name="attr_senses+1" type="hidden"></div>
   <div class="sheet-sensesstat">Concentration</div>
   <div class="sheet-sensesbonus"><input name="attr_senses_total" type="text" readonly></div>
-  <div class="sheet-telekinesisbutton"><button type="roll"value="&{template:skill} {{name=telekinesis}}{{success=[[{1d10+@{telekinesis_total}}>?{target|10}]]}}{{skill=[[{[[@{telekinesis}+1]]d10+@{telekinesis_total}}>?{target|10}]]}}">Telekinesis</button></div>
+  <div class="sheet-telekinesisbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=telekinesis}}{{success=[[{1d10+@{telekinesis_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{telekinesis}+1]]d10+@{telekinesis_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Telekinesis</button></div>
   <div class="sheet-telekinesisrank"><input name="attr_telekinesis" type="number" min=0 max=4><input name="attr_telekinesis+1" type="hidden"></div>
   <div class="sheet-telekinesisstat">Concentration</div>
   <div class="sheet-telekinesisbonus"><input name="attr_telekinesis_total" type="text" readonly></div>
-  <div class="sheet-thermalbutton"><button type="roll"value="&{template:skill} {{name=thermal}}{{success=[[{1d10+@{thermal_total}}>?{target|10}]]}}{{skill=[[{[[@{thermal}+1]]d10+@{thermal_total}}>?{target|10}]]}}">Thermal</button></div>
+  <div class="sheet-thermalbutton"><button type="roll"value="&{template:skill} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name=thermal}}{{success=[[{1d10+@{thermal_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{thermal}+1]]d10+@{thermal_total}}+?{Skill Dice Modifier}}>?{Target Number}]]}}">Thermal</button></div>
   <div class="sheet-thermalrank"><input name="attr_thermal" type="number" min=0 max=4><input name="attr_thermal+1" type="hidden"></div>
   <div class="sheet-thermalstat">Concentration</div>
   <div class="sheet-thermalbonus"><input name="attr_thermal_total" type="text" readonly></div>
@@ -2906,7 +2906,7 @@ on("change:rangedweapon_1", function() {
       var setweaponrof = weaponrof[rangedweapon1]||"n/a";
       var setweaponrecoil = weaponrecoil[rangedweapon1]||"n/a";
       var setweaponenc = weaponenc[rangedweapon1]||0;
-	  var setweaponroll = "&{template:weapon} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}}>?{target|10}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}}>?{target|10}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}"
+	  var setweaponroll = "&{template:weapon} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}+?{Skill Dice Modifier}}>?{Target Number}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}"
       setAttrs({
         "rangedweapon_skill_1": setweaponskill,
         "rangeweapon_range_1": setweaponrange,
@@ -2941,7 +2941,7 @@ on("change:rangedweapon_2", function() {
       var setweaponrof = weaponrof[rangedweapon1]||"n/a";
       var setweaponrecoil = weaponrecoil[rangedweapon1]||"n/a";
       var setweaponenc = weaponenc[rangedweapon1]||0;
-	  var setweaponroll = "&{template:weapon} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}}>?{target|10}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}}>?{target|10}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}"
+	  var setweaponroll = "&{template:weapon} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}+?{Skill Dice Modifier}}>?{Target Number}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}"
       setAttrs({
         "rangedweapon_skill_2": setweaponskill,
         "rangeweapon_range_2": setweaponrange,
@@ -2976,7 +2976,7 @@ on("change:rangedweapon_3", function() {
       var setweaponrof = weaponrof[rangedweapon1]||"n/a";
       var setweaponrecoil = weaponrecoil[rangedweapon1]||"n/a";
       var setweaponenc = weaponenc[rangedweapon1]||0;
-	  var setweaponroll = "&{template:weapon} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}}>?{target|10}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}}>?{target|10}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}"
+	  var setweaponroll = "&{template:weapon} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}+?{Skill Dice Modifier}}>?{Target Number}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}"
       setAttrs({
         "rangedweapon_skill_3": setweaponskill,
         "rangeweapon_range_3": setweaponrange,
@@ -3011,7 +3011,7 @@ on("change:rangedweapon_4", function() {
       var setweaponrof = weaponrof[rangedweapon1]||"n/a";
       var setweaponrecoil = weaponrecoil[rangedweapon1]||"n/a";
       var setweaponenc = weaponenc[rangedweapon1]||0;
-	  var setweaponroll = "&{template:weapon} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}}>?{target|10}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}}>?{target|10}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}"
+	  var setweaponroll = "&{template:weapon} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}+?{Skill Dice Modifier}}>?{Target Number}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}"
       setAttrs({
         "rangedweapon_skill_4": setweaponskill,
         "rangeweapon_range_4": setweaponrange,
@@ -3040,7 +3040,7 @@ on("change:meleeweapon_1", function() {
       var setweaponmindmg = weaponmindmg[meleeweapon1]||0;
       var setweaponad = weaponad[meleeweapon1]||0;
       var setweaponenc = weaponenc[meleeweapon1]||0;
-	  var setweaponroll = "&{template:weapon} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}}>?{target|10}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}}>?{target|10}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}";
+	  var setweaponroll = "&{template:weapon} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}+?{Skill Dice Modifier}}>?{Target Number}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}";
       setAttrs({
         "meleeweapon_skill_1": setweaponskill,
         "meleeweapon_damage_1": setweapondmg,
@@ -3067,7 +3067,7 @@ on("change:meleeweapon_2", function() {
       var setweaponmindmg = weaponmindmg[meleeweapon1]||0;
       var setweaponad = weaponad[meleeweapon1]||0;
       var setweaponenc = weaponenc[meleeweapon1]||0;
-	  var setweaponroll = "&{template:weapon} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}}>?{target|10}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}}>?{target|10}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}"
+	  var setweaponroll = "&{template:weapon} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}+?{Skill Dice Modifier}}>?{Target Number}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}"
       setAttrs({
         "meleeweapon_skill_2": setweaponskill,
         "meleeweapon_damage_2": setweapondmg,
@@ -3093,7 +3093,7 @@ on("change:meleeweapon_3", function() {
       var setweaponmindmg = weaponmindmg[meleeweapon1]||0;
       var setweaponad = weaponad[meleeweapon1]||0;
       var setweaponenc = weaponenc[meleeweapon1]||0;
-	  var setweaponroll = "&{template:weapon} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}}>?{target|10}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}}>?{target|10}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}"
+	  var setweaponroll = "&{template:weapon} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}+?{Skill Dice Modifier}}>?{Target Number}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}"
       setAttrs({
         "meleeweapon_skill_3": setweaponskill,
         "meleeweapon_damage_3": setweapondmg,