diff --git a/Dark_Heresy_2ed/DarkHeresy2ed.html b/Dark_Heresy_2ed/DarkHeresy2ed.html
index de5960a0ff..a17a2bda5c 100644
--- a/Dark_Heresy_2ed/DarkHeresy2ed.html
+++ b/Dark_Heresy_2ed/DarkHeresy2ed.html
@@ -2516,12 +2516,12 @@
 							<div class="sheet-item" style="width: 6%;"><input name="attr_Rangedweaponclip_max" type="text" value="0" /></div>
 							<div class="sheet-item" style="width: 15%;"><label>Reload:</label></div>
 							<div class="sheet-item" style="width: 15%;"><input name="attr_Rangedweaponreload" type="text" /></div>
-							<div class="sheet-item" style="width: 16%;"><button name="roll_Rangedhit" type="roll" value="/me uses @{Rangedweaponname} [[1d100]] Target [[@{BallisticSkill} +[[ ?{Aim | No aim (+0),+0 | Half aim (+10),+10| Full aim (+20),+20} + ?{Range | Standard range (+0),+0 | Short Range (+10),+10 | Point Blank (+30),+30 | Long Range (-10),-10 | Extreme Range (-30),-30} + ?{Rate of Fire/Attack Type| Semi auto (+0),+0 | Standard (+10),+10 | Full Auto (-10),-10 | Called Shot (-20),-20 | Suppressing Fire (-20),-20} + [[?{Modifier|0}]] ]]]]."> <label>Hit</label> </button></div>
+							<div class="sheet-item" style="width: 16%;"><button name="roll_Rangedhit" type="roll" value="&{template:dh2ed}[[[[floor((@{BallisticSkill}?{Aim | No aim (+0),+0 | Half aim (+10),+10| Full aim (+20),+20}+ ?{Range | Point Blank (+30),+30 | Short Range (+10),+10 | Standard range (+0),+0 | Long Range (-10),-10 | Extreme Range (-30),-30}+ ?{Rate of Fire/Attack Type| Standard (+10),+10 | Semi auto (+0),+0 | Full Auto (-10),-10 | Called Shot (-20),-20 | Suppressing Fire (-20),-20}+ [[?{Modifier|0}]])/10))]]-[[floor([[1d100cs<1cf>100]]/10)]]]]{{name=@{Rangedweaponname}}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=@{BallisticSkill}}}{{aim=?{Aim | No aim (+0),+0 | Half aim (+10),+10 | Full aim (+20),+20} }}{{range= ?{Range | Standard range (+0),Standard range +0 | Short Range (+10),+10 | Point Blank (+30),+30 | Long Range (-10),-10 | Extreme Range (-30),-30}}}{{attacktype=?{Rate of Fire/Attack Type| Semi auto (+0),+0 | Standard (+10),+10 | Full Auto (-10),-10 | Called Shot (-20),-20 | Suppressing Fire (-20),-20}}}{{modifier=?{Modifier|+0} }}{{target=[[@{WeaponSkill}+ [[?{Aim | No aim (+0),0 | Half aim (+10),10 | Full aim (+20),20} + ?{Range | Standard range (+0),Standard range +0 | Short Range (+10),+10 | Point Blank (+30),+30 | Long Range (-10),-10 | Extreme Range (-30),-30} + [[?{Modifier|0}]]]]]]}}"> <label>Hit</label> </button></div>
 						</div>
 						<div class="sheet-row">
 							<div class="sheet-item" style="width: 15%;"><label>Special:</label></div>
 							<div class="sheet-item" style="width: 69%;"><input name="attr_Rangedweaponspecial" type="text" /></div>
-							<div class="sheet-item" style="width: 16%;"><button name="roll_Rangeddamage" type="roll" value="/me does [[@{Rangedweapondamage}]] @{Rangedweapontype} damage! (Pen: @{Rangedweaponpen})"> <label>Damage</label> </button></div>
+							<div class="sheet-item" style="width: 16%;"><button name="roll_Rangeddamage" type="roll" value="&{template:dh2ed-dmg}{{name=@{Rangedweaponname}}}{{damage=[[@{Rangedweapondamage}+@{UnS}+floor(@{strength}/10)]]}}{{damagetype=@{Rangedweapontype}}}{{special=@{Rangedweaponspecial}}}{{penetration= @{Rangedweaponpen}}}"> <label>Damage</label> </button></div>
 						</div>
 					</div>
 				</fieldset>
@@ -2542,12 +2542,12 @@
 							<div class="sheet-item" style="width: 18%;"><input name="attr_meleeweapontype" type="text" /></div>
 							<div class="sheet-item" style="width: 10%;"><label>Pen:</label></div>
 							<div class="sheet-item" style="width: 10%;"><input name="attr_meleeweaponpen" type="text" value="0" /></div>
-							<div class="sheet-item" style="width: 16%;"><button name="roll_meleehit" type="roll" value="/em uses @{meleeweaponname} [[1d100]] Target [[@{WeaponSkill}+ [[?{Aim | No aim (+0),+0 | Half aim (+10),+10 | Full aim (+20),+20} + ?{Attack Type | Standard (+10),+10 | Charge (+20),+20 | All out (+30),+30 | Swift Attack (+0),+0 | Lighting (-10),-10} + [[?{Modifier|0}]]]]]]"> <label>Hit</label> </button></div>
+							<div class="sheet-item" style="width: 16%;"><button name="roll_meleehit" type="roll" value="&{template:dh2ed}[[[[floor((@{WeaponSkill}+ ?{Aim | No aim (+0),+0 | Half aim (+10),+10 | Full aim (+20),+20} + ?{Attack Type | All out (+30),+30| Charge (+20),+20 |Standard (+10),+10 | Swift Attack (+0),+0 | Lighting (-10),-10} + [[?{Modifier|+0}]])/10))]]-[[floor([[1d100cs<1cf>100]]/10)]]]] {{name=@{meleeweaponname}}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=@{WeaponSkill}}}{{aim=?{Aim | No aim (+0),+0 | Half aim (+10),+10 | Full aim (+20),+20} }}{{attacktype= ?{Attack Type | All out (+30),+30 Allout| Charge (+20),+20 |Standard (+10),+10 | Swift Attack (+0),0 | Lighting (-10),-10}}} {{modifier=?{Modifier|+0} }} {{target=[[@{WeaponSkill}+ [[?{Aim | No aim (+0),0 | Half aim (+10),10 | Full aim (+20),20} + ?{Attack Type | All out (+30),30| Charge (+20),20 |Standard (+10),10 | Swift Attack (+0),0 | Lighting (-10),-10} + [[?{Modifier|0}]]]]]]}}"> <label>Hit</label> </button></div>
 						</div>
 							<div class="sheet-row">
 							<div class="sheet-item" style="width: 15%;"><label>Special:</label></div>
 							<div class="sheet-item" style="width: 69%;"><input name="attr_meleeweaponspecial" type="text" /> </div>
-							<div class="sheet-item" style="width: 16%;"><button name="roll_meleedamage" type="roll" value="/me does [[@{meleeweapondamage}+@{UnS}+[[floor(@{strength}/10)]]]] @{meleeweapontype} damage! (Pen: @{meleeweaponpen})"> <label>Damage</label> </button></div>
+							<div class="sheet-item" style="width: 16%;"><button name="roll_meleedamage" type="roll" value="&{template:dh2ed-dmg}{{name=@{meleeweaponname}}}{{damage=[[@{meleeweapondamage}+@{UnS}+floor(@{strength}/10)]]}}{{damagetype=@{meleeweapontype}}}{{special=@{meleeweaponspecial}}}{{penetration= @{meleeweaponpen}}}"> <label>Damage</label> </button></div>
 						</div>
 					</div>
 				</fieldset>