diff --git a/Dark_Heresy_2ed/DarkHeresy2ed.html b/Dark_Heresy_2ed/DarkHeresy2ed.html
index 2ea8898111..a4c5beb129 100644
--- a/Dark_Heresy_2ed/DarkHeresy2ed.html
+++ b/Dark_Heresy_2ed/DarkHeresy2ed.html
@@ -133,7 +133,9 @@
 						<!-- WeaponSkill (WS) -->
 						<div class="sheet-2colrow">
 							<div class="sheet-col">
-								<button name="roll_WS" type="roll" value="/em rolls Weapon Skill: [[1d100]] Target: [[@{WeaponSkill}+ [[?{Modifier|0}]]]]."><label>Weapon Skill (WS)</label></button>
+								<button name="roll_WS" type="roll" value="&{template:dh2ed}[[[[floor((@{WeaponSkill} +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Weapon Skill}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{WeaponSkill}]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{WeaponSkill} + [[?{Modifier|+0}]]]]}}">
+									<label>Weapon Skill (WS)</label>
+								</button>
 							</div>
 							<div class="sheet-col">
 							    <div class="sheet-unnatural_box">
@@ -159,7 +161,9 @@
 						<!-- BallisticSkill (BS) -->
 						<div class="sheet-2colrow">
 							<div class="sheet-col">
-								<button name="roll_BS" type="roll" value="/em rolls Ballistic Skill: [[1d100]] Target: [[@{BallisticSkill}+ [[?{Modifier|0}]]]]."><label>Ballistic Skill (BS)</label></button>
+								<button name="roll_BS" type="roll" value="&{template:dh2ed}[[[[floor((@{BallisticSkill} +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Ballistic Skill}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{BallisticSkill}]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{BallisticSkill} + [[?{Modifier|+0}]]]]}}">
+									<label>Ballistic Skill (BS)</label>
+								</button>
 							</div>
 							<div class="sheet-col">
 							    <div class="sheet-unnatural_box">
@@ -186,7 +190,9 @@
 						<!-- Strength (S) -->
 						<div class="sheet-2colrow">
 							<div class="sheet-col">
-								<button name="roll_S" type="roll" value="/em rolls Strength: [[1d100]] Target: [[@{Strength}+ [[?{Modifier|0}]]]]."><label>Strength (S)</label></button>
+								<button name="roll_S" type="roll" value="&{template:dh2ed}[[[[floor((@{Strength} +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Strength}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{Strength}]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{Strength} + [[?{Modifier|+0}]]]]}}">
+									<label>Strength (S)</label>
+								</button>
 							</div>
 							<div class="sheet-col">
 							    <div class="sheet-unnatural_box">
@@ -213,7 +219,9 @@
 						<!-- Toughness (T) -->
 						<div class="sheet-2colrow">
 							<div class="sheet-col">
-								<button name="roll_T" type="roll" value="/em rolls Toughness: [[1d100]] Target: [[@{Toughness}+ [[?{Modifier|0}]]]]."><label>Toughness (T)</label></button>
+								<button name="roll_T" type="roll" value="&{template:dh2ed}[[[[floor((@{Toughness} +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Toughness}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{Toughness}]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{Toughness} + [[?{Modifier|+0}]]]]}}">
+									<label>Toughness (T)</label>
+								</button>
 							</div>
 							<div class="sheet-col">
 							    <div class="sheet-unnatural_box">
@@ -240,7 +248,9 @@
 						<!-- Agility (Ag) -->
 						<div class="sheet-2colrow">
 							<div class="sheet-col">
-								<button name="roll_Ag" type="roll" value="/em rolls Agility: [[1d100]] Target: [[@{Agility}+ [[?{Modifier|0}]]]]."><label>Agility (Ag)</label></button>
+								<button name="roll_Ag" type="roll" value="&{template:dh2ed}[[[[floor((@{Agility} +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Agility}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{Agility}]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{Agility} + [[?{Modifier|+0}]]]]}}">
+									<label>Agility (Ag)</label>
+								</button>
 							</div>
 							<div class="sheet-col">
 							    <div class="sheet-unnatural_box">
@@ -271,7 +281,9 @@
 						<!-- Intelligence (Int) -->
 						<div class="sheet-2colrow">
 							<div class="sheet-col">
-								<button name="roll_Int" type="roll" value="/em rolls Intelligence: [[1d100]] Target: [[@{Intelligence}+ [[?{Modifier|0}]]]]."><label>Intelligence (Int)</label></button>
+								<button name="roll_Int" type="roll" value="&{template:dh2ed}[[[[floor((@{Intelligence} +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Intelligence}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{Intelligence}]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{Intelligence} + [[?{Modifier|+0}]]]]}}">
+									<label>Intelligence (Int)</label>
+								</button>
 							</div>
 							<div class="sheet-col">
 							    <div class="sheet-unnatural_box">
@@ -298,7 +310,9 @@
 						<!-- Perception (Per) -->
 						<div class="sheet-2colrow">
 							<div class="sheet-col">
-								<button name="roll_Per" type="roll" value="/em rolls Perception: [[1d100]] Target: [[@{Perception}+ [[?{Modifier|0}]]]]."><label>Perception (Per)</label></button>
+								<button name="roll_Per" type="roll" value="&{template:dh2ed}[[[[floor((@{Perception} +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Perception}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{Perception}]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{Perception} + [[?{Modifier|+0}]]]]}}">
+									<label>Perception (Per)</label>
+								</button>
 							</div>
 							<div class="sheet-col">
 							    <div class="sheet-unnatural_box">
@@ -325,7 +339,9 @@
 						<!-- Willpower (WP) -->
 						<div class="sheet-2colrow">
 							<div class="sheet-col">
-								<button name="roll_WP" type="roll" value="/em rolls Willpower: [[1d100]] Target: [[@{Willpower}+ [[?{Modifier|0}]]]]."><label>Willpower (WP)</label></button>
+								<button name="roll_WP" type="roll" value="&{template:dh2ed}[[[[floor((@{Willpower} +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Willpower}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{Willpower}]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{Willpower} + [[?{Modifier|+0}]]]]}}">
+									<label>Willpower (WP)</label>
+								</button>
 							</div>
 							<div class="sheet-col">
 							    <div class="sheet-unnatural_box">
@@ -352,7 +368,9 @@
 						<!-- Fellowship (Fel) -->
 						<div class="sheet-2colrow">
 							<div class="sheet-col">
-								<button name="roll_Fel" type="roll" value="/em rolls Fellowship: [[1d100]] Target: [[@{Fellowship}+ [[?{Modifier|0}]]]]."><label>Fellowship (Fel)</label></button>
+								<button name="roll_Fel" type="roll" value="&{template:dh2ed}[[[[floor((@{Fellowship} +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Fellowship}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{Fellowship}]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{Fellowship} + [[?{Modifier|+0}]]]]}}">
+									<label>Fellowship (Fel)</label>
+								</button>
 							</div>
 							<div class="sheet-col">
 							    <div class="sheet-unnatural_box">
@@ -379,7 +397,9 @@
 						<!-- Influence (Ifl) -->
 						<div class="sheet-2colrow">
 							<div class="sheet-col">
-								<button name="roll_Inf" type="roll" value="/em rolls Influence: [[1d100]] Target: [[@{Influence}+ [[?{Modifier|0}]]]]."><label>Influence (Inf)</label></button>
+								<button name="roll_Inf" type="roll" value="&{template:dh2ed}[[[[floor((@{Influence} +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Influence}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{Influence}]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{Influence} + [[?{Modifier|+0}]]]]}}">
+									<label>Influence (Inf)</label>
+								</button>
 							</div>
 							<div class="sheet-col">
 							    <div class="sheet-unnatural_box">
@@ -3081,6 +3101,7 @@
 		{{/psy}}
 
 		{{#^rollLess() degrees 0}}
+		{{#^rollLess() target roll}}
 		{{#damage}}
 		<tr class="sheet-damage">
 			<td><span class="sheet-tcat">Damage: </span></td>
@@ -3121,6 +3142,7 @@
 			<td><span class="sheet-inlinerollresult">{{special}}</span></td>
 		</tr>
 		{{/special}}
+		{{/^rollLess() target roll}}
 		{{/^rollLess() degrees 0}}
 
 		{{#initiative}}