diff --git a/D6StarWars/.gitignore b/D6StarWars/.gitignore
deleted file mode 100644
index 6bd6746426..0000000000
--- a/D6StarWars/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-log.txt
diff --git a/D6StarWars/CHANGELOG.md b/D6StarWars/CHANGELOG.md
index c42a1d8ab3..ef6137c7d5 100644
--- a/D6StarWars/CHANGELOG.md
+++ b/D6StarWars/CHANGELOG.md
@@ -1,3 +1,18 @@
+### Version 2.00 (2019-07-09):
+**Fixes:**
+
+- fixed on/off toggle for gmroll, isn't any longer entangled with other options
+- Attribute section layout fix, shifted it to display 2 attributes per row from previous 3 per row
+
+**Layout:**
+
+- change Energy/Physical armor soak rolls to display icon instead of text to reduce clutter in button name; Energy Bolt for Energy and Star for Physical 
+
+**Features:**
+
+- New option: Now possible to disable the Wild Die from rolls, making the sheet easier to for playing 1E
+- New option: Now possible to disable roll queries from sheet rolls, so button presses rolls dice instantly without asking for roll modifiers
+
 ### Version 1.83 (2019-05-28):
 
 - Removed wound penalties from affecting soak rolls (reported by **Wolf**)
diff --git a/D6StarWars/D6StarWars.css b/D6StarWars/D6StarWars.css
index b12d360130..86f1bb3951 100644
--- a/D6StarWars/D6StarWars.css
+++ b/D6StarWars/D6StarWars.css
@@ -2,7 +2,6 @@
 /*------------- SWD6 Main CSS----------------*/
 /*-------------------------------------------*/
 .charsheet {
-    /*https://cdn.pixabay.com/photo/2017/01/02/11/10/sky-1946508_960_720.png more and brighter stars*/
 	background-image: url(https://cdn.pixabay.com/photo/2015/09/29/15/12/stars-964022_960_720.png); /*black space with tiny white stars*/
     background-color: black;
     background-repeat: repeat;
@@ -10,26 +9,26 @@
 }
 
 .charsheet .sheet-version::after {
-    content: 'Sheet Version 1.83';
+    content: 'Sheet Version 2.00';
 }
- 
+
 .charsheet label, h1, h2, h3{
     color:white;
 }
- 
+
 .charsheet table{
     border-collapse:separate;
     border-spacing:4px;
 }
- 
+
 .charsheet textarea{
     resize:none;
 }
- 
+
 .charsheet .sheet-toppad{
     padding:2px;
 }
- 
+
 .charsheet .sheet-section{
     border-top: 5px dotted white;
     padding-top:10px;
@@ -37,10 +36,17 @@
 	width: 100%;
 }
 
+.charsheet .sheet-flex-box{
+		display: flex;
+}
+.charsheet .sheet-flex-col{
+    flex: 1;
+}
+
 .charsheet input[type=number].sheet-pipnumber{
     width:33px;
 }
- 
+
 .charsheet input[type=number].sheet-smallnumber{
     width:40px;
 }
@@ -104,7 +110,7 @@
 .charsheet .sheet-tdborder{
     border: 2px solid white;
     vertical-align:top;
-    /*width:260px;*/
+    width:320px;
 }
 
 .charsheet .sheet-rightmargin{
@@ -144,15 +150,25 @@
 }
 
 .charsheet .sheet-forcebutton{
-    width:90px; 
+    width:90px;
     padding-right:5px;
 }
 
 .charsheet .sheet-redtxt{
-    font-size: 6pt;
+	font-size: 8px;
     color: red;
+    font-family: 'Arial';
+}
+
+
+/* writing the letter 't' with this font shows an impact icon signifying physical damage */
+.charsheet button.sheet-physical{
+    font-family: 'Pictos Custom';
+}
+/* writing the letter 'e' with this font shows e bolt icon signifying energy damage */
+.charsheet button.sheet-energy{
+    font-family: 'Pictos';
 }
-/*Original button :button[type=roll].sheet-blank-roll-button::before { content: ''; } */
 
 /*-------------------------------------------*/
 /*-----Main Settings and hide classes--------*/
@@ -162,7 +178,7 @@
 	display: inline-block;
 	width: auto;
 }
-
+
 .charsheet .sheet-main-settings .sheet-input-row input {
 	margin-right: 30px;
 }
@@ -196,15 +212,15 @@ input.sheet-options-flag:checked ~ div.sheet-main-container {
 }
 
 /* all hide options using option menu checkboxes*/
-/*input.sheet-wild:checked ~ .sheet-master-container .sheet-wild-hide,
-input.sheet-nowild:checked ~ .sheet-master-container .sheet-nowild-hide, */
 
 input.sheet-background:checked  ~ .sheet-master-container .sheet-background-hide,
 input.sheet-force:checked ~ .sheet-master-container .sheet-force-hide,
 input.sheet-equipment:checked ~ .sheet-master-container .sheet-equipment-hide,
 input.sheet-npc:checked  ~ .sheet-master-container .sheet-npc-hide ,
 input.sheet-npc:not(:checked) ~ .sheet-master-container .sheet-pc-hide,
-input.sheet-gmroll:checked ~ input.sheet-selector-switch:checked ~ .sheet-master-container .sheet-gmroll-hide {
+input.sheet-gmroll:checked ~ .sheet-master-container .sheet-gmroll-hide,
+input.sheet-rollmod:checked ~ .sheet-master-container .sheet-rollmod,
+input.sheet-rollmod:not(:checked) ~ .sheet-master-container .sheet-rollmod-no  {
 	display: none;
 }
 
@@ -218,7 +234,6 @@ input[type=number]::-webkit-inner-spin-button {}
 	position: relative;
 	padding: 0;
 	display: inline-block;
-	/*width: 900px;*/
 	background-image: url(https://cdn.pixabay.com/photo/2015/09/29/15/12/stars-964022_960_720.png); /*black space with tiny stars*/
     background-color: black;
     background-repeat: repeat;
@@ -416,4 +431,4 @@ input.sheet-selector-switch:checked ~ .sheet-master-container .sheet-content .sh
 }
 .sheet-rolltemplate-black tr:nth-child(even) {
  background-color:#eee
-}
\ No newline at end of file
+}
diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index 654907818d..139682e5b1 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -1,9 +1,10 @@
 <input class="selector-switch npc" name="attr_npcswitch" type="checkbox" value="1">
 <input class="selector-switch gmroll" name="attr_gmrollswitch" type="checkbox" value="1">
+<input class="selector-switch rollmod" name="attr_rollmodswitch" type="checkbox" value="1">
 <input class="selector-switch force" name="attr_forceswitch" type="checkbox" value="1">
 <input class="selector-switch background" name="attr_backgroundswitch" type="checkbox" value="1">
 <input class="selector-switch equipment" name="attr_equipmentswitch" type="checkbox" value="1">
-<!-- 
+<!--
 <input class="selector-switch wild" name="attr_wildswitch" type="radio" value="wild" checked="true">
 <input class="selector-switch nowild" name="attr_wildswitch" type="radio" value="nowild"> -->
 
@@ -17,7 +18,7 @@
 		<img src="http://rs8.pbsrc.com/albums/a35/VPP3/d62_zpstllyo5ds.png?w=480&h=480&fit=clip" style="max-height: 50px;"/>
 		<img src="http://a.dilcdn.com/bl/wp-content/uploads/sites/6/2012/11/sw_logo_lg_default-small.jpg" style="max-height: 80px;" title="This is where the fun begins."/>
 		<img src="http://rs8.pbsrc.com/albums/a35/VPP3/d61_zps5ef1qprz.png?w=480&h=480&fit=clip" style="max-height: 50px;"/>
-	</div>	
+	</div>
 	<div class="main-settings container" style="padding-top:67px"><!-- Settings Menu-->
 		<div class="section" style="width:850px">
 			<!-- <div class="tdborder" style="float:right;width:45%;padding-left:10px">
@@ -27,14 +28,25 @@
 				<p>⚫ Hide options for few sections</p>
 				<p>⚫ Equipment Section moved above Background Section</p>
 			</div> -->
-			<div class="input-row top-row bold"> 
+			<div class="input-row top-row bold">
 				<span title="Shows a more dense statblock for NPCs. Equipment sections uses the first field from the PC version">Use NPC sheet <input name="attr_npcswitch" type="checkbox" value="1"></span>
-				
+
 			</div>
 			<div class="input-row top-row bold">
 				<span title="Hides the GM rolls. They are like regular rolls but whispered to the GM">Hide GM Rolls?</span>
 				<input name="attr_gmrollswitch" type="checkbox" value="1">
 			</div>
+			<div class="input-row top-row bold">
+				<span title="If checked, rolls don't ask for roll modifiers and rolls right away when selected.">Disable roll modification query when rolling?</span>
+				<input name="attr_rollmodswitch" type="checkbox" value="1">
+			</div>
+			<div class="input-row top-row bold">
+				<span title="If Wild Die isn't used, the die rolls wont explode or highlight critical successes nor failures">Use Wild Die in rolls?</span>
+				<select name="attr_wilddie" style="width: 70px;">
+					<option value="!cf1cs6" selected="selected">Yes</option>
+					<option value="cf0cs0">No</option>
+				</select>
+			</div>
 			<div class="input-row top-row bold">
 				<span title="Useful for those who are not Force-sensitive">Hide Force Section? <input name="attr_forceswitch" type="checkbox" value="1"></span>
 			</div>
@@ -81,19 +93,19 @@
 				<div class='col'>
 					<label class="areaLabel">Special Abilities</label>
 					<textarea name="attr_specialAbilities" style="width:95%;height:13em" ></textarea>
-				</div>            
+				</div>
 				<div class='col'>
 					<label>Move <input type="number" name="attr_move" class="smallshortnumber" min="0" value="10"/></label>
-					<label>Force Sensitive? 
+					<label>Force Sensitive?
 						<select name="attr_forceSensitive" class="smallselect">
 						  <option value="1">Yes</option>
 						  <option value="0" selected="selected">No</option>
-						</select> 
+						</select>
 					</label>
-					<label>Force Points <input type="number" name="attr_forcePoints" class="smallshortnumber" min="0" value="0"/></label> <!---On char creation everyone starts with 1 FP --->
+					<label>Force Points <input type="number" name="attr_forcePoints" class="smallshortnumber" min="0" value="1"/></label> <!---On char creation everyone starts with 1 FP --->
 					<label>Dark Side Points <input type="number" name="attr_darkSidePoints" class="smallshortnumber" min="0" value="0"/></label>
 					<label>Character Points <input type="number" name="attr_characterPoints" class="smallshortnumber" min="0" value="0"/></label> <!---On char creation everyone starts with 5 CP --->
-					<button class="d6-dice gmroll-hide" type="roll" name="rollg_customroll" value="/w gm &{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6!cf1cs6}]]}}"><span class="redtxt">(GM)</span>Custom Roll</button>
+					<button class="d6-dice gmroll-hide" type="roll" name="rollg_customroll" value="/w gm &{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}"><span class="redtxt">(GM)</span>Custom Roll</button>
 					<button class="d6-dice gmroll-hide" type="roll" name="rollg_extraroll" value="/w gm &{template:black} {{name=Extra Dice}} {{Roll=[[{?{Number of  extra dice|0}d6cf0cs7}]]}}"><span class="redtxt">(GM)</span>Extra Dice</button>
 					<button class="d6-dice gmroll-hide" type="roll" name="rollg_charproll" value="/w gm &{template:black} {{name=Character points roll}} {{Roll=[[?{Number of char points to spend on roll|1|2|3|4|5}d6!cf0cs6]]}}"><span class="redtxt">(GM)</span>Char pt</button>
 				</div>         
@@ -106,13 +118,14 @@
 						  <option value="2">Wounded Twice</option>
 						  <option value="5">Incapacitated</option> <!--You shouldn't even be able to make checks while incapacitated or Mortally wounded, hence -15. Later will include option to ignore wound penalties -->
 						  <option value="5">Mortally Wounded</option>
-						</select> 
+						</select>
 					</label>
 					<label>Initiative bonus
 						<input type="number" name="attr_initiative" class="smallnumber shortnumber" min="0" value="0"/>D+<input type="number" name="attr_initiativepip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
 					</label>
-					<button class="d6-dice" type="roll" name="roll_init" value="&{template:black} {{name=Initiative}} {{Roll=[[(@{perception} + @{initiative} -@{WoundMod} + @{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perceptionpip} + @{initiativepip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6 &{tracker}]]}}">Initiative</button>
-					<button class="d6-dice" type="roll" name="roll_customroll" value="&{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6!cf1cs6}]]}}">Custom Roll(no modifiers)</button>
+					<button class="d6-dice rollmod" type="roll" name="roll_init" value="&{template:black} {{name=Initiative}} {{Roll=[[(@{perception} + @{initiative} -@{WoundMod} + @{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perceptionpip} + @{initiativepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie} &{tracker}]]}}">Initiative</button>
+					<button class="d6-dice rollmod-no" type="roll" name="roll_initnomod" value="&{template:black} {{name=Initiative}} {{Roll=[[(@{perception} + @{initiative} -@{WoundMod} + @{Force_Up} -1)d6cf0cs7 + @{perceptionpip} + @{initiativepip} + 1d6@{wilddie} &{tracker}]]}}">Initiative</button>
+					<button class="d6-dice" type="roll" name="roll_customroll" value="&{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}">Custom Roll(no modifiers)</button>
 					<button class="d6-dice" type="roll" name="roll_extraroll" value="&{template:black} {{name=Extra Dice}} {{Roll=[[{?{Number of  extra dice|0}d6cf0cs7}]]}}">Extra Dice(no wild die)</button>
 					<button class="d6-dice" type="roll" name="roll_charproll" value="&{template:black} {{name=Character points roll}} {{Roll=[[?{Number of char points to spend on roll|1|2|3|4|5}d6!cf0cs6]]}}">Character points roll</button>
 				</div>
@@ -130,12 +143,14 @@
 						  <option value="2">Wounded Twice</option>
 						  <option value="5">Incapacitated</option> <!--You shouldn't even be able to make checks while incapacitated or Mortally wounded, hence -15. Later will include option to ignore wound penalties -->
 						  <option value="5">Mortally Wounded</option>
-						</select> 
+						</select>
 					</label>
 					<label>Initiative bonus<input type="number" name="attr_initiative" class="smallnumber shortnumber" min="0" value="0">D+<input type="number" name="attr_initiativepip" class="pipnumber shortnumber" min="0" max="2" value="0"></label>
-					<button class="d6-dice" type="roll" name="roll_init_n" value="&{template:black} {{name=Initiative}} {{Roll=[[(@{perception} + @{initiative} -@{WoundMod} + @{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perceptionpip} + @{initiativepip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6 &{tracker}]]}}"/>Initiative</button>
-					<button class="d6-dice" type="roll" name="roll_customroll_n" value="&{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6!cf1cs6}]]}}"/>Custom Roll(no mods)</button>
-					<button class="d6-dice gmroll-hide" type="roll" name="rollg_customroll_n" value="/w gm &{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6!cf1cs6}]]}}"/><span class="redtxt">(GM)</span>C Roll</button>
+					<button class="d6-dice rollmod-no" type="roll" name="roll_init_n" value="&{template:black} {{name=Initiative}} {{Roll=[[(@{perception} + @{initiative} -@{WoundMod} + @{Force_Up} -1)d6cf0cs7 + @{perceptionpip} + @{initiativepip} + 1d6@{wilddie} &{tracker}]]}}"/>Initiative</button>
+
+					<button class="d6-dice rollmod" type="roll" name="roll_init_n" value="&{template:black} {{name=Initiative}} {{Roll=[[(@{perception} + @{initiative} -@{WoundMod} + @{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perceptionpip} + @{initiativepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie} &{tracker}]]}}"/>Initiative</button>
+					<button class="d6-dice" type="roll" name="roll_customroll_n" value="&{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}"/>Custom Roll(no mods)</button>
+					<button class="d6-dice gmroll-hide" type="roll" name="rollg_customroll_n" value="/w gm &{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}"/><span class="redtxt">(GM)</span>C Roll</button>
 				</div>
 				<div class="col">
 					<label>Physical Description & Other Info</label>
@@ -144,109 +159,151 @@
 			</div>
 		</div>
 		<div class="section"> <!----------------------------------- Attributes&Skills -->
-			<table>
-				<tr>
-					<td class="tdborder"><div class="bold"><!---Perc Attribute --->
-							<button class="d6-dice" type='roll' name="roll_per" value='&{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs7 +@{perceptionpip} +?{Other Mods(pip)|0} +1d6!cf1cs6]]}}' >Perception</button>
-							<button class="d6-dice gmroll gmroll-hide" type='roll' name="rollg_per" value='/w gm &{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs7 +@{perceptionpip} +?{Other Mods(pip)|0} +1d6!cf1cs6]]}}'><span class="redtxt">GM</span></button>
-							<div style="float:right;">
-								<input type="number" name="attr_perception" class="smallnumber"  min="1" value="3"/>D+<input type="number" name="attr_perceptionpip" class="pipnumber" min="0" max="2" value="0"/>
+			<div class="flex-box">
+				<div class="flex-col">
+							<div class="tdborder"> <!---Dex Attribute --->
+										<div class="bold">
+											<button class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexteritypip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" >Dexterity</button>
+											<button class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexteritypip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" ><span class="redtxt">GM</span></button>
+
+											<button class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexteritypip} + 1d6@{wilddie}]]}}" >Dexterity</button>
+											<button class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexteritypip} + 1d6@{wilddie}]]}}" ><span class="redtxt">GM</span></button>
+											<div style="float:right;">
+												<input type="number" name="attr_dexterity" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_dexteritypip" class="pipnumber" min="0" max="2" value="0"/>
+											</div>
+										</div>
+										<fieldset class="repeating_dexskills"> <!---Dex Skills --->
+											<button class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+											<button class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+											<button class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexskillpip} + 1d6@{wilddie}]]}}"></button>
+											<button class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+												<input class="skilltext" type="text" name="attr_dexskillname"/>
+												<div class="right">
+												<input type="number" name="attr_dexskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_dexskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
+												</div>
+										</fieldset>
 							</div>
-						</div>
-						<fieldset class="repeating_perckills"> <!---Perc Skills --->
-							<button class="d6-dice"  type="roll" name="roll_perskill" value="&{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perckillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
-							<button class="d6-dice gmroll gmroll-hide"  type="roll" name="rollg_perskill" value="/w gm &{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perckillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"><span class="redtxt">GM</span></button>
-							  <input class="skilltext" type="text" name="attr_perckillname"/> <!-- Misspelled attr name iis to be left as it is, otherwise it wipes char sheets from perseption skills-->
-							  <div class="right">
-								<input type="number" name="attr_perckilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_perckillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/> 
-							  </div>
-						</fieldset>
-					</td>
-					<td class="tdborder"><div class="bold"><!---Str Attribute --->
-							<button class="d6-dice" type='roll' name="roll_str" value='&{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strengthpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}' >Strength</button>
-							<button class="d6-dice gmroll gmroll-hide" type='roll' name="rollg_str"value='/w gm &{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strengthpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}'><span class="redtxt">GM</span></button>
-							<div style="float:right;">
-								<input type="number" name="attr_strength" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_strengthpip" class="pipnumber" min="0" max="2" value="0"/>  
+							<div class="tdborder"> <!---Know Attribute --->
+										<div class="bold">
+											<button class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowledgepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" >Knowledge</button>
+											<button class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowledgepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+											<button class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowledgepip} + 1d6@{wilddie}]]}}" >Knowledge</button>
+											<button class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowledgepip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<div style="float:right;">
+												<input type="number" name="attr_knowledge" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_knowledgepip" class="pipnumber" min="0" max="2" value="0"/>
+											</div>
+										</div>
+										<fieldset class="repeating_knowskills">  <!---Know Skills --->
+											<button class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+											<button class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+											<button class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowskillpip} + 1d6@{wilddie}]]}}"></button>
+											<button class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowskillpip}+ 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<input class="skilltext" type="text" name="attr_knowskillname"/>
+											<div class="right">
+												<input type="number" name="attr_knowskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_knowskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
+											</div>
+										</fieldset>
 							</div>
-						</div>
-						<fieldset class="repeating_strskills"> <!---Str Skills --->
-							<button class="d6-dice" type="roll" name="roll_strskill" value="&{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
-							<button class="d6-dice gmroll gmroll-hide" type="roll" name="rollg_strskill" value="/w gm &{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"><span class="redtxt">GM</span></button>
-							  <input class="skilltext" type="text" name="attr_strskillname"/> 
-							  <div class="right">
-								<input type="number" name="attr_strskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_strskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/> 
-							  </div>
-						</fieldset>			
-					</td> 
-					<td class="tdborder"><div class="bold"><!---Tech Attribute --->
-							<button class="d6-dice" type='roll' name="roll_tech" value='&{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{technicalpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}' >Technical</button>
-							<button class="d6-dice gmroll gmroll-hide" type='roll' name="rollg_tech" value='/w gm &{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{technicalpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}'><span class="redtxt">GM</span></button>
-							<div style="float:right;">
-								<input type="number" name="attr_technical" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_technicalpip" class="pipnumber" min="0" max="2" value="0"/>    
+							<div class="tdborder"><!---Mech Attribute --->
+									<div class="bold">
+											<button class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechanicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}">Mechanical</button>
+											<button class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechanicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" ><span class="redtxt">GM</span></button>
+
+											<button class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechanicalpip} + 1d6@{wilddie}]]}}">Mechanical</button>
+											<button class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechanicalpip} + 1d6@{wilddie}]]}}" ><span class="redtxt">GM</span></button>
+											<div style="float:right;">
+												<input type="number" name="attr_mechanical" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_mechanicalpip" class="pipnumber" min="0" max="2" value="0"/>
+											</div>
+										</div>
+										<fieldset class="repeating_mechskills">  <!---Mech Skills --->
+											<button class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+											<button class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+											<button class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up}-1)d6cf0cs7 + @{mechskillpip} + 1d6@{wilddie}]]}}"></button>
+											<button class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<input class="skilltext" type="text" name="attr_mechskillname"/>
+											<div class="right">
+												<input type="number" name="attr_mechskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_mechskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
+											</div>
+										</fieldset>
 							</div>
-						</div>
-						<fieldset class="repeating_techskills">  <!---Tech Skills --->
-							<button class="d6-dice"  type="roll" name="roll_techskill" value="&{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{techskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
-							<button class="d6-dice gmroll gmroll-hide"  type="roll" name="rollg_techskill" value="/w gm &{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{techskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"><span class="redtxt">GM</span></button>
-							  <input class="skilltext" type="text" name="attr_techskillname"/> 
-							  <div class="right">
-								<input type="number" name="attr_techskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_techskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/> 
-							  </div>
-						</fieldset>
-					</td> 
-				</tr>
-				<tr>
-					<td class="tdborder"><div class="bold"> <!---Dex Attribute --->
-							<button class="d6-dice" type='roll' name="roll_dex" value='&{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexteritypip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}' >Dexterity</button>
-							<button class="d6-dice gmroll gmroll-hide" type='roll' name="rollg_dex" value='/w gm &{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexteritypip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}'><span class="redtxt">GM</span></button>
-							<div style="float:right;">
-								<input type="number" name="attr_dexterity" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_dexteritypip" class="pipnumber" min="0" max="2" value="0"/>
+				</div>
+				<div class="flex-col">
+							<div class="tdborder"><!---Perc Attribute --->
+								<div class="bold">
+										<button class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs7 +@{perceptionpip} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}" >Perception</button>
+										<button class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs7 +@{perceptionpip} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+										<button class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 +@{perceptionpip} +1d6@{wilddie}]]}}" >Perception</button>
+										<button class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 +@{perceptionpip} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+										<div style="float:right;">
+											<input type="number" name="attr_perception" class="smallnumber"  min="1" value="3"/>D+<input type="number" name="attr_perceptionpip" class="pipnumber" min="0" max="2" value="0"/>
+										</div>
+								</div>
+									<fieldset class="repeating_perckills"> <!---Perc Skills --->
+										<button class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perckillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+										<button class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perckillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+										<button class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{perckillpip} + 1d6@{wilddie}]]}}"></button>
+										<button class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{perckillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<input class="skilltext" type="text" name="attr_perckillname"/> <!-- Misspelled attr name iis to be left as it is, otherwise it wipes char sheets from perseption skills-->
+											<div class="right">
+											<input type="number" name="attr_perckilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_perckillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
+											</div>
+									</fieldset>
 							</div>
-						</div>
-						<fieldset class="repeating_dexskills"> <!---Dex Skills --->
-							<button class="d6-dice"  type="roll" name="roll_dexskill" value="&{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
-							<button class="d6-dice gmroll gmroll-hide" name="rollg_dexskill" type="roll" value="/w gm &{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"><span class="redtxt">GM</span></button>
-							  <input class="skilltext" type="text" name="attr_dexskillname"/>
-							  <div class="right">		
-								<input type="number" name="attr_dexskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_dexskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
-							  </div>
-						</fieldset>
-					</td>
-					<td class="tdborder"><div class="bold"> <!---Know Attribute ---> 
-							<button class="d6-dice" type='roll' name="roll_know" value='&{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowledgepip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}' >Knowledge</button>
-							<button class="d6-dice gmroll gmroll-hide" type='roll' name="rollg_know" value='/w gm &{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowledgepip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}'><span class="redtxt">GM</span></button>
-							<div style="float:right;">
-								<input type="number" name="attr_knowledge" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_knowledgepip" class="pipnumber" min="0" max="2" value="0"/>
+							<div class="tdborder"><!---Str Attribute --->
+								<div class="bold">
+										<button class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strengthpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" >Strength</button>
+										<button class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strengthpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+										<button class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strengthpip} + 1d6@{wilddie}]]}}" >Strength</button>
+										<button class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strengthpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+										<div style="float:right;">
+											<input type="number" name="attr_strength" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_strengthpip" class="pipnumber" min="0" max="2" value="0"/>
+										</div>
+									</div>
+									<fieldset class="repeating_strskills"> <!---Str Skills --->
+										<button class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+										<button class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+										<button class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up}-1)d6cf0cs7 + @{strskillpip} + 1d6@{wilddie}]]}}"></button>
+										<button class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+										  <input class="skilltext" type="text" name="attr_strskillname"/>
+										  <div class="right">
+											<input type="number" name="attr_strskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_strskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
+										  </div>
+									</fieldset>
 							</div>
-						</div>
-						<fieldset class="repeating_knowskills">  <!---Know Skills --->
-							<button class="d6-dice"  type="roll" name="roll_knowskill" value="&{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
-							<button class="d6-dice gmroll gmroll-hide" name="rollg_knowskill" type="roll" value="/w gm &{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"><span class="redtxt">GM</span></button>
-							<input class="skilltext" type="text" name="attr_knowskillname"/> 
-							<div class="right">
-								<input type="number" name="attr_knowskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_knowskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/> 
+							<div class="tdborder"><!---Tech Attribute --->
+									<div class="bold">
+											<button class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{technicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" >Technical</button>
+											<button class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{technicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+											<button class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{technicalpip} + 1d6@{wilddie}]]}}" >Technical</button>
+											<button class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{technicalpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<div style="float:right;">
+												<input type="number" name="attr_technical" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_technicalpip" class="pipnumber" min="0" max="2" value="0"/>
+											</div>
+										</div>
+										<fieldset class="repeating_techskills">  <!---Tech Skills --->
+											<button class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{techskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+											<button class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{techskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+											<button class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{techskillpip} + 1d6@{wilddie}]]}}"></button>
+											<button class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{techskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											  <input class="skilltext" type="text" name="attr_techskillname"/>
+											  <div class="right">
+												<input type="number" name="attr_techskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_techskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
+											  </div>
+										</fieldset>
 							</div>
-						</fieldset>
-					</td> 
-					<td class="tdborder"><div class="bold"><!---Mech Attribute --->
-							<button class="d6-dice"  type='roll' name="roll_mech" value='&{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechanicalpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}'>Mechanical</button>
-							<button class="d6-dice gmroll gmroll-hide"  type='roll' name="rollg_mech" value='/w gm &{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechanicalpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}' ><span class="redtxt">GM</span></button>
-							<div style="float:right;">
-								<input type="number" name="attr_mechanical" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_mechanicalpip" class="pipnumber" min="0" max="2" value="0"/>
-							</div>
-						</div>
-						<fieldset class="repeating_mechskills">  <!---Mech Skills --->      
-							<button class="d6-dice"  type="roll" name="roll_mechskill" value="&{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
-							<button class="d6-dice gmroll gmroll-hide"  type="roll" name="rollg_mechskill" value="/w gm &{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"><span class="redtxt">GM</span></button>
-							<input class="skilltext" type="text" name="attr_mechskillname"/> 
-							<div class="right">
-								<input type="number" name="attr_mechskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_mechskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/> 
-							</div>
-						</fieldset>
-					</td> 
-				</tr>
-			</table>    
-		</div>	
+				</div>
+			</div>  <!-- flexbox-->
+		</div>
 		<div class="section"> <!------------------------------------ Weapons & Armor-->
 			<label style="text-align: center">Weapon & Armor</label>
 			<table>
@@ -260,7 +317,7 @@
 					<td style="width:35px">ROF</td>
 					<td style="width:30px;text-align:center;">Ammo</td>
 				</tr>
-			</table>	
+			</table>
 				<fieldset class="repeating_weapons">
 					<input class="skilltext" type="text"  style="width:200px" name="attr_weapon"/>
 					<input type="number" name="attr_weaponskill" class="smallnumber" min="1" value="1"/>D+<input type="number" name="attr_weaponskillpip" class="pipnumber" min="0" max="2" value="0"/>
@@ -270,11 +327,17 @@
 					<input class="mediumnumber shortnumber" type="number" name="attr_longrange"/>
 					<input class="smallnumber shortnumber" type="number" name="attr_ROF"/>
 					<input class="mediumnumber shortnumber" type="number" name="attr_Ammo"/>
+				<!-- roll buttons with roll queries -->
+					<button class="d6-dice rollmod" name="roll_attack" type="roll" value="&{template:red} {{name=@{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs0 + @{weaponskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}">Atk</button>
+					<button class="d6-dice rollmod-no" name="roll_attack" type="roll" value="&{template:red} {{name=@{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 + @{weaponskillpip} + 1d6@{wilddie}]]}}">Atk</button>
 
-					<button class="d6-dice" name="roll_attack" type="roll" value="&{template:red} {{name=@{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs0 + @{weaponskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}">Atk</button>				
-					<button class="d6-dice" name="roll_dmg" type="roll" value="&{template:red} {{name=@{weapon} damage}} {{Roll=[[(@{damagedice}- 1)d6cf0cs7 + @{damagepip} + (1d6!cf1cs6)]]}}">Dmg</button>
-					<button class="d6-dice gmroll gmroll-hide" name="rollg_attack" type="roll" value="/w gm &{template:red} {{name=@{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs0 + @{weaponskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"><span class="redtxt">GM</span>Atk</button>				
-					<button class="d6-dice gmroll gmroll-hide" name="rollg_dmg" type="roll" value="/w gm &{template:red} {{name=@{weapon} damage}} {{Roll=[[(@{damagedice}- 1)d6cf0cs7 + @{damagepip} + (1d6!cf1cs6)]]}}"><span class="redtxt">GM</span>Dmg</button>
+		
+					<button class="d6-dice rollmod gmroll gmroll-hide" name="rollg_attack" type="roll" value="/w gm &{template:red} {{name=@{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs0 + @{weaponskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>Atk</button>
+					<button class="d6-dice rollmod-no gmroll gmroll-hide" name="rollg_attack" type="roll" value="/w gm &{template:red} {{name=@{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 + @{weaponskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>Atk</button>
+
+					<button class="d6-dice" name="roll_dmg" type="roll" value="&{template:red} {{name=@{weapon} damage}} {{Roll=[[(@{damagedice}- 1)d6cf0cs7 + @{damagepip} + (1d6@{wilddie})]]}}">Dmg</button>
+					<button class="d6-dice gmroll gmroll-hide" name="rollg_dmg" type="roll" value="/w gm &{template:red} {{name=@{weapon} damage}} {{Roll=[[(@{damagedice}- 1)d6cf0cs7 + @{damagepip} + (1d6@{wilddie})]]}}"><span class="redtxt">GM</span>Dmg</button>								
+									
 				</fieldset>
 			<table>
 				<tr>
@@ -290,12 +353,21 @@
 					<input type="number" name="attr_armorPhDice" class="smallnumber shortnumber" min="0" value="1"/>D+<input type="number" name="attr_armorPhPip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
 					<input type="number" name="attr_armorEnDice" class="smallnumber shortnumber" min="0" value="1"/>D+<input type="number" name="attr_armorEnPip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
 					<input class="skilltext" type="text" name="attr_armor_other"/>
-					<button class="d6-dice" name="roll_dmg_soak_en" type="roll" value="&{template:red} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} -1)d6cf0cs0 +@{armorPhPip} +1d6!cf1cs6]]}}">Physical</button>
-					<button class="d6-dice" name="roll_dmg_soak_ph" type="roll" value="&{template:red} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} -1)d6cf0cs0 +@{armorEnPip} +1d6!cf1cs6]]}}">Energy</button>
-					<button class="d6-dice" name="roll_dmg_soak_str" type="roll" value="&{template:red} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} -1)d6cf0cs7 +1d6!cf1cs6]]}}">Str only</button>	  
-					<button class="d6-dice gmroll gmroll-hide" name="rollg_dmg_soak_en" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} -1)d6cf0cs0 + @{armorPhPip} + 1d6!cf1cs6]]}}"><span class="redtxt">GM</span>P</button>
-					<button class="d6-dice gmroll gmroll-hide" name="rollg_dmg_soak_ph" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} -1)d6cf0cs0 + @{armorEnPip} + 1d6!cf1cs6]]}}"><span class="redtxt">GM</span>E</button>
-					<button class="d6-dice gmroll gmroll-hide" name="rollg_dmg_soak_str" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} -1)d6cf0cs0 + 1d6!cf1cs6]]}}"><span class="redtxt">GM</span>S</button>	  
+					<button class="d6-dice rollmod-no physical" name="roll_dmg_soak_en" type="roll" value="&{template:red} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} -1)d6cf0cs0 +@{armorPhPip} +1d6@{wilddie}]]}}">t</button>
+					<button class="d6-dice rollmod-no energy" name="roll_dmg_soak_ph" type="roll" value="&{template:red} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} -1)d6cf0cs0 +@{armorEnPip} +1d6@{wilddie}]]}}">e</button>
+					<button class="d6-dice rollmod-no" name="roll_dmg_soak_str" type="roll" value="&{template:red} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} -1)d6cf0cs7 +1d6@{wilddie}]]}}">Str only</button>
+
+					<button class="d6-dice rollmod-no gmroll physical gmroll-hide" name="rollg_dmg_soak_en" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} -1)d6cf0cs0 + @{armorPhPip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>t</button>
+					<button class="d6-dice rollmod-no gmroll energy gmroll-hide" name="rollg_dmg_soak_ph" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} -1)d6cf0cs0 + @{armorEnPip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>e</button>
+					<button class="d6-dice rollmod-no gmroll gmroll-hide" name="rollg_dmg_soak_str" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} -1)d6cf0cs0 + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>S</button>
+
+					<button class="d6-dice rollmod physical" name="roll_dmg_soak_en" type="roll" value="&{template:red} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} +?{Dice mods|0} -1)d6cf0cs0 +@{armorPhPip} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}">t</button>
+					<button class="d6-dice rollmod energy" name="roll_dmg_soak_ph" type="roll" value="&{template:red} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} +?{Dice mods|0} -1)d6cf0cs0 +@{armorEnPip} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}">e</button>
+					<button class="d6-dice rollmod" name="roll_dmg_soak_str" type="roll" value="&{template:red} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} +?{Dice mods|0} -1)d6cf0cs7 +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}">Str only</button>
+
+					<button class="d6-dice rollmod-no gmroll physical gmroll-hide" name="rollg_dmg_soak_en" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} +?{Dice mods|0} -1)d6cf0cs0 + @{armorPhPip} + +?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>t</button>
+					<button class="d6-dice rollmod-no gmroll energy gmroll-hide" name="rollg_dmg_soak_ph" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} +?{Dice mods|0} -1)d6cf0cs0 + @{armorEnPip} +?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>e</button>
+					<button class="d6-dice rollmod-no gmroll gmroll-hide" name="rollg_dmg_soak_str" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} +?{Dice mods|0} -1)d6cf0cs0 +?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>S</button>		  
 				</fieldset>
 		</div>
 		<div class="section force-hide"> <!--------------------------- Force -->
@@ -306,15 +378,22 @@
 						<tr><!--Control -->
 							<td class="tdborder">
 								<div class="bold">
-									<button class="d6-dice forcebutton" name="roll_force_control" type='roll' value='&{template:default} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6!cf1cs6]]}}'>Control</button>
-									<button class="d6-dice gmroll gmroll-hide" name="rollg_force_control" type='roll' value='/w gm &{template:default} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6!cf1cs6]]}}'><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod forcebutton" name="roll_force_control" type='roll' value='&{template:default} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'>Control</button>
+									<button class="d6-dice rollmod gmroll gmroll-hide" name="rollg_force_control" type='roll' value='/w gm &{template:default} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
+
+									<button class="d6-dice rollmod-no forcebutton" name="roll_force_control" type='roll' value='&{template:default} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}'>Control</button>
+									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="rollg_force_control" type='roll' value='/w gm &{template:default} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
 									<div class="bold" style="float:right;">
 										<input type="number" name="attr_control" class="smallnumber"  min="0" value="0"/>D+<input type="number" name="attr_controlpip" class="pipnumber" min="0" max="2" value="0"/>
 									</div>
 								</div>
 								<fieldset class="repeating_controlpowers">  <!---Control Powers --->      
-									<button class="d6-dice" name="roll_force_control_p" type="roll" value="&{template:default} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6!cf1cs6]]}}"></button>
-									<button class="d6-dice gmroll gmroll-hide" name="rollg_force_control_p" type="roll" value="/w gm &{template:default} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6!cf1cs6]]}}"><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod" name="roll_force_control_p" type="roll" value="&{template:default} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
+									<button class="d6-dice rollmod gmroll gmroll-hide" name="rollg_force_control_p" type="roll" value="/w gm &{template:default} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+									<input class="skilltext" type="text" name="attr_controlpowername"/> 
+
+									<button class="d6-dice rollmod-no" name="roll_force_control_p" type="roll" value="&{template:default} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"></button>
+									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="rollg_force_control_p" type="roll" value="/w gm &{template:default} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 									<input class="skilltext" type="text" name="attr_controlpowername"/> 
 								</fieldset>								
 							</td>
@@ -322,39 +401,51 @@
 						<tr><!-- Sense -->
 							<td class="tdborder">
 								<div class="bold">
-									<button class="d6-dice forcebutton" name="roll_force_sense" type='roll' value='&{template:default} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6!cf1cs6]]}}'>Sense</button>
-									<button class="d6-dice gmroll gmroll-hide" name="rollg_force_sense" type='roll' value='/w gm &{template:default} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6!cf1cs6]]}}'><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod forcebutton" name="roll_force_sense" type='roll' value='&{template:default} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'>Sense</button>
+									<button class="d6-dice rollmod gmroll gmroll-hide" name="rollg_force_sense" type='roll' value='/w gm &{template:default} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
+
+									<button class="d6-dice rollmod-no forcebutton" name="roll_force_sense" type='roll' value='&{template:default} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}'>Sense</button>
+									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="rollg_force_sense" type='roll' value='/w gm &{template:default} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
 									<div class="bold" style="float:right;">
-										<input type="number" name="attr_sense" class="smallnumber" style="margin-left=100px;"  min="0" value="0"/>D+<input type="number" name="attr_sensepip" class="pipnumber" min="0" max="2" value="0"/>  
+										<input type="number" name="attr_sense" class="smallnumber" style="margin-left=100px;"  min="0" value="0"/>D+<input type="number" name="attr_sensepip" class="pipnumber" min="0" max="2" value="0"/>
 									</div>
 								</div>
 								<fieldset class="repeating_sensepowers">  <!---Sense Powers --->      
-									<button class="d6-dice" name="roll_force_sense_p" type="roll" value="&{template:default} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6!cf1cs6]]}}"></button>
-									<button class="d6-dice gmroll gmroll-hide" name="rollg_force_sense_p"  type="roll" value="/w gm &{template:default} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6!cf1cs6]]}}"><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod" name="roll_force_sense_p" type="roll" value="&{template:default} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
+									<button class="d6-dice rollmod gmroll gmroll-hide" name="rollg_force_sense_p"  type="roll" value="/w gm &{template:default} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+									<button class="d6-dice rollmod-no" name="roll_force_sense_p" type="roll" value="&{template:default} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"></button>
+									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="rollg_force_sense_p"  type="roll" value="/w gm &{template:default} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 									<input class="skilltext" type="text" name="attr_sensepowername"/> 
 								</fieldset>
-							</td> 
+							</td>
 						</tr>
 						<tr><!-- Alter -->
 							<td class="tdborder">
 								<div class="bold">
-									<button class="d6-dice forcebutton" name="roll_force_alter" type='roll' value='&{template:default} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6!cf1cs6]]}}'>Alter</button>
-									<button class="d6-dice gmroll gmroll-hide" name="rollg_force_alter"  type='roll' value='/w gm &{template:default} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6!cf1cs6]]}}'><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod forcebutton" name="roll_force_alter" type='roll' value='&{template:default} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'>Alter</button>
+									<button class="d6-dice rollmod gmroll gmroll-hide" name="rollg_force_alter"  type='roll' value='/w gm &{template:default} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
+
+									<button class="d6-dice rollmod-no forcebutton" name="roll_force_alter" type='roll' value='&{template:default} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up}-1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}'>Alter</button>
+									<button class="d6-dice rollmod-no  gmroll gmroll-hide" name="rollg_force_alter"  type='roll' value='/w gm &{template:default} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up}-1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
 									<div class="bold" style="float:right;">
-										<input type="number" name="attr_alter" class="smallnumber" min="0" value="0"/>D+<input type="number" name="attr_alterpip" class="pipnumber" min="0" max="2" value="0"/>    
+										<input type="number" name="attr_alter" class="smallnumber" min="0" value="0"/>D+<input type="number" name="attr_alterpip" class="pipnumber" min="0" max="2" value="0"/>
 									</div>
 								</div>
 								<fieldset class="repeating_alterpowers">  <!---Alter Powers --->      
-									<button class="d6-dice"  type="roll" name="roll_force_alter_p" value="&{template:default} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 + @{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6!cf1cs6]]}}"></button>
-									<button class="d6-dice gmroll gmroll-hide" name="rollg_force_alter_p"  type="roll" value="/w gm &{template:default} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6!cf1cs6]]}}"><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod"  type="roll" name="roll_force_alter_p" value="&{template:default} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 + @{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
+									<button class="d6-dice rollmod gmroll gmroll-hide" name="rollg_force_alter_p"  type="roll" value="/w gm &{template:default} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+
+									<button class="d6-dice rollmod-no"  type="roll" name="roll_force_alter_p" value="&{template:default} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 + @{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"></button>
+									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="rollg_force_alter_p"  type="roll" value="/w gm &{template:default} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 									<input class="skilltext" type="text" name="attr_alterpowername"/> 
 								</fieldset>
-							</td> 
+							</td>
 						</tr>
-					</table>		
+					</table>
 				</div>
 				<div class='col'><!-- Force Power Trackers -->
-					<table style="position:relative;left:30px"><th><label>Force Powers Active</label></th>		
+					<table style="position:relative;left:30px"><th><label>Force Powers Active</label></th>
 						<tr><td><!---Force Emptiness --->
 								<span style="padding-top:8px; padding-bottom:12px;" title="Force Emptiness adds +6 pips to all force skill rolls when active. Bonus is reduced by 1 for every DSP">Force Emptiness active</span><!---Force Emptiness adds +6 pips to all force skill rolls when active --->
 									<select name="attr_Force_Emptiness" class="smallselect">
@@ -382,7 +473,7 @@
 								</select>
 							</span>
 						</td></tr>
-					</table>	
+					</table>
 				</div>
 				<div class='col'><!-- Force Power list -->
 						<label style="padding-top:8px; padding-bottom:12px;" >Force Powers</label>
@@ -395,9 +486,10 @@
 					<span style="padding-top:8px; padding-bottom:12px;" >Lightsaber Combat
 						<input class="skilltext" type="text" name="attr_lightsaberskill" value="lightsaber"/>
 						<input type="number" name="attr_lightsaberskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_lightsaberskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
-						<button class="d6-dice" name="roll_lc_attack" type="roll" value="&{template:default} {{name=@{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} -@{WoundMod} +@{Force_Up} +@{sense} +?{Dice mods|0} -1)d6cf0cs0 + @{lightsaberskillpip} +@{Force_EmptinessMod} +@{sensepip} +?{Other Mods(pip)|0} +(1d6!cf1cs6)]]}}">LC Attack</button>	
+						<button class="d6-dice rollmod" name="roll_lc_attack" type="roll" value="&{template:default} {{name=@{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} -@{WoundMod} +@{Force_Up} +@{sense} +?{Dice mods|0} -1)d6cf0cs0 + @{lightsaberskillpip} +@{Force_EmptinessMod} +@{sensepip} +?{Other Mods(pip)|0} +(1d6@{wilddie})]]}}">LC Attack</button>
+						<button class="d6-dice rollmod-no" name="roll_lc_attack" type="roll" value="&{template:default} {{name=@{lightsaberskill}}} {{Roll=[[(@{lightsaberskilldice} -@{WoundMod} +@{Force_Up} +@{sense} -1)d6cf0cs0 + @{lightsaberskillpip} +@{Force_EmptinessMod} +@{sensepip} +(1d6@{wilddie})]]}}">LC Attack</button>
 						<input type="number" name="attr_lightsaberdamagedice" class="smallnumber shortnumber" min="1" value="6"/>D+<input type="number" name="attr_lightsaberdamagepip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
-						<button class="d6-dice" name="roll_lc_dmg" type="roll" value="&{template:default} {{name=@{lightsaberskill} damage}} {{Roll=[[(@{lightsaberdamagedice}- 1)d6cf0cs0 +@{lightsaberdamagepip} +@{Force_EmptinessMod} +(1d6!cf1cs6)]]}}">LC Damage</button>
+						<button class="d6-dice rollmod" name="roll_lc_dmg" type="roll" value="&{template:default} {{name=@{lightsaberskill} damage}} {{Roll=[[(@{lightsaberdamagedice}- 1)d6cf0cs0 +@{lightsaberdamagepip} +@{Force_EmptinessMod} +(1d6@{wilddie})]]}}">LC Damage</button>
 					</span>		
 			</div>
 		</div>
@@ -473,12 +565,12 @@
 				<div class='col'><!-- Vehicle -->
 						<label style="padding-top:4px;padding-bottom:4px;" >Vehicle</label>
 						<input class="skilltext" type="text"  style="width:95%;padding-bottom:8px;" name="attr_vehiclename"/>
-						<textarea name="attr_vehicle" style="width:97%;height:17em;"></textarea>				
+						<textarea name="attr_vehicle" style="width:97%;height:17em;"></textarea>
 				</div>
 				<div class='col'><!-- Starship -->
 						<label style="padding-top:4px;padding-bottom:4px;" >Starship</label>
 						<input class="skilltext" type="text"  style="width:95%;padding-bottom:8px;" name="attr_starshipname"/>
-						<textarea name="attr_starship" style="width:97%;height:17em;"></textarea>				
+						<textarea name="attr_starship" style="width:97%;height:17em;"></textarea>
 				</div>
 			</div>
 		</div>
@@ -574,7 +666,7 @@ on("change:force_emptiness change:darksidepoints", function() {
 		let v_Force_Emptiness = values.Force_Emptiness;
 		let v_Force_EmptinessMod = 0;
 		let v_darkSidePoints = parseInt(values.darkSidePoints)||0;
-		
+
 		if(v_Force_Emptiness == "true"){
 			v_Force_EmptinessMod = 6 - v_darkSidePoints;
 		}
@@ -583,4 +675,4 @@ on("change:force_emptiness change:darksidepoints", function() {
 		});
    });
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/D6StarWars/README.md b/D6StarWars/README.md
index fb257a03d2..312289ac1f 100644
--- a/D6StarWars/README.md
+++ b/D6StarWars/README.md
@@ -1,7 +1,7 @@
 # D6 StarWars Character Sheet
 
-This is the Character sheet for the D6-Based  WEG Star Wars and the new D6 Star Wars games. The sheet is geared to 2E and REUP as the rolls use wild die, but the option to disable wild die and others are on the top upcoming improvement.
-If you're looking to play 30th Annniversary Edition or 1E, "Star Wars 30th Anniversary Edition"-sheet by claes is recommemded
+This is the Character sheet for the D6-Based  WEG Star Wars and the new D6 Star Wars games. The sheet is geared to 2E and REUP as the rolls use wild die, but the option to disable wild die is now included so 1E gameplay should be comfortable now.
+If you're looking to play "30th Annniversary Edition" or "1E", the sheet by the name "Star Wars 30th Anniversary Edition"(author: Claes) is another option.
 
 List your dice and pips next to the appropriate skills -  3pips equal another die.
 The text areas are expandable for additional info. 
@@ -12,5 +12,4 @@ The text areas are expandable for additional info.
 
 Good source for all things D6 Star wars related, including fanmade conversions of campaign settings, forums and more:
 
-**--------------->[http://www.d6holocron.com/](http://www.d6holocron.com/)<-------------**
-
+**--------------->[http://www.d6holocron.com/](http://www.d6holocron.com/)<-------------**
\ No newline at end of file
diff --git a/D6StarWars/d6starwarspreview.png b/D6StarWars/d6starwarspreview.png
index bc8179c198..8fb011b44a 100644
Binary files a/D6StarWars/d6starwarspreview.png and b/D6StarWars/d6starwarspreview.png differ
diff --git a/D6StarWars/sheet.json b/D6StarWars/sheet.json
index 2a54a2f9ec..bcf7b58c09 100644
--- a/D6StarWars/sheet.json
+++ b/D6StarWars/sheet.json
@@ -4,6 +4,6 @@
     "authors": "Timothy O'Driscoll, Andreas J.",
     "roll20userid": "555352, 1223200",
     "preview": "d6starwarspreview.png",
-    "instructions": "\n This sheet is for Star Wars: The Roleplaying Game by West End Games(WEG) that uses the d6 pool system.\n* Recommended for 2E, 2E R&E and REUP games, rolls from sheet uses Wild Die \n* NPC sheet available \n* Customization options to hide some sections & show/hide GM rolls available \n* More info check out the sheet's [wiki page](https://wiki.roll20.net/Star_Wars_WEG_D6_character_sheet) \n\n Option for a 1E rolls are in the works as well as expanding the Vehicle section in the near future(2018-07-31). \n\n Issues, Ideas & Questions can be sent to the [active editor](https://app.roll20.net/users/1223200)"
+    "instructions": "\n This sheet is for Star Wars: The Roleplaying Game by West End Games(WEG) that uses the d6 pool system(**Sheet Version 2.00**).\n* Can be used for 1E, 2E, 2E R&E and REUP games, Wild Die can be disabled if wanted \n* NPC sheet available \n* Customization options include: hiding some sections, show/hide GM rolls, and disable/enable rolls to ask for modifiers before rolling \n* For more info, check out the sheet's [wiki page](https://wiki.roll20.net/Star_Wars_WEG_D6_character_sheet) \n\n Issues, Ideas & Questions can be sent to the [active editor](https://app.roll20.net/users/1223200)"
 }