diff --git a/Dark_Heresy_2ed/DarkHeresy2ed.html b/Dark_Heresy_2ed/DarkHeresy2ed.html
index a4c5beb129..636fead878 100644
--- a/Dark_Heresy_2ed/DarkHeresy2ed.html
+++ b/Dark_Heresy_2ed/DarkHeresy2ed.html
@@ -172,7 +172,6 @@
 							</div>
 							</div>
 						</div>
-
 						<div class="sheet-row">
 							<div class="sheet-item" style="width:10%"></div>
 							<div class="sheet-item" style="width:80%">
@@ -201,7 +200,6 @@
 								</div>
 							</div>
 						</div>
-
 						<div class="sheet-row">
 							<div class="sheet-item" style="width:10%"></div>
 							<div class="sheet-item" style="width:80%">
@@ -230,7 +228,6 @@
 								</div>
 							</div>
 						</div>
-
 						<div class="sheet-row">
 							<div class="sheet-item" style="width:10%"></div>
 							<div class="sheet-item" style="width:80%">
@@ -259,7 +256,6 @@
 								</div>
 							</div>
 						</div>
-
 						<div class="sheet-row">
 							<div class="sheet-item" style="width:10%"></div>
 							<div class="sheet-item" style="width:80%">
@@ -292,7 +288,6 @@
 								</div>
 							</div>
 						</div>
-
 						<div class="sheet-row">
 							<div class="sheet-item" style="width:10%"></div>
 							<div class="sheet-item" style="width:80%">
@@ -321,7 +316,6 @@
 								</div>
 							</div>
 						</div>
-
 						<div class="sheet-row">
 							<div class="sheet-item" style="width:10%"></div>
 							<div class="sheet-item" style="width:80%">
@@ -350,7 +344,6 @@
 								</div>
 							</div>
 						</div>
-
 						<div class="sheet-row">
 							<div class="sheet-item" style="width:10%"></div>
 							<div class="sheet-item" style="width:80%">
@@ -379,7 +372,6 @@
 								</div>
 							</div>
 						</div>
-
 						<div class="sheet-row">
 							<div class="sheet-item" style="width:10%"></div>
 							<div class="sheet-item" style="width:80%">
@@ -593,7 +585,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Acrobatics" type="roll"
-											value="/em rolls Acrobatics [[1d100]] Target [[@{AcrobaticsCharacteristic} + (-20 + @{Acrobatics1} + @{Acrobatics2} + @{Acrobatics3} + @{Acrobatics4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{AcrobaticsCharacteristic} + (-20 + @{Acrobatics1} + @{Acrobatics2} + @{Acrobatics3} + @{Acrobatics4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Acrobatics}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{AcrobaticsCharacteristic} + (-20 + @{Acrobatics1} + @{Acrobatics2} + @{Acrobatics3} + @{Acrobatics4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{AcrobaticsCharacteristic} + (-20 + @{Acrobatics1} + @{Acrobatics2} + @{Acrobatics3} + @{Acrobatics4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Acrobatics</label>
 										</button>
 									</div>
@@ -616,7 +608,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Athletics" type="roll"
-											value="/em rolls Athletics [[1d100]] Target [[@{AthleticsCharacteristic} + (-20 + @{Athletics1} + @{Athletics2} + @{Athletics3} + @{Athletics4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{AthleticsCharacteristic} + (-20 + @{Athletics1} + @{Athletics2} + @{Athletics3} + @{Athletics4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Athletics}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{AthleticsCharacteristic} + (-20 + @{Athletics1} + @{Athletics2} + @{Athletics3} + @{Athletics4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{AthleticsCharacteristic} + (-20 + @{Athletics1} + @{Athletics2} + @{Athletics3} + @{Athletics4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Athletics</label>
 										</button>
 									</div>
@@ -639,7 +631,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Awareness" type="roll"
-											value="/em rolls Awareness [[1d100]] Target [[@{AwarenessCharacteristic} + (-20 + @{Awareness1} + @{Awareness2} + @{Awareness3} + @{Awareness4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{AwarenessCharacteristic} + (-20 + @{Awareness1} + @{Awareness2} + @{Awareness3} + @{Awareness4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Awareness}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{AwarenessCharacteristic} + (-20 + @{Awareness1} + @{Awareness2} + @{Awareness3} + @{Awareness4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{AwarenessCharacteristic} + (-20 + @{Awareness1} + @{Awareness2} + @{Awareness3} + @{Awareness4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Awareness</label>
 										</button>
 									</div>
@@ -663,7 +655,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Charm" type="roll"
-											value="/em rolls Charm [[1d100]] Target [[@{CharmCharacteristic} + (-20 + @{Charm1} + @{Charm2} + @{Charm3} + @{Charm4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{CharmCharacteristic} + (-20 + @{Charm1} + @{Charm2} + @{Charm3} + @{Charm4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Charm}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{CharmCharacteristic} + (-20 + @{Charm1} + @{Charm2} + @{Charm3} + @{Charm4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{CharmCharacteristic} + (-20 + @{Charm1} + @{Charm2} + @{Charm3} + @{Charm4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Charm</label>
 										</button>
 									</div>
@@ -686,7 +678,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Command" type="roll"
-											value="/em rolls Command [[1d100]] Target [[@{CommandCharacteristic} + (-20 + @{Command1} + @{Command2} + @{Command3} + @{Command4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{CommandCharacteristic} + (-20 + @{Command1} + @{Command2} + @{Command3} + @{Command4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Command}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{CommandCharacteristic} + (-20 + @{Command1} + @{Command2} + @{Command3} + @{Command4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{CommandCharacteristic} + (-20 + @{Command1} + @{Command2} + @{Command3} + @{Command4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Command</label>
 										</button>
 									</div>
@@ -711,7 +703,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Commerce" type="roll"
-											value="/em rolls Commerce [[1d100]] Target [[@{CommerceCharacteristic} + (-20 + @{Commerce1} + @{Commerce2} + @{Commerce3} + @{Commerce4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{CommerceCharacteristic} + (-20 + @{Commerce1} + @{Commerce2} + @{Commerce3} + @{Commerce4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Commerce}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{CommerceCharacteristic} + (-20 + @{Commerce1} + @{Commerce2} + @{Commerce3} + @{Commerce4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{CommerceCharacteristic} + (-20 + @{Commerce1} + @{Commerce2} + @{Commerce3} + @{Commerce4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Commerce</label>
 										</button>
 									</div>
@@ -734,7 +726,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Deceive" type="roll"
-											value="/em rolls Deceive [[1d100]] Target [[@{DeceiveCharacteristic} + (-20 + @{Deceive1} + @{Deceive2} + @{Deceive3} + @{Deceive4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{DeceiveCharacteristic} + (-20 + @{Deceive1} + @{Deceive2} + @{Deceive3} + @{Deceive4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Deceive}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{DeceiveCharacteristic} + (-20 + @{Deceive1} + @{Deceive2} + @{Deceive3} + @{Deceive4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{DeceiveCharacteristic} + (-20 + @{Deceive1} + @{Deceive2} + @{Deceive3} + @{Deceive4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Deceive</label>
 										</button>
 									</div>
@@ -757,7 +749,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Dodge" type="roll"
-											value="/em rolls Dodge [[1d100]] Target [[@{DodgeCharacteristic} + (-20 + @{Dodge1} + @{Dodge2} + @{Dodge3} + @{Dodge4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{DodgeCharacteristic} + (-20 + @{Dodge1} + @{Dodge2} + @{Dodge3} + @{Dodge4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Dodge}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{DodgeCharacteristic} + (-20 + @{Dodge1} + @{Dodge2} + @{Dodge3} + @{Dodge4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{DodgeCharacteristic} + (-20 + @{Dodge1} + @{Dodge2} + @{Dodge3} + @{Dodge4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Dodge</label>
 										</button>
 									</div>
@@ -779,7 +771,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Inquiry" type="roll"
-											value="/em rolls Inquiry [[1d100]] Target [[@{InquiryCharacteristic} + (-20 + @{Inquiry1} + @{Inquiry2} + @{Inquiry3} + @{Inquiry4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{InquiryCharacteristic} + (-20 + @{Inquiry1} + @{Inquiry2} + @{Inquiry3} + @{Inquiry4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Inquiry}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{InquiryCharacteristic} + (-20 + @{Inquiry1} + @{Inquiry2} + @{Inquiry3} + @{Inquiry4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{InquiryCharacteristic} + (-20 + @{Inquiry1} + @{Inquiry2} + @{Inquiry3} + @{Inquiry4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Inquiry</label>
 										</button>
 									</div>
@@ -803,7 +795,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Interrogation" type="roll"
-											value="/em rolls Interrogation [[1d100]] Target [[@{InterrogationCharacteristic} + (-20 + @{Interrogation1} + @{Interrogation2} + @{Interrogation3} + @{Interrogation4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{InterrogationCharacteristic} + (-20 + @{Interrogation1} + @{Interrogation2} + @{Interrogation3} + @{Interrogation4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Interrogation}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{InterrogationCharacteristic} + (-20 + @{Interrogation1} + @{Interrogation2} + @{Interrogation3} + @{Interrogation4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{InterrogationCharacteristic} + (-20 + @{Interrogation1} + @{Interrogation2} + @{Interrogation3} + @{Interrogation4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Interrogation</label>
 										</button>
 									</div>
@@ -826,7 +818,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Intimidate" type="roll"
-											value="/em rolls Intimidate [[1d100]] Target [[@{IntimidateCharacteristic} + (-20 + @{Intimidate1} + @{Intimidate2} + @{Intimidate3} + @{Intimidate4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{IntimidateCharacteristic} + (-20 + @{Intimidate1} + @{Intimidate2} + @{Intimidate3} + @{Intimidate4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Intimidate}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{IntimidateCharacteristic} + (-20 + @{Intimidate1} + @{Intimidate2} + @{Intimidate3} + @{Intimidate4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{IntimidateCharacteristic} + (-20 + @{Intimidate1} + @{Intimidate2} + @{Intimidate3} + @{Intimidate4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Intimidate</label>
 										</button>
 									</div>
@@ -849,7 +841,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Logic" type="roll"
-											value="/em rolls Logic [[1d100]] Target [[@{LogicCharacteristic} + (-20 + @{Logic1} + @{Logic2} + @{Logic3} + @{Logic4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{LogicCharacteristic} + (-20 + @{Logic1} + @{Logic2} + @{Logic3} + @{Logic4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Logic}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{LogicCharacteristic} + (-20 + @{Logic1} + @{Logic2} + @{Logic3} + @{Logic4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{LogicCharacteristic} + (-20 + @{Logic1} + @{Logic2} + @{Logic3} + @{Logic4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Logic</label>
 										</button>
 									</div>
@@ -872,7 +864,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Medicae" type="roll"
-											value="/em rolls Medicae [[1d100]] Target [[@{MedicaeCharacteristic} + (-20 + @{Medicae1} + @{Medicae2} + @{Medicae3} + @{Medicae4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{MedicaeCharacteristic} + (-20 + @{Medicae1} + @{Medicae2} + @{Medicae3} + @{Medicae4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Medicae}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{MedicaeCharacteristic} + (-20 + @{Medicae1} + @{Medicae2} + @{Medicae3} + @{Medicae4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{MedicaeCharacteristic} + (-20 + @{Medicae1} + @{Medicae2} + @{Medicae3} + @{Medicae4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Medicae</label>
 										</button>
 									</div>
@@ -910,7 +902,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:100%">
 										<button name="roll_Surface" type="roll"
-											value="/em rolls Navigate [[1d100]] Target [[@{NavigateCharacteristic} + (-20 + @{Surface1} + @{Surface2} + @{Surface3} + @{Surface4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{NavigateCharacteristic} + (-20 + @{Surface1} + @{Surface2} + @{Surface3} + @{Surface4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Navigate (Surface)}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{NavigateCharacteristic} + (-20 + @{Surface1} + @{Surface2} + @{Surface3} + @{Surface4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{NavigateCharacteristic} + (-20 + @{Surface1} + @{Surface2} + @{Surface3} + @{Surface4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Surface</label>
 										</button>
 									</div>
@@ -927,7 +919,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:100%">
 										<button name="roll_Stellar" type="roll"
-											value="/em rolls Navigate (Stellar) [[1d100]] Target [[@{NavigateCharacteristic} + (-20 + @{Stellar1} + @{Stellar2} + @{Stellar3} + @{Stellar4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{NavigateCharacteristic} + (-20 + @{Stellar1} + @{Stellar2} + @{Stellar3} + @{Stellar4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Navigate (Stellar)}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{NavigateCharacteristic} + (-20 + @{Stellar1} + @{Stellar2} + @{Stellar3} + @{Stellar4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{NavigateCharacteristic} + (-20 + @{Stellar1} + @{Stellar2} + @{Stellar3} + @{Stellar4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Stellar</label>
 										</button>
 									</div>
@@ -944,7 +936,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:100%">
 										<button name="roll_Warp" type="roll"
-											value="/em rolls Navigate (Warp) [[1d100]] Target [[@{NavigateCharacteristic} + (-20 + @{Warp1} + @{Warp2} + @{Warp3} + @{Warp4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{NavigateCharacteristic} + (-20 + @{Warp1} + @{Warp2} + @{Warp3} + @{Warp4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Navigate (Warp)}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{NavigateCharacteristic} + (-20 + @{Warp1} + @{Warp2} + @{Warp3} + @{Warp4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{NavigateCharacteristic} + (-20 + @{Warp1} + @{Warp2} + @{Warp3} + @{Warp4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Warp</label>
 										</button>
 									</div>
@@ -975,7 +967,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:100%">
 										<button name="roll_Aeronautica" type="roll"
-											value="/em rolls Operate [[1d100]] Target [[@{OperateCharacteristic} + (-20 + @{Aeronautica1} + @{Aeronautica2} + @{Aeronautica3} + @{Aeronautica4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{OperateCharacteristic} + (-20 + @{Aeronautica1} + @{Aeronautica2} + @{Aeronautica3} + @{Aeronautica4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Operate (Aeronautica)}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{OperateCharacteristic} + (-20 + @{Aeronautica1} + @{Aeronautica2} + @{Aeronautica3} + @{Aeronautica4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{OperateCharacteristic} + (-20 + @{Aeronautica1} + @{Aeronautica2} + @{Aeronautica3} + @{Aeronautica4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Aeronautica</label>
 										</button>
 									</div>
@@ -992,7 +984,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:100%">
 										<button name="roll_OSurface" type="roll"
-											value="/em rolls Operate (Surface) [[1d100]] Target [[@{OperateCharacteristic} + (-20 + @{OSurface1} + @{OSurface2} + @{OSurface3} + @{OSurface4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{OperateCharacteristic} + (-20 + @{OSurface1} + @{OSurface2} + @{OSurface3} + @{OSurface4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Operate (Surface)}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{OperateCharacteristic} + (-20 + @{OSurface1} + @{OSurface2} + @{OSurface3} + @{OSurface4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{OperateCharacteristic} + (-20 + @{OSurface1} + @{OSurface2} + @{OSurface3} + @{OSurface4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Surface</label>
 										</button>
 									</div>
@@ -1009,7 +1001,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:100%">
 										<button name="roll_Voidship" type="roll"
-											value="/em rolls Operate (Voidship) [[1d100]] Target [[@{OperateCharacteristic} + (-20 + @{Voidship1} + @{Voidship2} + @{Voidship3} + @{Voidship4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{OperateCharacteristic} + (-20 + @{Voidship1} + @{Voidship2} + @{Voidship3} + @{Voidship4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Operate (Voidship)}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{OperateCharacteristic} + (-20 + @{Voidship1} + @{Voidship2} + @{Voidship3} + @{Voidship4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{OperateCharacteristic} + (-20 + @{Voidship1} + @{Voidship2} + @{Voidship3} + @{Voidship4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Voidship</label>
 										</button>
 									</div>
@@ -1026,7 +1018,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Parry" type="roll"
-											value="/em rolls Parry [[1d100]] Target [[@{ParryCharacteristic} + (-20 + @{Parry1} + @{Parry2} + @{Parry3} + @{Parry4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{ParryCharacteristic} + (-20 + @{Parry1} + @{Parry2} + @{Parry3} + @{Parry4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Parry}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{ParryCharacteristic} + (-20 + @{Parry1} + @{Parry2} + @{Parry3} + @{Parry4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{ParryCharacteristic} + (-20 + @{Parry1} + @{Parry2} + @{Parry3} + @{Parry4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Parry</label>
 										</button>
 									</div>
@@ -1048,7 +1040,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Psyniscience" type="roll"
-											value="/em rolls Psyniscience [[1d100]] Target [[@{PsyniscienceCharacteristic} + (-20 + @{Psyniscience1} + @{Psyniscience2} + @{Psyniscience3} + @{Psyniscience4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{PsyniscienceCharacteristic} + (-20 + @{Psyniscience1} + @{Psyniscience2} + @{Psyniscience3} + @{Psyniscience4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Psyniscience}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{PsyniscienceCharacteristic} + (-20 + @{Psyniscience1} + @{Psyniscience2} + @{Psyniscience3} + @{Psyniscience4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{PsyniscienceCharacteristic} + (-20 + @{Psyniscience1} + @{Psyniscience2} + @{Psyniscience3} + @{Psyniscience4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Psyniscience</label>
 										</button>
 									</div>
@@ -1071,7 +1063,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Scrutiny" type="roll"
-											value="/em rolls Scrutiny [[1d100]] Target [[@{ScrutinyCharacteristic} + (-20 + @{Scrutiny1} + @{Scrutiny2} + @{Scrutiny3} + @{Scrutiny4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{ScrutinyCharacteristic} + (-20 + @{Scrutiny1} + @{Scrutiny2} + @{Scrutiny3} + @{Scrutiny4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Scrunity}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{ScrutinyCharacteristic} + (-20 + @{Scrutiny1} + @{Scrutiny2} + @{Scrutiny3} + @{Scrutiny4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{ScrutinyCharacteristic} + (-20 + @{Scrutiny1} + @{Scrutiny2} + @{Scrutiny3} + @{Scrutiny4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Scrutiny</label>
 										</button>
 									</div>
@@ -1094,7 +1086,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Security" type="roll"
-											value="/em rolls Security [[1d100]] Target [[@{SecurityCharacteristic} + (-20 + @{Security1} + @{Security2} + @{Security3} + @{Security4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{SecurityCharacteristic} + (-20 + @{Security1} + @{Security2} + @{Security3} + @{Security4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Security}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{SecurityCharacteristic} + (-20 + @{Security1} + @{Security2} + @{Security3} + @{Security4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{SecurityCharacteristic} + (-20 + @{Security1} + @{Security2} + @{Security3} + @{Security4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Security</label>
 										</button>
 									</div>
@@ -1117,7 +1109,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_SleightOfHand" type="roll"
-											value="/em rolls SleightOfHand [[1d100]] Target [[@{SleightOfHandCharacteristic} + (-20 + @{SleightOfHand1} + @{SleightOfHand2} + @{SleightOfHand3} + @{SleightOfHand4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{SleightOfHandCharacteristic} + (-20 + @{SleightOfHand1} + @{SleightOfHand2} + @{SleightOfHand3} + @{SleightOfHand4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Sleight of Hand}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{SleightOfHandCharacteristic} + (-20 + @{SleightOfHand1} + @{SleightOfHand2} + @{SleightOfHand3} + @{SleightOfHand4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{SleightOfHandCharacteristic} + (-20 + @{SleightOfHand1} + @{SleightOfHand2} + @{SleightOfHand3} + @{SleightOfHand4}) + [[?{Modifier|+0}]]]]}}">
 											<label>SleightOfHand</label>
 										</button>
 									</div>
@@ -1140,7 +1132,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Stealth" type="roll"
-											value="/em rolls Stealth [[1d100]] Target [[@{StealthCharacteristic} + (-20 + @{Stealth1} + @{Stealth2} + @{Stealth3} + @{Stealth4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{StealthCharacteristic} + (-20 + @{Stealth1} + @{Stealth2} + @{Stealth3} + @{Stealth4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Stealth}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{StealthCharacteristic} + (-20 + @{Stealth1} + @{Stealth2} + @{Stealth3} + @{Stealth4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{StealthCharacteristic} + (-20 + @{Stealth1} + @{Stealth2} + @{Stealth3} + @{Stealth4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Stealth</label>
 										</button>
 									</div>
@@ -1163,7 +1155,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_Survival" type="roll"
-											value="/em rolls Survival [[1d100]] Target [[@{SurvivalCharacteristic} + (-20 + @{Survival1} + @{Survival2} + @{Survival3} + @{Survival4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{SurvivalCharacteristic} + (-20 + @{Survival1} + @{Survival2} + @{Survival3} + @{Survival4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Survival}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{SurvivalCharacteristic} + (-20 + @{Survival1} + @{Survival2} + @{Survival3} + @{Survival4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{SurvivalCharacteristic} + (-20 + @{Survival1} + @{Survival2} + @{Survival3} + @{Survival4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Survival</label>
 										</button>
 									</div>
@@ -1187,7 +1179,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:55%">
 										<button name="roll_TechUse" type="roll"
-											value="/em rolls Tech-Use [[1d100]] Target [[@{TechUseCharacteristic} + (-20 + @{TechUse1} + @{TechUse2} + @{TechUse3} + @{TechUse4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{TechUseCharacteristic} + (-20 + @{TechUse1} + @{TechUse2} + @{TechUse3} + @{TechUse4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=Tech-Use}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{TechUseCharacteristic} + (-20 + @{TechUse1} + @{TechUse2} + @{TechUse3} + @{TechUse4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{TechUseCharacteristic} + (-20 + @{TechUse1} + @{TechUse2} + @{TechUse3} + @{TechUse4}) + [[?{Modifier|+0}]]]]}}">
 											<label>Tech-Use</label>
 										</button>
 									</div>
@@ -1230,7 +1222,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:20%">
 										<button name="roll_1stLanguage" type="roll"
-											value="/em rolls Linguistics:@{1stLanguage} [[1d100]] Target [[@{LinguisticsCharacteristic} + (-20 + @{1stLanguage1} + @{1stLanguage2} + @{1stLanguage3} + @{1stLanguage4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{LinguisticsCharacteristic} + (-20 + @{1stLanguage1} + @{1stLanguage2} + @{1stLanguage3} + @{1stLanguage4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=@{1stLanguage}}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{LinguisticsCharacteristic} + (-20 + @{1stLanguage1} + @{1stLanguage2} + @{1stLanguage3} + @{1stLanguage4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{LinguisticsCharacteristic} + (-20 + @{1stLanguage1} + @{1stLanguage2} + @{1stLanguage3} + @{1stLanguage4}) + [[?{Modifier|+0}]]]]}}">
 										</button>
 									</div>
 									<div class="sheet-item" style="width:80%">
@@ -1249,7 +1241,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:20%">
 										<button name="roll_2ndLanguage" type="roll"
-											value="/em rolls Linguistics:@{2ndLanguage} [[1d100]] Target [[@{LinguisticsCharacteristic} + (-20 + @{2ndLanguage1} + @{2ndLanguage2} + @{2ndLanguage3} + @{2ndLanguage4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{LinguisticsCharacteristic} + (-20 + @{2ndLanguage1} + @{2ndLanguage2} + @{2ndLanguage3} + @{2ndLanguage4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=@{2ndLanguage}}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{LinguisticsCharacteristic} + (-20 + @{2ndLanguage1} + @{2ndLanguage2} + @{2ndLanguage3} + @{2ndLanguage4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{LinguisticsCharacteristic} + (-20 + @{2ndLanguage1} + @{2ndLanguage2} + @{2ndLanguage3} + @{2ndLanguage4}) + [[?{Modifier|+0}]]]]}}">
 										</button>
 									</div>
 									<div class="sheet-item" style="width:80%">
@@ -1268,7 +1260,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:20%">
 										<button name="roll_3rdLanguage" type="roll"
-											value="/em rolls Linguistics:@{3rdLanguage} [[1d100]] Target [[@{LinguisticsCharacteristic} + (-20 + @{3rdLanguage1} + @{3rdLanguage2} + @{3rdLanguage3} + @{3rdLanguage4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{LinguisticsCharacteristic} + (-20 + @{3rdLanguage1} + @{3rdLanguage2} + @{3rdLanguage3} + @{3rdLanguage4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=@{3rdLanguage}}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{LinguisticsCharacteristic} + (-20 + @{3rdLanguage1} + @{3rdLanguage2} + @{3rdLanguage3} + @{3rdLanguage4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{LinguisticsCharacteristic} + (-20 + @{3rdLanguage1} + @{3rdLanguage2} + @{3rdLanguage3} + @{3rdLanguage4}) + [[?{Modifier|+0}]]]]}}">
 										</button>
 									</div>
 									<div class="sheet-item" style="width:80%">
@@ -1303,7 +1295,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:20%">
 										<button name="roll_1stTrade" type="roll"
-											value="/em rolls Trade:@{1stTrade} [[1d100]] Target [[@{TradeCharacteristic} + (-20 + @{1stTrade1} + @{1stTrade2} + @{1stTrade3} + @{1stTrade4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{TradeCharacteristic} + (-20 + @{1stTrade1} + @{1stTrade2} + @{1stTrade3} + @{1stTrade4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=@{1stTrade}}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{TradeCharacteristic} + (-20 + @{1stTrade1} + @{1stTrade2} + @{1stTrade3} + @{1stTrade4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{TradeCharacteristic} + (-20 + @{1stTrade1} + @{1stTrade2} + @{1stTrade3} + @{1stTrade4}) + [[?{Modifier|+0}]]]]}}">
 										</button>
 									</div>
 									<div class="sheet-item" style="width:80%">
@@ -1322,7 +1314,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:20%">
 										<button name="roll_2ndTrade" type="roll"
-											value="/em rolls Trade:@{2ndTrade} [[1d100]] Target [[@{TradeCharacteristic} + (-20 + @{2ndTrade1} + @{2ndTrade2} + @{2ndTrade3} + @{2ndTrade4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{TradeCharacteristic} + (-20 + @{2ndTrade1} + @{2ndTrade2} + @{2ndTrade3} + @{2ndTrade4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=@{2ndTrade}}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{TradeCharacteristic} + (-20 + @{2ndTrade1} + @{2ndTrade2} + @{2ndTrade3} + @{2ndTrade4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{TradeCharacteristic} + (-20 + @{2ndTrade1} + @{2ndTrade2} + @{2ndTrade3} + @{2ndTrade4}) + [[?{Modifier|+0}]]]]}}">
 										</button>
 									</div>
 									<div class="sheet-item" style="width:80%">
@@ -1341,7 +1333,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:20%">
 										<button name="roll_3rdTrade" type="roll"
-											value="/em rolls Trade:@{3rdTrade} [[1d100]] Target [[@{TradeCharacteristic} + (-20 + @{3rdTrade1} + @{3rdTrade2} + @{3rdTrade3} + @{3rdTrade4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{TradeCharacteristic} + (-20 + @{3rdTrade1} + @{3rdTrade2} + @{3rdTrade3} + @{3rdTrade4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=@{3rdTrade}}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{TradeCharacteristic} + (-20 + @{3rdTrade1} + @{3rdTrade2} + @{3rdTrade3} + @{3rdTrade4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{TradeCharacteristic} + (-20 + @{3rdTrade1} + @{3rdTrade2} + @{3rdTrade3} + @{3rdTrade4}) + [[?{Modifier|+0}]]]]}}">
 										</button>
 									</div>
 									<div class="sheet-item" style="width:80%">
@@ -1360,7 +1352,7 @@
 								<div class="sheet-row">
 									<div class="sheet-item" style="width:20%">
 										<button name="roll_4thTrade" type="roll"
-											value="/em rolls Trade:@{4thTrade} [[1d100]] Target [[@{TradeCharacteristic} + (-20 + @{4thTrade1} + @{4thTrade2} + @{4thTrade3} + @{4thTrade4}) + [[?{Target Modifier|0}]]]].">
+											value="&{template:dh2ed}[[[[floor((@{TradeCharacteristic} + (-20 + @{4thTrade1} + @{4thTrade2} + @{4thTrade3} + @{4thTrade4}) +[[?{Modifier|+0}]])/10))]]-[[floor([[1d100]]/10)]]]] {{name=@{4thTrade}}}{{roll= $[[2]] }}{{degrees=$[[4]]}}{{skill=[[@{TradeCharacteristic} + (-20 + @{4thTrade1} + @{4thTrade2} + @{4thTrade3} + @{4thTrade4})]]}} {{modifier=?{Modifier|+0} }} {{target=[[@{TradeCharacteristic} + (-20 + @{4thTrade1} + @{4thTrade2} + @{4thTrade3} + @{4thTrade4}) + [[?{Modifier|+0}]]]]}}">
 										</button>
 									</div>
 									<div class="sheet-item" style="width:80%">