diff --git a/Dark_Heresy_2ed/DarkHeresy2ed.html b/Dark_Heresy_2ed/DarkHeresy2ed.html
index 968d4bb359..bb5d7ec038 100644
--- a/Dark_Heresy_2ed/DarkHeresy2ed.html
+++ b/Dark_Heresy_2ed/DarkHeresy2ed.html
@@ -106,7 +106,7 @@
                 <!-- WeaponSkill (WS) -->
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <button name="roll_WS" type="roll" value="/em rolls Weapon Skill with [[(@{WeaponSkill}+@{advanceWS}+?{Modifier|0}-1d100)/10]] degree(s) of success!"><label>Weapon Skill (WS)</label></button>
+                        <button name="roll_WS" type="roll" value="/me rolls Weapon Skill [[1d100]], Target: [[@{WeaponSkill} + @{advanceWS} + ?{Target Modifier|0} ]]"><label>Weapon Skill (WS)</label></button>
                     </div>
                     <div class="sheet-col">
                         <input name="attr_WeaponSkill" type="text" value="0">
@@ -130,7 +130,7 @@
                 <!-- BallisticSkill (BS) -->
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <button name="roll_BS" type="roll" value="/me Ballistic Skill with [[(@{BallisticSkill}+@{advanceBS}+?{Modifier|0}-1d100)/10]] degree(s) of success!"><label>Ballistic Skill (BS)</label></button>
+                        <button name="roll_BS" type="roll" value="/me rolls Ballistic Skill [[1d100]], Target: [[@{BallisticSkill} + @{advanceBS} + ?{Target Modifier|0} ]]"><label>Ballistic Skill (BS)</label></button>
                     </div>
                     <div class="sheet-col">
                         <input name="attr_BallisticSkill" type="text" value="0">
@@ -154,7 +154,7 @@
                 <!-- Strength (S) -->
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <button name="roll_S" type="roll" value="/me Strength with [[(@{Strength}+@{advanceS}+?{Modifier|0}-1d100)/10]] degree(s) of success!"><label>Strength<br/>(S)</label></button>
+                        <button name="roll_S" type="roll" value="/me rolls Strength [[1d100]], Target: [[@{Strength} + @{advanceS} + ?{Target Modifier|0} ]]"><label>Strength (S)</label></button>
                     </div>
                     <div class="sheet-col">
                         <input name="attr_Strength" type="text" value="0">
@@ -178,7 +178,7 @@
                 <!-- Toughness (T) -->
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <button name="roll_T" type="roll" value="/me Toughness with [[(@{Toughness}+@{advanceT}+?{Modifier|0}-1d100)/10]] degree(s) of success!"><label>Toughness (T)</label></button>
+                        <button name="roll_T" type="roll" value="/me rolls Toughness [[1d100]], Target: [[@{Toughness} + @{advanceT} + ?{Target Modifier|0} ]]"><label>Toughness (T)</label></button>
                     </div>
                     <div class="sheet-col">
                         <input name="attr_Toughness" type="text" value="0">
@@ -202,7 +202,7 @@
                 <!-- Agility (Ag) -->
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <button name="roll_Ag" type="roll" value="/me Agility with [[(@{Agility}+@{advanceAg}+?{Modifier|0}-1d100)/10]] degree(s) of success!"><label>Agility <br/>(Ag)</label></button>
+                        <button name="roll_Ag" type="roll" value="/me rolls Agility [[1d100]], Target: [[@{Agility} + @{advanceAg} + ?{Target Modifier|0} ]]"><label>Agility (Ag)</label></button>
                     </div>
                     <div class="sheet-col">
                         <input name="attr_Agility" type="text" value="0">
@@ -230,7 +230,7 @@
                 <!-- Intelligence (Int) -->
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <button name="roll_Int" type="roll" value="/me Intelligence with [[(@{Intelligence}+@{advanceInt}+?{Modifier|0}-1d100)/10]] degree(s) of success!"><label>Intelligence (Int)</label></button>
+                        <button name="roll_Int" type="roll" value="/me rolls Intelligence [[1d100]], Target: [[@{Intelligence} + @{advanceInt} + ?{Target Modifier|0} ]]"><label>Intelligence (Int)</label></button>
                     </div>
                     <div class="sheet-col">
                         <input name="attr_Intelligence" type="text" value="0">
@@ -254,7 +254,7 @@
                 <!-- Perception (Per) -->
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <button name="roll_Per" type="roll" value="/me Perception with [[(@{Perception}+@{advancePer}+?{Modifier|0}-1d100)/10]] degree(s) of success!"><label>Perception (Per)</label></button>
+                        <button name="roll_Per" type="roll" value="/me rolls Perception [[1d100]], Target: [[@{Perception} + @{advancePer} + ?{Target Modifier|0} ]]"><label>Perception (Per)</label></button>
                     </div>
                     <div class="sheet-col">
                         <input name="attr_Perception" type="text" value="0">
@@ -278,7 +278,7 @@
                 <!-- Willpower (WP) -->
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <button name="roll_WP" type="roll" value="/me Willpower with [[(@{Willpower}+@{advanceWP}+?{Modifier|0}-1d100)/10]] degree(s) of success!"><label>Willpower (WP)</label></button>
+                        <button name="roll_WP" type="roll" value="/me rolls Willpower [[1d100]], Target: [[@{Willpower} + @{advanceWP} + ?{Target Modifier|0} ]]"><label>Willpower (WP)</label></button>
                     </div>
                     <div class="sheet-col">
                         <input name="attr_Willpower" type="text" value="0">
@@ -302,7 +302,7 @@
                 <!-- Fellowship (Fel) -->
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <button name="roll_Fel" type="roll" value="/me Fellowship with [[(@{Fellowship}+@{advanceFel}+?{Modifier|0}-1d100)/10]] degree(s) of success!"><label>Fellowship (Fel)</label></button>
+                        <button name="roll_Fel" type="roll" value="/me rolls Fellowship [[1d100]], Target: [[@{Fellowship} + @{advanceFel} + ?{Target Modifier|0} ]]"><label>Fellowship (Fel)</label></button>
                     </div>
                     <div class="sheet-col">
                         <input name="attr_Fellowship" type="text" value="0">
@@ -326,7 +326,7 @@
                 <!-- Influence (Ifl) -->
                 <div class="sheet-2colrow">
                     <div class="sheet-col">
-                        <button name="roll_Ifl" type="roll" value="/me Influence with [[(@{Influence}+@{advanceInf}+?{Modifier|0}-1d100)/10]] degree(s) of success!"><label>Influence (Ifl)</label></button>
+                        <button name="roll_Inf" type="roll" value="/me rolls Influence [[1d100]], Target: [[@{Influence} + @{advanceInf} + ?{Target Modifier|0} ]]"><label>Influence (Inf)</label></button>
                     </div>
                     <div class="sheet-col">
                         <input name="attr_Influence" type="text" value="0">
@@ -539,7 +539,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Acrobatics" type="roll" 
-                                    value="/em rolls Acrobatics with [[(@{AcrobaticsCharacteristic}+[[(-20+@{Acrobatics1}+@{Acrobatics2}+@{Acrobatics3}+@{Acrobatics4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Acrobatics [[1d100]], Target: [[@{AcrobaticsCharacteristic} + [[(-20 + @{Acrobatics1} + @{Acrobatics2} + @{Acrobatics3} + @{Acrobatics4})]] + ?{Target Modifier|0} ]]">
                                     <label>Acrobatics</label>
                                 </button>
                             </div>
@@ -562,7 +562,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Athletics" type="roll" 
-                                    value="/em rolls Athletics with [[(@{AthleticsCharacteristic}+[[(-20+@{Athletics1}+@{Athletics2}+@{Athletics3}+@{Athletics4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Athletics [[1d100]], Target: [[@{AthleticsCharacteristic} + [[(-20 + @{Athletics1} + @{Athletics2} + @{Athletics3} + @{Athletics4})]] + ?{Target Modifier|0} ]]">
                                     <label>Athletics</label>
                                 </button>
                             </div>
@@ -585,7 +585,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Awareness" type="roll" 
-                                    value="/em rolls Awareness with [[(@{AwarenessCharacteristic}+[[(-20+@{Awareness1}+@{Awareness2}+@{Awareness3}+@{Awareness4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Awareness [[1d100]], Target: [[@{AwarenessCharacteristic} + [[(-20 + @{Awareness1} + @{Awareness2} + @{Awareness3} + @{Awareness4})]] + ?{Target Modifier|0} ]]">
                                     <label>Awareness</label>
                                 </button>
                             </div>
@@ -609,7 +609,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Charm" type="roll" 
-                                    value="/em rolls Charm with [[(@{CharmCharacteristic}+[[(-20+@{Charm1}+@{Charm2}+@{Charm3}+@{Charm4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Charm [[1d100]], Target: [[@{CharmCharacteristic} + [[(-20 + @{Charm1} + @{Charm2} + @{Charm3} + @{Charm4})]] + ?{Target Modifier|0} ]]">
                                     <label>Charm</label>
                                 </button>
                             </div>
@@ -632,7 +632,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Command" type="roll" 
-                                    value="/em rolls Command with [[(@{CommandCharacteristic}+[[(-20+@{Command1}+@{Command2}+@{Command3}+@{Command4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Command [[1d100]], Target: [[@{CommandCharacteristic} + [[(-20 + @{Command1} + @{Command2} + @{Command3} + @{Command4})]] + ?{Target Modifier|0} ]]">
                                     <label>Command</label>
                                 </button>
                             </div>
@@ -657,7 +657,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Commerce" type="roll" 
-                                    value="/em rolls Commerce with [[(@{CommerceCharacteristic}+[[(-20+@{Commerce1}+@{Commerce2}+@{Commerce3}+@{Commerce4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Commerce [[1d100]], Target: [[@{CommerceCharacteristic} + [[(-20 + @{Commerce1} + @{Commerce2} + @{Commerce3} + @{Commerce4})]] + ?{Target Modifier|0} ]]">
                                     <label>Commerce</label>
                                 </button>
                             </div>
@@ -680,7 +680,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Deceive" type="roll" 
-                                    value="/em rolls Deceieve with [[(@{DeceieveCharacteristic}+[[(-20+@{Deceieve1}+@{Deceieve2}+@{Deceieve3}+@{Deceieve4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Deceive [[1d100]], Target: [[@{DeceiveCharacteristic} + [[(-20 + @{Deceive1} + @{Deceive2} + @{Deceive3} + @{Deceive4})]] + ?{Target Modifier|0} ]]">
                                     <label>Deceive</label>
                                 </button>
                             </div>
@@ -703,7 +703,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Dodge" type="roll" 
-                                    value="/em rolls Dodge with [[(@{DodgeCharacteristic}+[[(-20+@{Dodge1}+@{Dodge2}+@{Dodge3}+@{Dodge4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Dodge [[1d100]], Target: [[@{DodgeCharacteristic} + [[(-20 + @{Dodge1} + @{Dodge2} + @{Dodge3} + @{Dodge4})]] + ?{Target Modifier|0} ]]">
                                     <label>Dodge</label>
                                 </button>
                             </div>
@@ -725,7 +725,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Inquiry" type="roll" 
-                                    value="/em rolls Inquiry with [[(@{InquiryCharacteristic}+[[(-20+@{Inquiry1}+@{Inquiry2}+@{Inquiry3}+@{Inquiry4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Inquiry [[1d100]], Target: [[@{InquiryCharacteristic} + [[(-20 + @{Inquiry1} + @{Inquiry2} + @{Inquiry3} + @{Inquiry4})]] + ?{Target Modifier|0} ]]">
                                     <label>Inquiry</label>
                                 </button>
                             </div>
@@ -749,7 +749,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Interrogation" type="roll" 
-                                    value="/em rolls Interrogation with [[(@{InterrogationCharacteristic}+[[(-20+@{Interrogation1}+@{Interrogation2}+@{Interrogation3}+@{Interrogation4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Interrogation [[1d100]], Target: [[@{InterrogationCharacteristic} + [[(-20 + @{Interrogation1} + @{Interrogation2} + @{Interrogation3} + @{Interrogation4})]] + ?{Target Modifier|0} ]]">
                                     <label>Interrogation</label>
                                 </button>
                             </div>
@@ -772,7 +772,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Intimidate" type="roll" 
-                                    value="/em rolls Intimidate with [[(@{IntimidateCharacteristic}+[[(-20+@{Intimidate1}+@{Intimidate2}+@{Intimidate3}+@{Intimidate4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Intimidate [[1d100]], Target: [[@{IntimidateCharacteristic} + [[(-20 + @{Intimidate1} + @{Intimidate2} + @{Intimidate3} + @{Intimidate4})]] + ?{Target Modifier|0} ]]">
                                     <label>Intimidate</label>
                                 </button>
                             </div>
@@ -795,7 +795,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Logic" type="roll" 
-                                    value="/em rolls Logic with [[(@{LogicCharacteristic}+[[(-20+@{Logic1}+@{Logic2}+@{Logic3}+@{Logic4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Logic [[1d100]], Target: [[@{LogicCharacteristic} + [[(-20 + @{Logic1} + @{Logic2} + @{Logic3} + @{Logic4})]] + ?{Target Modifier|0} ]]">
                                     <label>Logic</label>
                                 </button>
                             </div>
@@ -818,7 +818,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Medicae" type="roll" 
-                                    value="/em rolls Medicae with [[(@{MedicaeCharacteristic}+[[(-20+@{Medicae1}+@{Medicae2}+@{Medicae3}+@{Medicae4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Medicae [[1d100]], Target: [[@{MedicaeCharacteristic} + [[(-20 + @{Medicae1} + @{Medicae2} + @{Medicae3} + @{Medicae4})]] + ?{Target Modifier|0} ]]">
                                     <label>Medicae</label>
                                 </button>
                             </div>
@@ -856,7 +856,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:100%">
                                 <button name="roll_Surface" type="roll" 
-                                    value="/em rolls Navigate (Surface) with [[(@{NavigateCharacteristic}+[[(-20+@{Surface1}+@{Surface2}+@{Surface3}+@{Surface4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Navigate (Surface) [[1d100]], Target: [[@{NavigateCharacteristic} + [[(-20 + @{Surface1} + @{Surface2} + @{Surface3} + @{Surface4})]] + ?{Target Modifier|0} ]]">
                                     <label>Surface</label>
                                 </button>
                             </div>
@@ -873,7 +873,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:100%">
                                 <button name="roll_Stellar" type="roll" 
-                                    value="/em rolls Navigate (Stellar) with [[(@{NavigateCharacteristic}+[[(-20+@{Stellar1}+@{Stellar2}+@{Stellar3}+@{Stellar4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Navigate (Stellar) [[1d100]], Target: [[@{NavigateCharacteristic} + [[(-20 + @{Stellar1} + @{Stellar2} + @{Stellar3} + @{Stellar4})]] + ?{Target Modifier|0} ]]">
                                     <label>Stellar</label>
                                 </button>
                             </div>
@@ -890,7 +890,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:100%">
                                 <button name="roll_Warp" type="roll" 
-                                    value="/em rolls Navigate (Warp) with [[(@{NavigateCharacteristic}+[[(-20+@{Warp1}+@{Warp2}+@{Warp3}+@{Warp4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Navigate (Warp) [[1d100]], Target: [[@{NavigateCharacteristic} + [[(-20 + @{Warp1} + @{Warp2} + @{Warp3} + @{Warp4})]] + ?{Target Modifier|0} ]]">
                                     <label>Warp</label>
                                 </button>
                             </div>
@@ -921,7 +921,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:100%">
                                 <button name="roll_Aeronautica" type="roll" 
-                                    value="/em rolls Operate (Aeronautica) with [[(@{OperateCharacteristic}+[[(-20+@{Aeronautica1}+@{Aeronautica2}+@{Aeronautica3}+@{Aeronautica4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Operate (Aeronautica) [[1d100]], Target: [[@{OperateCharacteristic} + [[(-20 + @{Aeronautica1} + @{Aeronautica2} + @{Aeronautica3} + @{Aeronautica4})]] + ?{Target Modifier|0} ]]">
                                     <label>Aeronautica</label>
                                 </button>
                             </div>
@@ -938,7 +938,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:100%">
                                 <button name="roll_OSurface" type="roll" 
-                                    value="/em rolls Operate (Surface) with [[(@{OperateCharacteristic}+[[(-20+@{OSurface1}+@{OSurface2}+@{OSurface3}+@{OSurface4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Operate (Surface) [[1d100]], Target: [[@{OperateCharacteristic} + [[(-20 + @{OSurface1} + @{OSurface2} + @{OSurface3} + @{OSurface4})]] + ?{Target Modifier|0} ]]">
                                     <label>Surface</label>
                                 </button>
                             </div>
@@ -955,7 +955,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:100%">
                                 <button name="roll_Voidship" type="roll" 
-                                    value="/em rolls Operate (Voidship) with [[(@{OperateCharacteristic}+[[(-20+@{Voidship1}+@{Voidship2}+@{Voidship3}+@{Voidship4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Operate (Voidship) [[1d100]], Target: [[@{OperateCharacteristic} + [[(-20 + @{Voidship1} + @{Voidship2} + @{Voidship3} + @{Voidship4})]] + ?{Target Modifier|0} ]]">
                                     <label>Voidship</label>
                                 </button>
                             </div>
@@ -972,7 +972,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Parry" type="roll" 
-                                    value="/em rolls Parry with [[(@{ParryCharacteristic}+[[(-20+@{Parry1}+@{Parry2}+@{Parry3}+@{Parry4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Parry [[1d100]], Target: [[@{ParryCharacteristic} + [[(-20 + @{Parry1} + @{Parry2} + @{Parry3} + @{Parry4})]] + ?{Target Modifier|0} ]]">
                                     <label>Parry</label>
                                 </button>
                             </div>
@@ -994,7 +994,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Psyniscience" type="roll" 
-                                    value="/em rolls Psyniscience with [[(@{PsyniscienceCharacteristic}+[[(-20+@{Psyniscience1}+@{Psyniscience2}+@{Psyniscience3}+@{Psyniscience4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Psyniscience [[1d100]], Target: [[@{PsyniscienceCharacteristic} + [[(-20 + @{Psyniscience1} + @{Psyniscience2} + @{Psyniscience3} + @{Psyniscience4})]] + ?{Target Modifier|0} ]]">
                                     <label>Psyniscience</label>
                                 </button>
                             </div>
@@ -1017,7 +1017,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Scrutiny" type="roll" 
-                                    value="/em rolls Scrutiny with [[(@{ScrutinyCharacteristic}+[[(-20+@{Scrutiny1}+@{Scrutiny2}+@{Scrutiny3}+@{Scrutiny4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Scrutiny [[1d100]], Target: [[@{ScrutinyCharacteristic} + [[(-20 + @{Scrutiny1} + @{Scrutiny2} + @{Scrutiny3} + @{Scrutiny4})]] + ?{Target Modifier|0} ]]">
                                     <label>Scrutiny</label>
                                 </button>
                             </div>
@@ -1040,7 +1040,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Security" type="roll" 
-                                    value="/em rolls Security with [[(@{SecurityCharacteristic}+[[(-20+@{Security1}+@{Security2}+@{Security3}+@{Security4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Security [[1d100]], Target: [[@{SecurityCharacteristic} + [[(-20 + @{Security1} + @{Security2} + @{Security3} + @{Security4})]] + ?{Target Modifier|0} ]]">
                                     <label>Security</label>
                                 </button>
                             </div>
@@ -1063,7 +1063,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_SleightOfHand" type="roll" 
-                                    value="/em rolls SleightOfHand with [[(@{SleightOfHandCharacteristic}+[[(-20+@{SleightOfHand1}+@{SleightOfHand2}+@{SleightOfHand3}+@{SleightOfHand4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls SleightOfHand [[1d100]], Target: [[@{SleightOfHandCharacteristic} + [[(-20 + @{SleightOfHand1} + @{SleightOfHand2} + @{SleightOfHand3} + @{SleightOfHand4})]] + ?{Target Modifier|0} ]]">
                                     <label>SleightOfHand</label>
                                 </button>
                             </div>
@@ -1086,7 +1086,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Stealth" type="roll" 
-                                    value="/em rolls Stealth with [[(@{StealthCharacteristic}+[[(-20+@{Stealth1}+@{Stealth2}+@{Stealth3}+@{Stealth4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Stealth [[1d100]], Target: [[@{StealthCharacteristic} + [[(-20 + @{Stealth1} + @{Stealth2} + @{Stealth3} + @{Stealth4})]] + ?{Target Modifier|0} ]]">
                                     <label>Stealth</label>
                                 </button>
                             </div>
@@ -1109,7 +1109,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_Survival" type="roll" 
-                                    value="/em rolls Survival with [[(@{SurvivalCharacteristic}+[[(-20+@{Survival1}+@{Survival2}+@{Survival3}+@{Survival4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Survival [[1d100]], Target: [[@{SurvivalCharacteristic} + [[(-20 + @{Survival1} + @{Survival2} + @{Survival3} + @{Survival4})]] + ?{Target Modifier|0} ]]">
                                     <label>Survival</label>
                                 </button>
                             </div>
@@ -1133,7 +1133,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:55%">
                                 <button name="roll_TechUse" type="roll" 
-                                    value="/em rolls TechUse with [[(@{TechUseCharacteristic}+[[(-20+@{TechUse1}+@{TechUse2}+@{TechUse3}+@{TechUse4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Tech-Use [[1d100]], Target: [[@{TechUseCharacteristic} + [[(-20 + @{TechUse1} + @{TechUse2} + @{TechUse3} + @{TechUse4})]] + ?{Target Modifier|0} ]]">
                                     <label>Tech-Use</label>
                                 </button>
                             </div>
@@ -1176,7 +1176,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_1stLanguage" type="roll" 
-                                    value="/em rolls @{1stLanguage} with [[(@{LinguisticsCharacteristic}+[[(-20+@{1stLanguage1}+@{1stLanguage2}+@{1stLanguage3}+@{1stLanguage4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Linguistics:@{1stLanguage} [[1d100]], Target: [[@{LinguisticsCharacteristic} + [[(-20 + @{1stLanguage1} + @{1stLanguage2} + @{1stLanguage3} + @{1stLanguage4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1195,7 +1195,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_2ndLanguage" type="roll" 
-                                    value="/em rolls @{2ndLanguage} with [[(@{LinguisticsCharacteristic}+[[(-20+@{2ndLanguage1}+@{2ndLanguage2}+@{2ndLanguage3}+@{2ndLanguage4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Linguistics:@{2ndLanguage} [[1d100]], Target: [[@{LinguisticsCharacteristic} + [[(-20 + @{2ndLanguage1} + @{2ndLanguage2} + @{2ndLanguage3} + @{2ndLanguage4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1214,7 +1214,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_3rdLanguage" type="roll" 
-                                    value="/em rolls @{3rdLanguage} with [[(@{LinguisticsCharacteristic}+[[(-20+@{3rdLanguage1}+@{3rdLanguage2}+@{3rdLanguage3}+@{3rdLanguage4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Linguistics:@{3rdLanguage} [[1d100]], Target: [[@{LinguisticsCharacteristic} + [[(-20 + @{3rdLanguage1} + @{3rdLanguage2} + @{3rdLanguage3} + @{3rdLanguage4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1249,7 +1249,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_1stTrade" type="roll" 
-                                    value="/em rolls @{1stTrade} with [[(@{TradeCharacteristic}+[[(-20+@{1stTrade1}+@{1stTrade2}+@{1stTrade3}+@{1stTrade4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Trade:@{1stTrade} [[1d100]], Target: [[@{TradeCharacteristic} + [[(-20 + @{1stTrade1} + @{1stTrade2} + @{1stTrade3} + @{1stTrade4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1268,7 +1268,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_2ndTrade" type="roll" 
-                                    value="/em rolls @{2ndTrade} with [[(@{TradeCharacteristic}+[[(-20+@{2ndTrade1}+@{2ndTrade2}+@{2ndTrade3}+@{2ndTrade4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Trade:@{2ndTrade} [[1d100]], Target: [[@{TradeCharacteristic} + [[(-20 + @{2ndTrade1} + @{2ndTrade2} + @{2ndTrade3} + @{2ndTrade4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1287,7 +1287,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_3rdTrade" type="roll" 
-                                    value="/em rolls @{3rdTrade} with [[(@{TradeCharacteristic}+[[(-20+@{3rdTrade1}+@{3rdTrade2}+@{3rdTrade3}+@{3rdTrade4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Trade:@{3rdTrade} [[1d100]], Target: [[@{TradeCharacteristic} + [[(-20 + @{3rdTrade1} + @{3rdTrade2} + @{3rdTrade3} + @{3rdTrade4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1306,7 +1306,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_4thTrade" type="roll" 
-                                    value="/em rolls @{4thTrade} with [[(@{TradeCharacteristic}+[[(-20+@{4thTrade1}+@{4thTrade2}+@{4thTrade3}+@{4thTrade4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Trade:@{4thTrade} [[1d100]], Target: [[@{TradeCharacteristic} + [[(-20 + @{4thTrade1} + @{4thTrade2} + @{4thTrade3} + @{4thTrade4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1342,7 +1342,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_1stCommon" type="roll" 
-                                    value="/em rolls @{1stCommon} with [[(@{CommonLoreCharacteristic}+[[(-20+@{1stCommon1}+@{1stCommon2}+@{1stCommon3}+@{1stCommon4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Common Lore:@{1stCommon} [[1d100]], Target: [[@{CommonLoreCharacteristic} + [[(-20 + @{1stCommon1} + @{1stCommon2} + @{1stCommon3} + @{1stCommon4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1361,7 +1361,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_2ndCommon" type="roll" 
-                                    value="/em rolls @{2ndCommon} with [[(@{CommonLoreCharacteristic}+[[(-20+@{2ndCommon1}+@{2ndCommon2}+@{2ndCommon3}+@{2ndCommon4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Common Lore:@{2ndCommon} [[1d100]], Target: [[@{CommonLoreCharacteristic} + [[(-20 + @{2ndCommon1} + @{2ndCommon2} + @{2ndCommon3} + @{2ndCommon4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1380,7 +1380,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_3rdCommon" type="roll" 
-                                    value="/em rolls @{3rdCommon} with [[(@{CommonLoreCharacteristic}+[[(-20+@{3rdCommon1}+@{3rdCommon2}+@{3rdCommon3}+@{3rdCommon4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Common Lore:@{3rdCommon} [[1d100]], Target: [[@{CommonLoreCharacteristic} + [[(-20 + @{3rdCommon1} + @{3rdCommon2} + @{3rdCommon3} + @{3rdCommon4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1399,7 +1399,7 @@
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_4thCommon" type="roll" 
-                                    value="/em rolls @{4thCommon} with [[(@{CommonLoreCharacteristic}+[[(-20+@{4thCommon1}+@{4thCommon2}+@{4thCommon3}+@{4thCommon4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Common Lore:@{4thCommon} [[1d100]], Target: [[@{CommonLoreCharacteristic} + [[(-20 + @{4thCommon1} + @{4thCommon2} + @{4thCommon3} + @{4thCommon4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1425,12 +1425,13 @@
                             </div>
                         </div>    
                         </td>
-                    </tr>                    <tr>
+                    </tr>
+                    <tr>
                         <td>
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_1stScholastic" type="roll" 
-                                    value="/em rolls @{1stScholastic} with [[(@{ScholasticLoreCharacteristic}+[[(-20+@{1stScholastic1}+@{1stScholastic2}+@{1stScholastic3}+@{1stScholastic4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Scholastic Lore:@{1stScholastic} [[1d100]], Target: [[@{ScholasticLoreCharacteristic} + [[(-20 + @{1stScholastic1} + @{1stScholastic2} + @{1stScholastic3} + @{1stScholastic4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1443,13 +1444,12 @@
                         <td><input name="attr_1stScholastic3" type="checkbox" value="10"></td>
                         <td><input name="attr_1stScholastic4" type="checkbox" value="10"></td>
                     </tr>
-                    
                     <tr>
                         <td>
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_2ndScholastic" type="roll" 
-                                    value="/em rolls @{2ndScholastic} with [[(@{ScholasticLoreCharacteristic}+[[(-20+@{2ndScholastic1}+@{2ndScholastic2}+@{2ndScholastic3}+@{2ndScholastic4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Scholastic Lore:@{2ndScholastic} [[1d100]], Target: [[@{ScholasticLoreCharacteristic} + [[(-20 + @{2ndScholastic1} + @{2ndScholastic2} + @{2ndScholastic3} + @{2ndScholastic4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1462,13 +1462,12 @@
                         <td><input name="attr_2ndScholastic3" type="checkbox" value="10"></td>
                         <td><input name="attr_2ndScholastic4" type="checkbox" value="10"></td>
                     </tr>
-                    
                     <tr>
                         <td>
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_3rdScholastic" type="roll" 
-                                    value="/em rolls @{3rdScholastic} with [[(@{ScholasticLoreCharacteristic}+[[(-20+@{3rdScholastic1}+@{3rdScholastic2}+@{3rdScholastic3}+@{3rdScholastic4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Scholastic Lore:@{3rdScholastic} [[1d100]], Target: [[@{ScholasticLoreCharacteristic} + [[(-20 + @{3rdScholastic1} + @{3rdScholastic2} + @{3rdScholastic3} + @{3rdScholastic4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1481,13 +1480,12 @@
                         <td><input name="attr_3rdScholastic3" type="checkbox" value="10"></td>
                         <td><input name="attr_3rdScholastic4" type="checkbox" value="10"></td>
                     </tr>
-                    
                     <tr>
                         <td>
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_4thScholastic" type="roll" 
-                                    value="/em rolls @{4thScholastic} with [[(@{ScholasticLoreCharacteristic}+[[(-20+@{4thScholastic1}+@{4thScholastic2}+@{4thScholastic3}+@{4thScholastic4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Scholastic Lore:@{4thScholastic} [[1d100]], Target: [[@{ScholasticLoreCharacteristic} + [[(-20 + @{4thScholastic1} + @{4thScholastic2} + @{4thScholastic3} + @{4thScholastic4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1500,13 +1498,12 @@
                         <td><input name="attr_4thScholastic3" type="checkbox" value="10"></td>
                         <td><input name="attr_4thScholastic4" type="checkbox" value="10"></td>
                     </tr>
-                    
                     <tr>
                         <td>
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_5thScholastic" type="roll" 
-                                    value="/em rolls @{5thScholastic} with [[(@{ScholasticLoreCharacteristic}+[[(-20+@{5thScholastic1}+@{5thScholastic2}+@{5thScholastic3}+@{5thScholastic4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Scholastic Lore:@{5thScholastic} [[1d100]], Target: [[@{ScholasticLoreCharacteristic} + [[(-20 + @{5thScholastic1} + @{5thScholastic2} + @{5thScholastic3} + @{5thScholastic4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1519,13 +1516,12 @@
                         <td><input name="attr_5thScholastic3" type="checkbox" value="10"></td>
                         <td><input name="attr_5thScholastic4" type="checkbox" value="10"></td>
                     </tr>
-                    
                     <tr>
                         <td>
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_6thScholastic" type="roll" 
-                                    value="/em rolls @{6thScholastic} with [[(@{ScholasticLoreCharacteristic}+[[(-20+@{6thScholastic1}+@{6thScholastic2}+@{6thScholastic3}+@{6thScholastic4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Scholastic Lore:@{6thScholastic} [[1d100]], Target: [[@{ScholasticLoreCharacteristic} + [[(-20 + @{6thScholastic1} + @{6thScholastic2} + @{6thScholastic3} + @{6thScholastic4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1551,12 +1547,13 @@
                             </div>
                         </div>    
                         </td>
-                    </tr>                    <tr>
+                    </tr>
+                    <tr>
                         <td>
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_1stForbidden" type="roll" 
-                                    value="/em rolls @{1stForbidden} with [[(@{ForbiddenLoreCharacteristic}+[[(-20+@{1stForbidden1}+@{1stForbidden2}+@{1stForbidden3}+@{1stForbidden4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Forbidden Lore:@{1stForbidden} [[1d100]], Target: [[@{ForbiddenLoreCharacteristic} + [[(-20 + @{1stForbidden1} + @{1stForbidden2} + @{1stForbidden3} + @{1stForbidden4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1569,13 +1566,12 @@
                         <td><input name="attr_1stForbidden3" type="checkbox" value="10"></td>
                         <td><input name="attr_1stForbidden4" type="checkbox" value="10"></td>
                     </tr>
-                    
                     <tr>
                         <td>
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_2ndForbidden" type="roll" 
-                                    value="/em rolls @{2ndForbidden} with [[(@{ForbiddenLoreCharacteristic}+[[(-20+@{2ndForbidden1}+@{2ndForbidden2}+@{2ndForbidden3}+@{2ndForbidden4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Forbidden Lore:@{2ndForbidden} [[1d100]], Target: [[@{ForbiddenLoreCharacteristic} + [[(-20 + @{2ndForbidden1} + @{2ndForbidden2} + @{2ndForbidden3} + @{2ndForbidden4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1588,13 +1584,12 @@
                         <td><input name="attr_2ndForbidden3" type="checkbox" value="10"></td>
                         <td><input name="attr_2ndForbidden4" type="checkbox" value="10"></td>
                     </tr>
-                    
                     <tr>
                         <td>
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_3rdForbidden" type="roll" 
-                                    value="/em rolls @{3rdForbidden} with [[(@{ForbiddenLoreCharacteristic}+[[(-20+@{3rdForbidden1}+@{3rdForbidden2}+@{3rdForbidden3}+@{3rdForbidden4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Forbidden Lore:@{3rdForbidden} [[1d100]], Target: [[@{ForbiddenLoreCharacteristic} + [[(-20 + @{3rdForbidden1} + @{3rdForbidden2} + @{3rdForbidden3} + @{3rdForbidden4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1607,13 +1602,12 @@
                         <td><input name="attr_3rdForbidden3" type="checkbox" value="10"></td>
                         <td><input name="attr_3rdForbidden4" type="checkbox" value="10"></td>
                     </tr>
-                    
                     <tr>
                         <td>
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_4thForbidden" type="roll" 
-                                    value="/em rolls @{4thForbidden} with [[(@{ForbiddenLoreCharacteristic}+[[(-20+@{4thForbidden1}+@{4thForbidden2}+@{4thForbidden3}+@{4thForbidden4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Forbidden Lore:@{4thForbidden} [[1d100]], Target: [[@{ForbiddenLoreCharacteristic} + [[(-20 + @{4thForbidden1} + @{4thForbidden2} + @{4thForbidden3} + @{4thForbidden4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1626,13 +1620,12 @@
                         <td><input name="attr_4thForbidden3" type="checkbox" value="10"></td>
                         <td><input name="attr_4thForbidden4" type="checkbox" value="10"></td>
                     </tr>
-                    
                     <tr>
                         <td>
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_5thForbidden" type="roll" 
-                                    value="/em rolls @{5thForbidden} with [[(@{ForbiddenLoreCharacteristic}+[[(-20+@{5thForbidden1}+@{5thForbidden2}+@{5thForbidden3}+@{5thForbidden4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Forbidden Lore:@{5thForbidden} [[1d100]], Target: [[@{ForbiddenLoreCharacteristic} + [[(-20 + @{5thForbidden1} + @{5thForbidden2} + @{5thForbidden3} + @{5thForbidden4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1645,13 +1638,12 @@
                         <td><input name="attr_5thForbidden3" type="checkbox" value="10"></td>
                         <td><input name="attr_5thForbidden4" type="checkbox" value="10"></td>
                     </tr>
-                    
                     <tr>
                         <td>
                         <div class="sheet-row">
                             <div class="sheet-item" style="width:20%">
                                 <button name="roll_6thForbidden" type="roll" 
-                                    value="/em rolls @{6thForbidden} with [[(@{ForbiddenLoreCharacteristic}+[[(-20+@{6thForbidden1}+@{6thForbidden2}+@{6thForbidden3}+@{6thForbidden4})]]+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                                    value="/em rolls Forbidden Lore:@{6thForbidden} [[1d100]], Target: [[@{ForbiddenLoreCharacteristic} + [[(-20 + @{6thForbidden1} + @{6thForbidden2} + @{6thForbidden3} + @{6thForbidden4})]] + ?{Target Modifier|0} ]]">
                                 </button>
                             </div>
                             <div class="sheet-item" style="width:80%">
@@ -1782,7 +1774,7 @@
                 </div>
                 <div class="sheet-item" style="width:10%">
                     <button name="roll_meleehit" type="roll" 
-                    value="/em attacks with @{meleeweaponname}, and gets [[(@{WeaponSkill}+@{advanceWS}+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                    value="/em attacks with @{meleeweaponname}, and gets [[1d100]], Target: [[ @{WeaponSkill}+@{advanceWS}+?{Target Modifier|0}]]">
                         <label>Hit</label>
                     </button>
                 </div>
@@ -2065,7 +2057,7 @@
             </div>
             <div class="sheet-item" style="width:10%">
                 <button name="roll_rangedhit" type="roll" 
-                    value="/em fires @{rangedweaponname}, and gets [[(@{BallisticSkill}+@{advanceBS}+?{Modifier|0}-1d100)/10]] degree(s) of success!">
+                    value="/em fires @{rangedweaponname} and gets [[1d100]], Target: [[@{BallisticSkill}+@{advanceBS}+?{Target Modifier|0}]]">
                     <label>Hit</label>
                 </button>
             </div>