diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.css b/Shadowrun Sixth World/Shadowrun6thEdition.css
index 529df2d4d0..3b766fbad7 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.css	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.css	
@@ -13,7 +13,7 @@ GLOBALS
   font-size: 0.8em !important;
   text-shadow: none !important; }
   .charsheet button[type='roll'], button[type='action'] {
-    font-size: 1em !important;
+    font-size: 1em;
     margin: 0px !important;
     padding: 1px 2px !important;
     border-bottom: 0.01em solid #666 !important;
@@ -193,8 +193,8 @@ input:checked + .slider:before {
   font-family: 'dicefontd6' !important;
   font-size: 2.5em !important;
   vertical-align: middle; }
-  .tabs button[type='roll']:hover {
-    text-shadow: 1px 1px 2px black, 0 0 25px #460141, 0 0 5px #460141 !important; }
+.tabs button[type='roll']:hover {
+  text-shadow: 1px 1px 2px black, 0 0 25px #460141, 0 0 5px #460141 !important; }
 .tabs h2 {
   font-size: 1em !important;
   text-transform: capitalize !important;
@@ -306,6 +306,7 @@ div.matrix-device .matrixFirewall {
 #SR6WE .pc .repeat-box button[type='roll']:hover,
 #SR6WE .pc .con-track button[type='action']:hover,
 #SR6WE .pc button[data-i18n='default']:hover,
+#SR6WE .npc .attribute button:hover,
 #SR6WE .npc button > h2:hover,
 #SR6WE .npc button > span:hover,
 #SR6WE .npc label > button[type='roll']:hover,
@@ -338,10 +339,12 @@ div.matrix-device .matrixFirewall {
 
 /***** PLAYER DATA INPUTS *****/
 #SR6WE .tabs {
-  grid-column-gap: 0.25% !important;
-  padding: 0px 1% 3% 1% !important;
-  margin-top: 1% !important;
-  grid-row-gap: 10% !important; }
+  grid-column-gap: 0.25%;
+  padding: 0px 1px 3% 1px;
+  margin-top: 1%;
+  grid-row-gap: 10%; }
+#SR6WE .npc .tabs {
+  padding: 0px; }
 
 #SR6WE div.tabs {
   width: 100% !important; }
@@ -490,22 +493,22 @@ div.matrix-device .matrixFirewall {
       background-color: rgba(28, 28, 28, 0.14902) !important; }
   .pc input.display-flag {
     position: absolute !important; }
-  .pc div.border-box {
+  #SR6WE div.border-box {
     background-image: -moz-linear-gradient(#460141, transparent), -moz-linear-gradient(#460141, transparent) !important;
     background-image: -o-linear-gradient(#460141, transparent), -o-linear-gradient(#460141, transparent) !important;
     background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#460141), to(transparent)) !important;
     background-image: -webkit-linear-gradient(#460141, transparent) !important;
     background-image: linear-gradient(#460141, transparent), linear-gradient(#460141, transparent) !important;
-    border-top: 2px solid #460141 !important;
-    clear: both !important;
+    border-top: 2px solid #460141;
+    clear: both;
+    border-top-right-radius: 10px;
+    border-top-left-radius: 0px; }
+  #SR6WE div.border-box button[type='roll'] {
+    font-size: 0.8em;
+    font-weight: bold !important; }
+  #SR6WE div.border-box div.pc-box {
     border-top-right-radius: 10px !important;
     border-top-left-radius: 0px !important; }
-    .pc div.border-box button[type='roll'] {
-      font-size: 0.8em !important;
-      font-weight: bold !important; }
-    .pc div.border-box div.pc-box {
-      border-top-right-radius: 10px !important;
-      border-top-left-radius: 0px !important; }
   .pc div.repeating-container div.repitem {
     display: inline-grid !important;
     padding: 1% 0.5% !important;
@@ -1817,45 +1820,51 @@ h2[data-i18n='nuyen'], h3[data-i18n='nuyen'] {
   margin-top: 15px !important;
   vertical-align: top !important;
   width: 48% !important; }
-  .attr-col button[type='roll'] {
-    border-bottom: 1px solid #000 !important;
-    border-radius: 0px !important;
-    cursor: pointer !important;
-    font-size: 0.9em !important;
-    font-weight: bold !important;
-    margin-left: 0px !important;
-    padding-right: 2px !important;
-    text-align: right !important;
-    width: 30% !important; }
-  .attr-col button > span {
-    font-weight: bold !important; }
-  .attr-col input[type='number'] {
-    border-radius: 0px !important;
-    width: 23% !important;
-    font-weight: bold !important; }
-  .attr-col input[type='text'] {
-    width: 50% !important; }
-  .attr-col .totals {
-    padding: 0px 2px !important; }
-  .attr-col-left {
-    margin-left: -7% !important; }
-  .attr-col-right {
-    width: 50% !important; }
-    .attr-col-right button[type='roll'] {
-      margin-right: 0px !important;
-      width: 55% !important; }
-    .attr-col-right .attr-ini input[type='number'] {
-      width: 17% !important; }
-    .attr-col-right label {
-      border-bottom: 1px solid #000 !important;
-      font-size: 0.9em !important;
-      height: 22px !important;
-      text-align: right !important;
-      width: 55% !important; }
-    .attr-col-right .attr-und {
-      width: 38% !important; }
-   .attr-und input[name="attr_move_speed"], attr-und input[name="attr_sprint_speed"] {
-     width: 3em; !important; }
+.attr-col button[type='roll'], .npc .attribute button[type='roll'] {
+  border-bottom: 1px solid #000;
+  border-radius: 0px;
+  cursor: pointer;
+  font-size: 0.9em;
+  font-weight: bold;
+  margin-left: 0px;
+  padding-right: 2px;
+  text-align: right;
+  width: 30%; }
+.npc .attribute button[type='roll'] {
+  background-color: white;
+  font-size: 1em;
+  text-align: center;
+  width: unset; }
+.attr-col button > span {
+  font-weight: bold !important; }
+.attr-col input[type='number'] {
+  border-radius: 0px !important;
+  width: 23% !important;
+  font-weight: bold !important; }
+.attr-col input[type='text'] {
+  width: 50% !important; }
+.attr-col .totals {
+  padding: 0px 2px !important; }
+.attr-col-left {
+  margin-left: -7% !important; }
+.attr-col-right {
+  width: 50% !important; }
+.attr-col-right button[type='roll'] {
+  margin-right: 0px !important;
+  width: 55% !important; }
+.attr-col-right .attr-ini input[type='number'] {
+  width: 17% !important; }
+.attr-col-right label {
+  border-bottom: 1px solid #000 !important;
+  font-size: 0.9em !important;
+  height: 22px !important;
+  text-align: right !important;
+  width: 55% !important; }
+.attr-col-right .attr-und {
+  width: 38% !important; }
+.attr-und input[name="attr_move_speed"], attr-und input[name="attr_sprint_speed"] {
+  width: 3em; !important; }
+
 
 .settings-toggle:checked ~ .attr-col-right .attr-ini {
   width: 63% !important; }
@@ -2825,7 +2834,7 @@ span.d6 {
   border-bottom: 1px solid #fff;
   border-top: 1px solid #fff;
   grid-row-gap: 5%;
-  margin: 2% 0px;
+  margin: 0px;
   padding: 1% 1% 3% 1%;
   width: 100%; }
 .npc div.attribute input[type='number'] {
@@ -3034,19 +3043,27 @@ input.settings-toggle ~ .attr-lim div.settings,
 input.settings-toggle:checked ~ .attr-lim div.display,
 input.settings-toggle[value='settings'] ~ div.display,
 input.settings-toggle[value='display'] ~ div.settings,
-input.settings-toggle[value='display'] ~ div.settings-grid, input.settings-toggle[value='display'] ~ .settings, .hide-magic, .hide-resonance, div.weapon-range,
+input.settings-toggle[value='display'] ~ div.settings-grid, input.settings-toggle[value='display'] ~ .settings, .hide-magic, .hide-spirit, .hide-resonance, div.weapon-range,
 div.weapon-melee, .grunt, .host, .sprite, input[name='attr_sheet_type'][value='host'] ~ .npc .column:nth-of-type(2),
-input[name='attr_sheet_type'][value='sprite'] ~ .npc .column:nth-of-type(1n+2), input[name='attr_flag_special'][value='mundane'] ~ div.npc .hide-magic,
+input[name='attr_sheet_type'][value='sprite'] ~ .npc .column:nth-of-type(1n+2), input[name='attr_flag_special'][value='mundane'] ~ div.npc .hide-magic, input[name='attr_flag_special'][value='mundane'] ~ div.npc .hide-spirit,
 input[name='attr_flag_special'][value='mundane'] ~ div.npc .hide-resonance,
-input[name='attr_flag_special'][value='mundane'] ~ div.npc .grunt.hide-magic,
+input[name='attr_flag_special'][value='mundane'] ~ div.npc .grunt.hide-magic, input[name='attr_flag_special'][value='mundane'] ~ div.npc .grunt.hide-spirit,
 input[name='attr_flag_special'][value='mundane'] ~ div.npc .grunt.hide-resonance,
 input[name='attr_flag_special'][value='resonance'] ~ div.npc .hide-magic,
 input[name='attr_flag_special'][value='resonance'] ~ div.npc .grunt.hide-magic,
+input[name='attr_flag_special'][value='resonance'] ~ div.npc .hide-spirit,
+input[name='attr_flag_special'][value='resonance'] ~ div.npc .grunt.hide-spirit,
 input[name='attr_flag_special'][value='magic'] ~ div.npc .hide-resonance,
 input[name='attr_flag_special'][value='magic'] ~ div.npc .grunt.hide-resonance,
+input[name='attr_flag_special'][value='magic'] ~ div.npc .hide-spirit,
+input[name='attr_flag_special'][value='spirit'] ~ div.npc .hide-resonance,
+input[name='attr_flag_special'][value='spirit'] ~ div.npc .grunt.hide-resonance,
+input[name='attr_flag_special'][value='spirit'] ~ div.npc .hide-magic,
 input[name='attr_stats_toggle']:not([value='settings']) ~ div.attribute .settings.hide-magic,
+input[name='attr_stats_toggle']:not([value='settings']) ~ div.attribute .settings.hide-spirit,
 input[name='attr_stats_toggle']:not([value='settings']) ~ div.attribute .settings.hide-resonance,
 input[name='attr_stats_toggle']:not([value='settings']) ~ div.body .settings.hide-magic,
+input[name='attr_stats_toggle']:not([value='settings']) ~ div.body .settings.hide-spirit,
 input[name='attr_stats_toggle']:not([value='settings']) ~ div.body .settings.hide-resonance, input[name='attr_stats_toggle']:not([value='settings']) ~ div.body input[type='hidden'][value=''] + div.textrow, input[name='attr_stats_toggle']:not([value='settings']) ~ div.body input[type='hidden'][value=''] + div.rows.grunt, input[name='attr_display_specialization'][value=''] ~ button[name*='specialization'],
 input[name='attr_display_specialization'][value=' '] ~ button[name*='specialization'],
 input[name='attr_display_specialization'][value=''] ~ div.row-long div.buttons button[name*='specialization'],
@@ -3081,7 +3098,7 @@ input[name='attr_category']:not([value='Combat']) ~ label[data-i18n-title='dam']
 .display-flag:checked ~ .collapsable .desc-lifestyle, .optional-flag:not([value='0']) + .optional, .npc div.mid div.column, input[name='attr_sheet_type']:not([value='pc']) ~ .npc,
 input[name='attr_sheet_type'][value='pc'] ~ .pc, .options_toggle[value='arms'] ~ .arms, .options_toggle[value='augs'] ~ .augs, .options_toggle[value='core'] ~ .core, .options_toggle[value='gear'] ~ .gear, .options_toggle[value='options'] ~ .options, .options_toggle[value='social'] ~ .social, .options_toggle[value='magic'] ~ .magic, .options_toggle[value='matrix'] ~ .matrix, .options_toggle[value='vehicle'] ~ .vehicle, input[name='attr_stats_toggle'][value='settings'] ~ .attribute .settings,
 input[name='attr_stats_toggle'][value='settings'] ~ .body .column .settings,
-input[name='attr_stats_toggle'][value='settings'] ~ .body .textrow .settings, input.settings-toggle[value='settings'] ~ .settings, .character-type[value='magic'] ~ .pc .pc-row .attr-col .hide-magic, input[name='attr_flag_special'][value='magic'] ~ .npc .hide-magic, .character-type[value='resonance'] ~ .pc .pc-row .attr-col .hide-resonance, input[name='attr_flag_special'][value='resonance'] ~ .npc .hide-resonance, input.tab-switch[value='range'] ~ .weapon-range,
+input[name='attr_stats_toggle'][value='settings'] ~ .body .textrow .settings, input.settings-toggle[value='settings'] ~ .settings, .character-type[value='magic'] ~ .pc .pc-row .attr-col .hide-magic, input[name='attr_flag_special'][value='magic'] ~ .npc .hide-magic, input[name='attr_flag_special'][value='spirit'] ~ .npc .hide-spirit, .character-type[value='resonance'] ~ .pc .pc-row .attr-col .hide-resonance, input[name='attr_flag_special'][value='resonance'] ~ .npc .hide-resonance, input.tab-switch[value='range'] ~ .weapon-range,
 input.tab-switch[value='melee'] ~ .weapon-melee, input[name='attr_sheet_type'][value='grunt'] ~ .npc .rows.grunt,
 input[name='attr_sheet_type'][value='grunt'] ~ .npc .textrow.grunt, input[name='attr_sheet_type'][value='host'] ~ .npc .rows.host,
 input[name='attr_sheet_type'][value='host'] ~ .npc .textrow.host, input[name='attr_sheet_type'][value='sprite'] ~ .npc .rows.sprite,
diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.html b/Shadowrun Sixth World/Shadowrun6thEdition.html
index 9af35ebc7f..2edeaf5ad3 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.html	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.html	
@@ -2515,107 +2515,114 @@
 
 <!-- NPC SHEET -->
 <div class="npc">
-<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>
+  <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">
-    <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 class="tabs border-box">
+    <div class="pc-box">
+      <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="spirit" data-i18n="spirit">Spirit</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 pc-box">
+        <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>
   </div>
+
+  <div class="border-box">
+
   <input name="attr_stats_toggle" type="hidden" value="settings"/>
-  <div class="grunt attribute">
-    <button class="red" data-i18n="b" name="roll_body" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=^{body}}}{{base=^{base}}}{{dice=[[((@{body})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">b</button><span name="attr_display_body"></span>
+  <div class="grunt attribute pc-box">
+    <button data-i18n="body" name="roll_body" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{body}}}{{dice=[[((@{body})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">b</button><span name="attr_display_body"></span>
     <label class="settings" data-i18n-title="Body" title="Body">
       <input name="attr_body_base" placeholder="3" title="@{body_base}" type="number" value="3"/>
     </label>
     <label class="settings" data-i18n-title="modifier" title="modifier">
       <input name="attr_body_modifier" placeholder="+" title="@{body_modifier}" type="number" value=""/>
     </label>
-    <button data-i18n="a" name="roll_agility" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=^{agility}}}{{base=^{base}}}{{dice=[[((@{agility})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">a</button><span name="attr_display_agility"></span>
+    <button data-i18n="agility" name="roll_agility" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{agility}}}{{dice=[[((@{agility})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">a</button><span name="attr_display_agility"></span>
     <label class="settings" data-i18n-title="Agility" title="Agility">
       <input name="attr_agility_base" placeholder="3" title="@{agility_base}" type="number" value="3"/>
     </label>
     <label class="settings" data-i18n-title="modifier" title="modifier">
       <input name="attr_agility_modifier" placeholder="+" title="@{agility_modifier}" type="number" value=""/>
     </label>
-    <button data-i18n="r" name="roll_reaction" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=^{reaction}}}{{base=^{base}}}{{dice=[[((@{reaction})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">r</button><span name="attr_display_reaction"></span>
+    <button data-i18n="reaction" name="roll_reaction" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{reaction}}}{{dice=[[((@{reaction})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">r</button><span name="attr_display_reaction"></span>
     <label class="settings" data-i18n-title="Reaction" title="Reaction">
       <input name="attr_reaction_base" placeholder="3" title="@{reaction_base}" type="number" value="3"/>
     </label>
     <label class="settings" data-i18n-title="modifier" title="modifier">
       <input name="attr_reaction_modifier" placeholder="+" title="@{reaction_modifier}" type="number" value=""/>
     </label>
-    <button data-i18n="s" name="roll_strength" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=^{strength}}}{{base=^{base}}}{{dice=[[((@{strength})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">s</button><span name="attr_display_strength"></span>
+    <button data-i18n="strength" name="roll_strength" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{strength}}}{{dice=[[((@{strength})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">s</button><span name="attr_display_strength"></span>
     <label class="settings" data-i18n-title="Strength" title="Strength">
       <input name="attr_strength_base" placeholder="3" title="@{strength_base}" type="number" value="3"/>
     </label>
     <label class="settings" data-i18n-title="modifier" title="modifier">
       <input name="attr_strength_modifier" placeholder="+" title="@{strength_modifier}" type="number" value=""/>
     </label>
-    <button data-i18n="w" name="roll_willpower" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=^{willpower}}}{{base=^{base}}}{{dice=[[((@{willpower})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">w</button><span name="attr_display_willpower"></span>
+    <button data-i18n="willpower" name="roll_willpower" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{willpower}}}{{dice=[[((@{willpower})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">w</button><span name="attr_display_willpower"></span>
     <label class="settings" data-i18n-title="Willpower" title="Willpower">
       <input name="attr_willpower_base" placeholder="3" title="@{willpower_base}" type="number" value="3"/>
     </label>
     <label class="settings" data-i18n-title="modifier" title="modifier">
       <input name="attr_willpower_modifier" placeholder="+" title="@{willpower_modifier}" type="number" value=""/>
     </label>
-    <button data-i18n="l" name="roll_logic" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=^{logic}}}{{base=^{base}}}{{dice=[[((@{logic})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">l</button><span name="attr_display_logic"></span>
+    <button data-i18n="logic" name="roll_logic" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{logic}}}{{dice=[[((@{logic})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">l</button><span name="attr_display_logic"></span>
     <label class="settings" data-i18n-title="Logic" title="Logic">
       <input name="attr_logic_base" placeholder="3" title="@{logic_base}" type="number" value="3"/>
     </label>
     <label class="settings" data-i18n-title="modifier" title="modifier">
       <input name="attr_logic_modifier" placeholder="+" title="@{logic_modifier}" type="number" value=""/>
     </label>
-    <button data-i18n="i" name="roll_intuition" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=^{intuition}}}{{base=^{base}}}{{dice=[[((@{intuition})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">i</button><span name="attr_display_intuition"></span>
+    <button data-i18n="intuition" name="roll_intuition" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{intuition}}}{{dice=[[((@{intuition})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">i</button><span name="attr_display_intuition"></span>
     <label class="settings" data-i18n-title="Intuition" title="Intuition">
       <input name="attr_intuition_base" placeholder="3" title="@{intuition_base}" type="number" value="3"/>
     </label>
     <label class="settings" data-i18n-title="modifier" title="modifier">
       <input name="attr_intuition_modifier" placeholder="+" title="@{intuition_modifier}" type="number" value=""/>
     </label>
-    <button data-i18n="c" name="roll_charisma" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=^{charisma}}}{{base=^{base}}}{{dice=[[((@{charisma})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">c</button><span name="attr_display_charisma"></span>
+    <button data-i18n="charisma" name="roll_charisma" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{charisma}}}{{dice=[[((@{charisma})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">c</button><span name="attr_display_charisma"></span>
     <label class="settings" data-i18n-title="Charisma" title="Charisma">
       <input name="attr_charisma_base" placeholder="3" title="@{charisma_base}" type="number" value="3"/>
     </label>
     <label class="settings" data-i18n-title="modifier" title="modifier">
       <input name="attr_charisma_modifier" placeholder="+" title="@{charisma_modifier}" type="number" value=""/>
     </label>
-    <button data-i18n="e" name="roll_edge" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=^{edge}}}{{base=^{base}}}{{dice=[[((@{edge})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">e</button><span name="attr_edge"></span>
+    <button data-i18n="edge" name="roll_edge" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{edge}}}{{dice=[[((@{edge})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">e</button><span name="attr_edge"></span>
     <label class="settings" data-i18n-title="edge" title="edge">
       <input name="attr_edge" placeholder="3" title="@{edge}" type="number" value="3"/>
     </label>
@@ -2623,19 +2630,29 @@
     <label class="settings" data-i18n-title="essence" title="essence">
       <input name="attr_essence" placeholder="6" title="@{essence}" type="number" step='0.01' min='-6.00' max='6.00' value="6"/>
     </label>
-    <h1 class="hide-magic" data-i18n="m">m</h1><span class="hide-magic" name="attr_magic"></span>
-    <label class="settings hide-magic" data-i18n-title="magic" title="magic">
+
+    <h1 class="hide-magic" data-i18n="magic">m</h1><span class="hide-magic" name="attr_magic"></span>
+    <label class="hide-magic" data-i18n-title="magic" title="magic">
       <input name="attr_magic" placeholder="6" title="@{magic}" type="number" value="6"/>
     </label>
-    <h1 class="hide-magic" data-i18n="f">f</h1><span class="hide-magic" name="attr_force"></span>
-    <label class="settings hide-magic" data-i18n-title="force" title="force">
-      <input name="attr_force" placeholder="6" title="@{force}" type="number" value="6"/>
+
+    <h1 class="hide-spirit" data-i18n="magic">m</h1><span class="hide-spirit" name="attr_magic"></span>
+    <label class="hide-spirit" data-i18n-title="magic" title="magic">
+      <input name="attr_magic" placeholder="0" title="@{magic}" type="number" value="6"/>
     </label>
-    <h1 class="hide-resonance" data-i18n="r">r</h1><span class="hide-resonance" name="attr_resonance"></span>
+    <h1 class="hide-spirit" data-i18n="force">f</h1><span class="hide-spirit" name="attr_force"></span>
+    <label class="hide-spirit" data-i18n-title="force" title="force">
+      <input name="attr_force" placeholder="0" title="@{force}" type="number" value="6"/>
+    </label>
+
+    <h1 class="hide-resonance" data-i18n="resonance">r</h1><span class="hide-resonance" name="attr_resonance"></span>
     <label class="settings hide-resonance" data-i18n-title="resonance" title="resonance">
       <input name="attr_resonance" placeholder="6" title="@{resonance}" type="number" value="6"/>
     </label>
   </div>
+
+</div>
+
   <div class="host attribute">
     <button data-i18n="host_rating" name="roll_host_rating" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=^{host_rating}}}{{base=^{host_rating}}}{{dice=[[((@{host_rating}+@{host_rating})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}">host_rating</button><span name="attr_host_rating"></span>
     <label class="settings" data-i18n-title="host_rating" title="Host Rating">
@@ -2888,6 +2905,10 @@
           <input class="character-type" name="attr_flag_special" title="@{flag_special}" type="radio" value="magic"/>
           <h2 data-i18n="awakened">key</h2>
         </label>
+        <label class="settings" data-i18n-title="spirit" title="spirit">
+          <input class="character-type" name="attr_flag_special" title="@{flag_special}" type="radio" value="spirit"/>
+          <h2 data-i18n="spirit">key</h2>
+        </label>
         <label class="settings" data-i18n-title="emerged" title="emerged">
           <input class="character-type" name="attr_flag_special" title="@{flag_special}" type="radio" value="resonance"/>
           <h2 data-i18n="emerged">key</h2>