diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.css b/Shadowrun Sixth World/Shadowrun6thEdition.css
index 0c33a834df..529df2d4d0 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.css	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.css	
@@ -337,16 +337,16 @@ div.matrix-device .matrixFirewall {
   border-radius: 0px !important; }
 
 /***** PLAYER DATA INPUTS *****/
-#SR6WE .pc .tabs {
+#SR6WE .tabs {
   grid-column-gap: 0.25% !important;
   padding: 0px 1% 3% 1% !important;
   margin-top: 1% !important;
   grid-row-gap: 10% !important; }
 
-#SR6WE .pc div.tabs {
+#SR6WE div.tabs {
   width: 100% !important; }
 
-#SR6WE .pc .tabs h1 {
+#SR6WE .tabs h1 {
   background-color: transparent !important;
   color: #000 !important;
   display: inline-block !important;
@@ -358,6 +358,60 @@ div.matrix-device .matrixFirewall {
   text-transform: uppercase !important; }
 
 
+
+#SR6WE .pc .tabs .header-toggles {
+  display: grid !important;
+  grid-template-columns: auto auto auto auto auto auto auto auto auto auto auto auto !important;
+  width: 100% !important;
+  height: 30px !important; }
+
+#SR6WE .tabs h2[data-i18n-title='whispergm'] {
+  width: 75px !important;
+  vertical-align: middle;
+  margin-right: 0px !important; }
+#SR6WE .tabs label[data-i18n-title='whispergm'] {
+  width: 50px !important;
+  vertical-align: middle;
+  margin-right: 0px !important; }
+
+#SR6WE .tabs h2[data-i18n-title='wounds'] {
+  width: 75px !important;
+  vertical-align: middle;
+  margin-right: 0px !important; }
+#SR6WE .tabs label[data-i18n-title='wounds'] {
+  width: 50px !important;
+  vertical-align: middle;
+  margin-right: 0px !important; }
+
+#SR6WE .tabs h2[data-i18n-title='dicepoolmodifiers'] {
+  width: 75px !important;
+  vertical-align: middle;
+  margin-right: 0px !important; }
+#SR6WE .tabs label[data-i18n-title='dicepoolmodifiers'] {
+  width: 50px !important;
+  vertical-align: middle;
+  margin-right: 0px !important; }
+
+#SR6WE .tabs h2[data-i18n-title='addedgetodicepool'] {
+  width: 75px !important;
+  vertical-align: middle;
+  margin-right: 0px !important; }
+#SR6WE .tabs label[data-i18n-title='addedgetodicepool'] {
+  width: 50px !important;
+  vertical-align: middle;
+  margin-right: 0px !important; }
+
+#SR6WE .tabs h2[data-i18n-title='wilddie'] {
+  width: 75px !important;
+  vertical-align: middle;
+  margin-right: 0px !important; }
+#SR6WE .tabs label[data-i18n-title='wilddie'] {
+  width: 50px !important;
+  vertical-align: middle;
+  margin-right: 0px !important; }
+
+
+/* PC Specific */
 #SR6WE .pc .tabs .header-names {
   display: grid !important;
   grid-template-columns: 10em 1fr 10em 1fr !important;
@@ -389,60 +443,6 @@ div.matrix-device .matrixFirewall {
 #SR6WE .pc .tabs label[data-i18n-title='character name'], #SR6WE .pc .tabs label[data-i18n-title='player name'] {
 }
 
-#SR6WE .pc .tabs .header-toggles {
-  display: grid !important;
-  grid-template-columns: auto auto auto auto auto auto auto auto auto auto auto auto !important;
-  width: 100% !important;
-  height: 30px !important; }
-
-
-#SR6WE .pc .tabs h2[data-i18n-title='whispergm'] {
-  width: 75px !important;
-  vertical-align: middle;
-  margin-right: 0px !important; }
-#SR6WE .pc .tabs label[data-i18n-title='whispergm'] {
-  width: 50px !important;
-  vertical-align: middle;
-  margin-right: 0px !important; }
-
-#SR6WE .pc .tabs h2[data-i18n-title='wounds'] {
-  width: 75px !important;
-  vertical-align: middle;
-  margin-right: 0px !important; }
-#SR6WE .pc .tabs label[data-i18n-title='wounds'] {
-  width: 50px !important;
-  vertical-align: middle;
-  margin-right: 0px !important; }
-
-#SR6WE .pc .tabs h2[data-i18n-title='dicepoolmodifiers'] {
-  width: 75px !important;
-  vertical-align: middle;
-  margin-right: 0px !important; }
-#SR6WE .pc .tabs label[data-i18n-title='dicepoolmodifiers'] {
-  width: 50px !important;
-  vertical-align: middle;
-  margin-right: 0px !important; }
-
-
-#SR6WE .pc .tabs h2[data-i18n-title='addedgetodicepool'] {
-  width: 75px !important;
-  vertical-align: middle;
-  margin-right: 0px !important; }
-#SR6WE .pc .tabs label[data-i18n-title='addedgetodicepool'] {
-  width: 50px !important;
-  vertical-align: middle;
-  margin-right: 0px !important; }
-
-#SR6WE .pc .tabs h2[data-i18n-title='wilddie'] {
-  width: 75px !important;
-  vertical-align: middle;
-  margin-right: 0px !important; }
-#SR6WE .pc .tabs label[data-i18n-title='wilddie'] {
-  width: 50px !important;
-  vertical-align: middle;
-  margin-right: 0px !important; }
-
-
 #SR6WE .pc .tabs .header-navtabs {
   display: grid !important;
   grid-template-columns: 1fr 2.5em 2.5em repeat(8, 5em) !important;
@@ -460,6 +460,12 @@ div.matrix-device .matrixFirewall {
   position: relative !important;
   right: 0px !important; }
 
+#SR6WE .pc .tabs .header-toggles {
+  display: grid !important;
+  grid-template-columns: auto auto auto auto auto auto auto auto auto auto auto auto !important;
+  width: 100% !important;
+  height: 30px !important; }
+
 
   .pc input.settings-toggle + span,
   .pc input.settings-flag + span,
@@ -2719,54 +2725,65 @@ span.d6 {
 .npc textarea, .npc select {
   color: #000;
   background-color: rgb(210, 209, 205); }
-.npc div.tabs {
-  grid-template-columns: 2.5em 1fr 4em 1fr 4em 1fr 4em 1fr 4em;
-  grid-row-gap: 10%; }
-.npc div.tabs button[type='roll'] {
-  grid-area: 2 / 1 / 2 / 2; }
-.npc div.tabs img {
-  grid-area: 1 / 1 / 2 / 4;
-  height: 100%;
-  width: 100%; }
-.npc div.tabs .switch input[type='checkbox'] + span {
+
+
+/* sheet headers */
+#SR6WE .npc .tabs .header-toggles {
+  display: grid !important;
+  grid-template-columns: auto 2.5em repeat(11, auto);
+  width: 100% !important;
+  height: 30px !important; }
+
+#SR6WE .npc .tabs .header-nav {
+  display: grid;
+  grid-template-columns: 1fr auto 2.5em;
+  width: 100%;
+  height: 30px; }
+
+#SR6WE .npc div.tabs button[type='roll'] {
+  padding-bottom: 10px !important;
+  vertical-align: middle; }
+#SR6WE .npc div.tabs .switch input[type='checkbox'] + span {
   position: absolute; }
-.npc div.tabs h2, .npc div.tabs label {
-  grid-row: 2; }
-.npc div.tabs select {
-  grid-column: 8 / 8; }
-.npc div.tabs input[name='attr_stats_toggle'],
-.npc div.tabs input[name='attr_stats_toggle'] + span.pictos,
-.npc div.tabs .settings-toggle input[type='checkbox'][name='attr_stats_toggle'] + span,
-.settings-toggle .npc div.tabs input[type='checkbox'][name='attr_stats_toggle'] + span,
-.npc div.tabs .settings-flag input[type='checkbox'][name='attr_stats_toggle'] + span,
-.settings-flag .npc div.tabs input[type='checkbox'][name='attr_stats_toggle'] + span,
-.npc div.tabs .flag-primary + div > input[name='attr_stats_toggle'] + span,
-.npc div.tabs .repcontrol input[name='attr_stats_toggle'] + span.repcontrol_edit:after,
-.repcontrol .npc div.tabs input[name='attr_stats_toggle'] + span.repcontrol_edit:after,
-.npc div.tabs .repcontrol input[name='attr_stats_toggle'] + span.repcontrol_add:after,
-.repcontrol .npc div.tabs input[name='attr_stats_toggle'] + span.repcontrol_add:after,
-.npc div.tabs .itemcontrol input[name='attr_stats_toggle'] + span.repcontrol_del,
-.itemcontrol .npc div.tabs input[name='attr_stats_toggle'] + span.repcontrol_del {
-  grid-area: 1 / 9 / 1 / 9;
+#SR6WE .npc div.tabs select {
+  grid-column: 2 / 3; }
+#SR6WE .npc div.tabs input[name='attr_stats_toggle'],
+#SR6WE .npc div.tabs input[name='attr_stats_toggle'] + span.pictos,
+#SR6WE .npc div.tabs .settings-toggle input[type='checkbox'][name='attr_stats_toggle'] + span,
+#SR6WE .settings-toggle .npc div.tabs input[type='checkbox'][name='attr_stats_toggle'] + span,
+#SR6WE .npc div.tabs .settings-flag input[type='checkbox'][name='attr_stats_toggle'] + span,
+#SR6WE .settings-flag .npc div.tabs input[type='checkbox'][name='attr_stats_toggle'] + span,
+#SR6WE .npc div.tabs .flag-primary + div > input[name='attr_stats_toggle'] + span,
+#SR6WE .npc div.tabs .repcontrol input[name='attr_stats_toggle'] + span.repcontrol_edit:after,
+#SR6WE .repcontrol .npc div.tabs input[name='attr_stats_toggle'] + span.repcontrol_edit:after,
+#SR6WE .npc div.tabs .repcontrol input[name='attr_stats_toggle'] + span.repcontrol_add:after,
+#SR6WE .repcontrol .npc div.tabs input[name='attr_stats_toggle'] + span.repcontrol_add:after,
+#SR6WE .npc div.tabs .itemcontrol input[name='attr_stats_toggle'] + span.repcontrol_del,
+#SR6WE .itemcontrol .npc div.tabs input[name='attr_stats_toggle'] + span.repcontrol_del {
+  grid-area: 1 / 3 / 1 / 4;
   position: relative;
   width: 100%;
   height: 100%; }
-.npc div.tabs input[name='attr_stats_toggle']:checked + span {
+
+#SR6WE .npc div.tabs input[name='attr_stats_toggle']:checked + span {
   color: #460141; }
-.npc div.tabs span.pictos, 
-.npc div.tabs .settings-toggle input[type='checkbox'] + span, 
-.settings-toggle .npc div.tabs input[type='checkbox'] + span,
-.npc div.tabs .settings-flag input[type='checkbox'] + span,
-.settings-flag .npc div.tabs input[type='checkbox'] + span, 
-.npc div.tabs .flag-primary + div > span, 
-.npc div.tabs .repcontrol span.repcontrol_edit:after, 
-.repcontrol .npc div.tabs span.repcontrol_edit:after,
-.npc div.tabs .repcontrol span.repcontrol_add:after,
-.repcontrol .npc div.tabs span.repcontrol_add:after, 
-.npc div.tabs .itemcontrol span.repcontrol_del, 
-.itemcontrol .npc div.tabs span.repcontrol_del {
+
+#SR6WE .npc div.tabs span.pictos, 
+#SR6WE .npc div.tabs .settings-toggle input[type='checkbox'] + span, 
+#SR6WE .settings-toggle .npc div.tabs input[type='checkbox'] + span,
+#SR6WE .npc div.tabs .settings-flag input[type='checkbox'] + span,
+#SR6WE .settings-flag .npc div.tabs input[type='checkbox'] + span, 
+#SR6WE .npc div.tabs .flag-primary + div > span, 
+#SR6WE .npc div.tabs .repcontrol span.repcontrol_edit:after, 
+#SR6WE .repcontrol .npc div.tabs span.repcontrol_edit:after,
+#SR6WE .npc div.tabs .repcontrol span.repcontrol_add:after,
+#SR6WE .repcontrol .npc div.tabs span.repcontrol_add:after, 
+#SR6WE .npc div.tabs .itemcontrol span.repcontrol_del, 
+#SR6WE .itemcontrol .npc div.tabs span.repcontrol_del {
   text-align: center;
   font-size: 1.2em; }
+
+
 .npc div.rows {
   margin-bottom: 1%;
   width: 100%; }
diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.html b/Shadowrun Sixth World/Shadowrun6thEdition.html
index 2df322010d..9af35ebc7f 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.html	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.html	
@@ -876,7 +876,7 @@
               <input name="attr_skill" type="hidden" value=""/>
               <input class="flag-primary" name="attr_primary" type="hidden" value=""/>
               <input class="flag-primary" name="attr_additional" type="hidden" value=""/>
-              <button name="roll_range_weapon" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{weapon}}}{{base=^{agility}}}{{dice=[[((@{rating}+@{spec}+@{expert}+@{dicepool_modifier}+@{agility})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=Mode @{mode}, Damage @{damage}, Skill @{skill}, Dicepool @{dicepool}, Spec @{spec}, Expert @{expert}, Agility @{agility}, Wounds @{wounds_toggle}, Modifiers @{modifiers_toggle}, Edge @{edge_toggle, Notes @{notes}}}}{{wilddie=[[@{wild_die}d6]]}}"><span name="attr_weapon"></span></button>
+              <button name="roll_range_weapon" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{weapon}}}{{base=^{agility}}}{{dice=[[((@{rating}+@{spec}+@{expert}+@{dicepool_modifier}+@{agility})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=Mode @{mode}, Damage @{damage}, Skill @{skill}, Dicepool @{dicepool}, Spec @{spec}, Expert @{expert}, Agility @{agility}, Wounds @{wounds_toggle}, Modifiers @{modifiers_toggle}, Edge @{edge_toggle}, Notes @{notes}}}{{wilddie=[[@{wild_die}d6]]}}"><span name="attr_weapon"></span></button>
               <span class="center" name="attr_dicepool"></span>
               <span class="center" name="attr_damage"></span>
               <span class="center" name="attr_close"></span>
@@ -2518,35 +2518,44 @@
 <div>
 <h1 style="color: red;">THIS IS COMPLETELY UNTESTED AND ROLLS ARE INCORRECT.  DATA WILL BE CHANGING AS IT IS EDITED. USE KNOWING THE DATA WILL BE LOST.</h1>
 </div>
+  <img class="shadowrun-logo" alt="Shadowrun sixth edition logo" src="https://s3.amazonaws.com/files.d20.io/images/204802539/QInmmma8HvUBA90c8e8H8Q/max.png?1614545502"/>
   <div class="tabs">
-  	 <img alt="Shadowrun black and metallic logo" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Shadowrun5thEdition/images/ShadowrunLogo.png"/>
-
-
-    <h2 data-i18n-title="/w GM">/w GM</h2>
-    <label class="switch" data-i18n-title="whisper rolls to gm" title="whisper rolls to gm">
-      <input class="whisper-toggle" name="attr_gm_toggle" type="checkbox" value="/w gm"/><span class="slider"></span>
-    </label>
-    <h2 data-i18n-title="wounds">wounds</h2>
-    <label class="switch" data-i18n-title="wounds" title="wounds">
-      <input class="whisper-toggle" name="attr_wounds_toggle" type="checkbox" value="@{wounds}"/><span class="slider"></span>
-    </label>
-    <h2 data-i18n-title="modifiers">modifiers</h2>
-    <label class="switch" data-i18n-title="modifiers" title="modifiers">
-      <input class="whisper-toggle" name="attr_modifiers_toggle" type="checkbox" value="?{Modifiers +/-|0}"/><span class="slider"></span>
-    </label>
-    <h2 data-i18n-title="edge">edge</h2>
-    <label class="switch" data-i18n-title="edge" title="edge">
-      <input class="whisper-toggle" name="attr_edge_toggle" type="checkbox" value="@{edge}"/><span class="slider"></span>
-    </label>
-    <button name="d6" title="Roll D6s" type="roll" value="@{gm_toggle} &amp;{template:rolls}{{header=^{d6}}}{{base=^{d6}}}{{dice=[[(?{d6s|0}d6&gt;5)]]}}">L</button>
-    <select name="attr_sheet_type" title="Sheet Type">
-		<option value="pc" data-i18n="pc">PC</option>
-		<option value="grunt" data-i18n="grunt">Grunt</option>
-		<option value="host" data-i18n="host">Host</option>
-		<option value="sprite" data-i18n="sprite">Sprite</option>
-		<option value="vehicle" data-i18n="vehicle">Vehicle</option>
-    </select>
-    <input name="attr_stats_toggle" type="checkbox" value="settings" checked="checked"/><span class="pictos">y</span>
+    <div class="header-nav">
+      <span>&nbsp;</span>
+      <select name="attr_sheet_type" title="Sheet Type">
+        <option value="pc" data-i18n="pc">PC</option>
+        <option value="grunt" data-i18n="grunt">Grunt</option>
+        <option value="host" data-i18n="host">Host</option>
+        <option value="sprite" data-i18n="sprite">Sprite</option>
+        <option value="vehicle" data-i18n="vehicle">Vehicle</option>
+      </select>
+      <input name="attr_stats_toggle" type="checkbox" value="settings" checked="checked"/><span class="pictos">y</span>
+    </div>
+    <div class="header-toggles">
+      <span>&nbsp;</span>
+      <button name="d6" title="Roll D6s" type="roll" value="@{gm_toggle} &amp;{template:rolls}{{header=^{d6}}}{{base=^{d6}}}{{dice=[[(?{d6s|0}d6&gt;5)]]}}">L</button>
+      <h2 data-i18n-title="whispergm">/w GM</h2>
+      <label class="switch" data-i18n-title="whispergm" title="Whisper rolls to GM">
+        <input class="whisper-toggle" name="attr_gm_toggle" type="checkbox" value="/w gm"/><span class="slider"></span>
+      </label>
+      <h2 data-i18n-title="wounds">Wounds</h2>
+      <label class="switch" data-i18n-title="wounds" title="Wounds">
+        <input class="whisper-toggle" name="attr_wounds_toggle" type="checkbox" value="@{wounds}"/><span class="slider"></span>
+      </label>
+      <h2 data-i18n-title="dicepoolmodifiers">Modifiers</h2>
+      <label class="switch" data-i18n-title="dicepoolmodifiers" title="Dicepool Modifiers">
+        <input class="whisper-toggle" name="attr_modifiers_toggle" type="checkbox" value="?{Modifiers +/-|0}"/><span class="slider"></span>
+      </label>
+      <h2 data-i18n-title="addedgetodicepool">Edge</h2>
+      <label class="switch" data-i18n-title="addedgetodicepool" title="Add Edge to your dice pool and exploding 6's">
+        <input class="whisper-toggle" name="attr_edge_toggle" type="checkbox" value="@{edge}"/><span class="slider"></span>
+      </label>
+      <h2 data-i18n-title="wilddie">Wild Die</h2>
+      <label class="switch" data-i18n-title="wilddie" title="Roll a single wild die">
+        <input class="whisper-toggle" name="attr_wild_die" type="checkbox" value="1"/><span class="slider"></span>
+      </label>
+      <span>&nbsp;</span>
+    </div>
   </div>
   <input name="attr_stats_toggle" type="hidden" value="settings"/>
   <div class="grunt attribute">