diff --git a/StraightToVHS/straighttovhs.css b/StraightToVHS/straighttovhs.css
index 9afda02d8b..d0f86e5f02 100644
--- a/StraightToVHS/straighttovhs.css
+++ b/StraightToVHS/straighttovhs.css
@@ -33,7 +33,7 @@
 }
 
 .charsheet .sheet-wrapper .sheet-scriptchanges {
-	display: inline-block;
+    display: inline-block;
     width: auto;
     margin-left: 5px;
 	font-size: 12px;
@@ -239,8 +239,20 @@
 	border-color: #262626;
 }
 
+.sheet-rolltemplate-stattest .sheet-charname, .sheet-rolltemplate-stattest .sheet-charname div {
+	text-decoration: none;
+	font-weight: normal;
+    font-size: 0.8em;
+    line-height: 0.8em;
+    font-style: italic;
+	color: Grey;
+	background-color: Beige;
+	text-align: Right;
+    padding-right: 2px;
+}
+
 .sheet-rolltemplate-stattest .sheet-statname, .sheet-rolltemplate-stattest .sheet-statname div {
-	text-decoration: underline;
+    text-decoration: underline;
 	font-weight: bold;
 	color: DarkMagenta;
 	background-color: Beige;
@@ -277,6 +289,18 @@
 	border-color: #262626;
 }
 
+.sheet-rolltemplate-genericroll .sheet-charname, .sheet-rolltemplate-genericroll .sheet-charname div {
+    text-decoration: none;
+	font-weight: normal;
+    font-size: 0.8em;
+    line-height: 0.8em;
+    font-style: italic;
+	color: Grey;
+	background-color: Beige;
+	text-align: Right;
+    padding-right: 2px;
+}
+
 .sheet-rolltemplate-genericroll .sheet-statname, .sheet-rolltemplate-genericroll .sheet-statname div {
 	text-decoration: underline;
 	font-weight: bold;
@@ -317,6 +341,18 @@
 	border-color: #262626;
 }
 
+.sheet-rolltemplate-meleeweptest .sheet-charname, .sheet-rolltemplate-meleeweptest .sheet-charname div {
+    text-decoration: none;
+	font-weight: normal;
+    font-size: 0.8em;
+    line-height: 0.8em;
+    font-style: italic;
+	color: Grey;
+	background-color: Beige;
+	text-align: Right;
+    padding-right: 2px;
+}
+
 .sheet-rolltemplate-meleeweptest .sheet-statname, .sheet-rolltemplate-meleeweptest .sheet-statname div {
 	text-decoration: underline;
 	font-weight: bold;
@@ -356,6 +392,18 @@
 	border-color: #262626;
 }
 
+.sheet-rolltemplate-rangedweptest .sheet-charname, .sheet-rolltemplate-rangedweptest .sheet-charname div {
+    text-decoration: none;
+	font-weight: normal;
+    font-size: 0.8em;
+    line-height: 0.8em;
+    font-style: italic;
+	color: Grey;
+	background-color: Beige;
+	text-align: Right;
+    padding-right: 2px;
+}
+
 .sheet-rolltemplate-rangedweptest .sheet-statname, .sheet-rolltemplate-rangedweptest .sheet-statname div {
 	text-decoration: underline;
 	font-weight: bold;
diff --git a/StraightToVHS/straighttovhs.html b/StraightToVHS/straighttovhs.html
index c49d63b230..57ed49f5ed 100644
--- a/StraightToVHS/straighttovhs.html
+++ b/StraightToVHS/straighttovhs.html
@@ -20,21 +20,24 @@ By using two seperate rolls we can use Roll Templates to show / hide only one ro
 <!-- ROLL TEMPLATES -->
 <!-- stattest
         Params: 
+            charname - name of character
             statname - name of stat
             epicroll - epic roll
             blooperroll - blooper roll
-        	hasepicdice - used to distinguish between a normal roll and an epic roll (as they use the same formula)
+            hasepicdice - used to distinguish between a normal roll and an epic roll (as they use the same formula)
 -->
 <rolltemplate class="sheet-rolltemplate-stattest">
 	<div class="sheet-rolltemp-container" >
 		<div class = "sheet-row sheet-statname">TESTING {{statname}}</div>
 		{{#rollGreater() epicroll 0}}<div class = "sheet-row sheet-rollblock"><span class = "sheet-statroll">{{epicroll}}</span>{{#rollGreater() hasepicdice 0}} <span class = "sheet-epic">EPIC!</span>{{/rollGreater() hasepicdice 0}}</div>{{/rollGreater() epicroll 0}}
 		{{#rollGreater() blooperroll 0}}<div class = "sheet-row sheet-rollblock"><span class = "sheet-statroll">{{blooperroll}}</span> <span class = "sheet-blooper">BLOOPER!</span></div>{{/rollGreater() blooperroll 0}}
+        <div class = "sheet-row sheet-charname">{{charname}}</div>
 	</div>
 </rolltemplate>
 
 <!-- genericroll
         Params: 
+            charname - name of character
             rollname - name of generic roll
             roll - entire roll forumla
             numepicdice - num of epic dice (epic - blooper)
@@ -43,11 +46,13 @@ By using two seperate rolls we can use Roll Templates to show / hide only one ro
 	<div class="sheet-rolltemp-container" >
 		<div class = "sheet-row sheet-statname">{{rollname}}</div>
 		<div class = "sheet-row sheet-rollblock"><span class = "sheet-statroll">{{roll}}</span>{{#rollGreater() numepicdice 0}} <span class = "sheet-epic">EPIC!</span>{{/rollGreater() numepicdice 0}}{{#rollLess() numepicdice 0}} <span class = "sheet-blooper">BLOOPER!</span>{{/rollLess() numepicdice 0}}</div>
+	    <div class = "sheet-row sheet-charname">{{charname}}</div>     
 	</div>
 </rolltemplate>
 
 <!-- meleeweptest
         Params: 
+            charname - name of character
             wepname - name of weapon
             epicroll - epic roll
 			blooperroll - blooper roll
@@ -58,20 +63,23 @@ By using two seperate rolls we can use Roll Templates to show / hide only one ro
 		<div class = "sheet-row sheet-statname">MELEE ATTACK WITH {{wepname}}</div>
 		{{#rollGreater() epicroll 0}}<div class = "sheet-row sheet-rollblock"><span class = "sheet-statroll">{{epicroll}}</span>{{#rollGreater() hasepicdice 0}} <span class = "sheet-epic">EPIC!</span>{{/rollGreater() hasepicdice 0}}</div>{{/rollGreater() epicroll 0}}
 		{{#rollGreater() blooperroll 0}}<div class = "sheet-row sheet-rollblock"><span class = "sheet-statroll">{{blooperroll}}</span> <span class = "sheet-blooper">BLOOPER!</span></div>{{/rollGreater() blooperroll 0}}
+	    <div class = "sheet-row sheet-charname">{{charname}}</div>     
 	</div>
 </rolltemplate>
 
 <!-- rangedweptest
         Params: 
+            charname - name of character
             wepname - name of weapon
             epicroll - epic roll
 			blooperroll - blooper roll
 			hasepicdice - used to distinguish between a normal roll and an epic roll (as they use the same formula)
 -->
 <rolltemplate class="sheet-rolltemplate-rangedweptest">
-	<div class = "sheet-row sheet-statname">RANGED ATTACK WITH {{wepname}}</div>
+	    <div class = "sheet-row sheet-statname">RANGED ATTACK WITH {{wepname}}</div>
 		{{#rollGreater() epicroll 0}}<div class = "sheet-row sheet-rollblock"><span class = "sheet-statroll">{{epicroll}}</span>{{#rollGreater() hasepicdice 0}} <span class = "sheet-epic">EPIC!</span>{{/rollGreater() hasepicdice 0}}</div>{{/rollGreater() epicroll 0}}
 		{{#rollGreater() blooperroll 0}}<div class = "sheet-row sheet-rollblock"><span class = "sheet-statroll">{{blooperroll}}</span><span class = "sheet-blooper">BLOOPER!</span></div>{{/rollGreater() blooperroll 0}}
+        <div class = "sheet-row sheet-charname">{{charname}}</div>
 </rolltemplate>
 
 <!-- CHARACTER SHEET -->
@@ -190,7 +198,7 @@ By using two seperate rolls we can use Roll Templates to show / hide only one ro
 						<input type="number" name="attr_ACC-Montage" value="0"/>
 					</td>
 					<td class = "sheet-bordered sheet-stattable-col">
-						<button type='roll' value='&{template:stattest} {{statname=ACC}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{ACC-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{ACC-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}' name='roll_ACC'></button>
+						<button type='roll' value='&{template:stattest} {{charname=@{character_name}}} {{statname=ACC}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{ACC-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{ACC-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}' name='roll_ACC'></button>
 					</td>
 				</tr>
 				<!-- ATH -->
@@ -217,7 +225,7 @@ By using two seperate rolls we can use Roll Templates to show / hide only one ro
 						<input type="number" name="attr_ATH-Montage" value="0"/>
 					</td>
 					<td class = "sheet-bordered sheet-stattable-col">
-						<button type='roll' value='&{template:stattest} {{statname=ATH}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{ATH-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{ATH-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}' name='roll_ATH'></button>
+						<button type='roll' value='&{template:stattest} {{charname=@{character_name}}} {{statname=ATH}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{ATH-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{ATH-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}' name='roll_ATH'></button>
 					</td>
 				</tr>
 				<!-- CHA -->
@@ -244,7 +252,7 @@ By using two seperate rolls we can use Roll Templates to show / hide only one ro
 						<input type="number" name="attr_CHA-Montage" value="0"/>
 					</td>
 					<td class = "sheet-bordered sheet-stattable-col">
-						<button type='roll' value='&{template:stattest} {{statname=CHA}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{CHA-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{CHA-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}' name='roll_CHA'></button>
+						<button type='roll' value='&{template:stattest} {{charname=@{character_name}}} {{statname=CHA}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{CHA-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{CHA-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}' name='roll_CHA'></button>
 					</td>
 				</tr>
 				<!-- DEF -->
@@ -271,7 +279,7 @@ By using two seperate rolls we can use Roll Templates to show / hide only one ro
 						<input type="number" name="attr_DEF-Montage" value="0"/>
 					</td>
 					<td class = "sheet-bordered sheet-stattable-col">
-						<button type='roll' value='&{template:stattest} {{statname=DEF}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{DEF-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{DEF-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}' name='roll_DEF'></button>
+						<button type='roll' value='&{template:stattest} {{charname=@{character_name}}} {{statname=DEF}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{DEF-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{DEF-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}' name='roll_DEF'></button>
 					</td>
 				</tr>
 				<!-- INT -->
@@ -298,7 +306,7 @@ By using two seperate rolls we can use Roll Templates to show / hide only one ro
 						<input type="number" name="attr_INT-Montage" value="0"/>
 					</td>
 					<td class = "sheet-bordered sheet-stattable-col">
-						<button type='roll' value='&{template:stattest} {{statname=INT}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{INT-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{INT-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}' name='roll_INT'></button>
+						<button type='roll' value='&{template:stattest} {{charname=@{character_name}}} {{statname=INT}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{INT-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{INT-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}' name='roll_INT'></button>
 					</td>
 				</tr>
 				<!-- SPY -->
@@ -325,7 +333,7 @@ By using two seperate rolls we can use Roll Templates to show / hide only one ro
 						<input type="number" name="attr_SPY-Montage" value="0"/>
 					</td>
 					<td class = "sheet-bordered sheet-stattable-col">
-						<button type='roll' value='&{template:stattest} {{statname=SPY}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{SPY-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{SPY-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}' name='roll_SPY'></button>
+						<button type='roll' value='&{template:stattest} {{charname=@{character_name}}} {{statname=SPY}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{SPY-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{SPY-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}' name='roll_SPY'></button>
 					</td>
 				</tr>
 				<!-- STR -->
@@ -352,7 +360,7 @@ By using two seperate rolls we can use Roll Templates to show / hide only one ro
 						<input type="number" name="attr_STR-Montage" value="0"/>
 					</td>
 					<td class = "sheet-bordered sheet-stattable-col">
-						<button type='roll' value='&{template:stattest} {{statname=STR}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{STR-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{STR-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}' name='roll_STR'></button>
+						<button type='roll' value='&{template:stattest} {{charname=@{character_name}}} {{statname=STR}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{STR-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{STR-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}' name='roll_STR'></button>
 					</td>
 				</tr>
 			</table>
@@ -407,7 +415,13 @@ By using two seperate rolls we can use Roll Templates to show / hide only one ro
     		<label>ROLL INITIATIVE (SELECT YOUR TOKEN FIRST): </label>
         </div>
         <div class="sheet-col sheet-size-two">
-        	<button type='roll' value='&{template:genericroll} {{rollname=INITIATIVE}} {{numepicdice=[[?{EPIC DICE|0}-?{BLOOPER DICE|0}]]}} {{num =[[?{EPIC DICE|0}+1]]}} {{roll=[[ [[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{ATH-Total}) ]] + [[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{ATH-Total}) ]]&{tracker} ]]}}' name='roll_INIT'></button>
+        	<button type='roll' value='&{template:genericroll} {{charname=@{character_name}}} {{rollname=INITIATIVE}} {{numepicdice=[[?{EPIC DICE|0}-?{BLOOPER DICE|0}]]}} {{roll=[[ [[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{ATH-Total}) ]] + [[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{ATH-Total}) ]]&{tracker} ]]}}' name='roll_INIT'></button>
+        </div>
+        <div class="sheet-col sheet-statname sheet-size-five">
+        	<label>GENERIC ROLL: </label>
+        </div>
+        <div class="sheet-col sheet-size-two">
+        	<button type='roll' value='&{template:genericroll} {{charname=not rolled from sheet}} {{rollname=GENERIC ROLL}} {{numepicdice=[[?{EPIC DICE|0}-?{BLOOPER DICE|0}]]}} {{roll=[[ [[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0}) ]] + [[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0}) ]] ]]}}' name='roll_GENERIC'></button>
         </div>
 	</div>
 	
@@ -478,10 +492,10 @@ By using two seperate rolls we can use Roll Templates to show / hide only one ro
 					<input type="text" name = "attr_Weapon-Special"/>
 				</div>
 				<div class="sheet-item sheet-size-two"> <!-- Standard roll plus strength and weapon bonus -->
-					<button type='roll' name='roll_MWEP' value='&{template:meleeweptest} {{wepname=@{Weapon-Name}}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{Weapon-Bonus} + @{ACC-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{Weapon-Bonus} + @{STR-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}' ></button>
+					<button type='roll' name='roll_MWEP' value='&{template:meleeweptest} {{charname=@{character_name}}} {{wepname=@{Weapon-Name}}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{Weapon-Bonus} + @{ACC-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{Weapon-Bonus} + @{STR-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}' ></button>
 				</div>
 				<div class="sheet-item sheet-size-two"> <!-- Standard roll plus accuracy and weapon bonus. Ranged Weapon Test has crit-fumble set as the the reload number -->
-					<button type='roll'  name='roll_RWEP' value='&{template:rangedweptest} {{wepname=@{Weapon-Name}}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{Weapon-Bonus} + @{ACC-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{Weapon-Bonus} + @{ACC-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}'></button>
+					<button type='roll'  name='roll_RWEP' value='&{template:rangedweptest} {{charname=@{character_name}}} {{wepname=@{Weapon-Name}}} {{epicroll=[[ [[{{?{EPIC DICE|0}, -1}>?{BLOOPER DICE|0}}]] * ([[1+?{EPIC DICE|0}-?{BLOOPER DICE|0}]]d20kh1 + ?{Modifier|0} + @{Weapon-Bonus} + @{ACC-Total}) ]]}} {{blooperroll=[[ [[{{?{BLOOPER DICE|0}, -1}>[[?{EPIC DICE|0}+1]]}]] * ([[1+?{BLOOPER DICE|0}-?{EPIC DICE|0}]]d20kl1 +?{Modifier|0} + @{Weapon-Bonus} + @{ACC-Total}) ]]}} {{hasepicdice=[[?{EPIC DICE|0}]]}}'></button>
 				</div>
 				
 			</div>