diff --git a/D6pp_Wild_West/d6pp.png b/D6pp_Wild_West/d6pp.png
new file mode 100644
index 0000000000..86686c4cbf
Binary files /dev/null and b/D6pp_Wild_West/d6pp.png differ
diff --git a/D6pp_Wild_West/d6ppww.css b/D6pp_Wild_West/d6ppww.css
index 3793de579e..fe271b69e9 100644
--- a/D6pp_Wild_West/d6ppww.css
+++ b/D6pp_Wild_West/d6ppww.css
@@ -1,4 +1,4 @@
-.sheet-wildwest-sheet {
+.sheet-d6pp-sheet {
   background-color: #deb887; /* Burly Wood */
   padding: 20px;              /* Adds space inside the edges */
   border: 4px solid #8B4513;  /* Optional: dark brown border */
@@ -7,7 +7,7 @@
   margin: 10px;
 }
 
-.sheet-wildwest-sheet p {
+.sheet-d6pp-sheet p {
   font-family: 'Georgia', serif;
   color: #3B2F2F;
   font-size: 1.1em;
@@ -321,14 +321,14 @@ input[name="attr_reaction_fixit_active"][value="1"]
   white-space: normal;
 }
 
-.wildwest-checkbox {
+.d6pp-checkbox {
   display: inline-flex;
   align-items: center;
   margin-left: 10px; /* Adjust spacing as needed */
   font-weight: bold;
 }
 
-.wildwest-checkbox input {
+.d6pp-checkbox input {
   margin-right: 5px;
 }
 
@@ -385,8 +385,8 @@ input[type="radio"][name="attr_attack_mode_q"][value="melee"]:checked ~ .sheet-m
   letter-spacing: 0.2em;
 }
 
-button[type="action"].sheet-wildwest,
-button[type="roll"].sheet-wildwest,
+button[type="action"].sheet-d6pp,
+button[type="roll"].sheet-d6pp,
 button[type="action"].roll-skill-button,
 button[type="action"].undo-activate-skill-button,
 button[type="action"].activate-skill-button,
@@ -407,8 +407,8 @@ button[type="action"] {
   transition: all 0.2s ease-in-out;
 }
 
-button[type="action"].sheet-wildwest:hover,
-button[type="roll"].sheet-wildwest:hover,
+button[type="action"].sheet-d6pp:hover,
+button[type="roll"].sheet-d6pp:hover,
 button[type="action"].activate-skill-button:hover,
 button[type="action"].undo-activate-skill-button:hover,
 button[type="action"].roll-skill-button:hover,
@@ -435,7 +435,7 @@ button[type="action"].commit-spend-mode:hover {
   gap: 6px;
 }
 
-textarea.sheet-wildwest {
+textarea.sheet-d6pp {
   resize: vertical;
   width: 100%;
   line-height: 1.4;
@@ -447,8 +447,8 @@ textarea.sheet-wildwest {
   min-height: calc(1.4em * 10 + 8px); /* Matches 10 rows */
 }
 
-input.sheet-wildwest,
-textarea.sheet-wildwest {
+input.sheet-d6pp,
+textarea.sheet-d6pp {
   /* shared Wild West style */
   background-color: #f5f0e6;
   border: 2px solid #8B4513;
@@ -460,7 +460,7 @@ textarea.sheet-wildwest {
   text-align: left;
 }
 
-.sheet-wildwest-label {
+.sheet-d6pp-label {
   font-weight: bold;
   font-size: 1.2em;  /* Match actual label size */
   color: #3B2F2F;
@@ -573,7 +573,7 @@ textarea.sheet-wildwest {
 }
 
 .sheet-character-desc-grid textarea[readonly],
-input.sheet-wildwest[readonly] {
+input.sheet-d6pp[readonly] {
   background-color: #c2b195;
   color: #222;
   border: 2px solid #8B4513;
@@ -649,7 +649,7 @@ select[name="attr_simple_action_selection"] {
 }
 
 
-.wildwest-checkbox input[type="checkbox"] {
+.d6pp-checkbox input[type="checkbox"] {
   accent-color: #8B4513; /* Ensures checkbox matches theme in supported browsers */
   transform: scale(1.2);
 }
@@ -713,13 +713,26 @@ input[type="radio"].sheet-tab {
   border: 1px solid #8B4513;
 }
 
-.wildwest-span {
+.d6pp-span {
   font-size: 1.1em;
   color: #3B2F2F;
   margin-right: 4px;
   white-space: nowrap;
 }
 
+.sheet-d6pp-select {
+  background-color: #f5f0e6;
+  border: 2px solid #8B4513;
+  border-radius: 6px;
+  padding: 4px 6px;
+  font-size: 14px;
+  color: #3B2F2F;
+  box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.3);
+  text-align: left;
+  max-width: 100%;
+  box-sizing: border-box;
+}
+
 input[name="attr_spend_mode"][value="1"] ~ .hide-when-spending {
   display: none;
 }
@@ -841,10 +854,10 @@ input[name="attr_character_type"][value="major_npc"] ~ .show-if-not-npc {
   display: block;
 }
 
-input[name="attr_character_type"][value="quick_npc"] ~ .sheet-wildwest-sheet,
-input[name="attr_character_type"][value="major_npc"] ~ .sheet-wildwest-sheet,
-input[name="attr_character_type"][value="npc"] ~ .sheet-wildwest-sheet,
-input[name="attr_character_type"][value="beast"] ~ .sheet-wildwest-sheet {
+input[name="attr_character_type"][value="quick_npc"] ~ .sheet-d6pp-sheet,
+input[name="attr_character_type"][value="major_npc"] ~ .sheet-d6pp-sheet,
+input[name="attr_character_type"][value="npc"] ~ .sheet-d6pp-sheet,
+input[name="attr_character_type"][value="beast"] ~ .sheet-d6pp-sheet {
   background-color: #d0d0d0;
 }
 
@@ -1012,7 +1025,7 @@ input[name="attr_character_type"][value="beast"] ~ .sheet-wildwest-sheet {
   display: block;
 }
 
-.wildwest-item {
+.d6pp-item {
   font-family: 'Georgia', serif;
   background-color: #fdf6e3;
   border: 2px solid #8B4513;
@@ -1040,7 +1053,7 @@ input[name="attr_character_type"][value="beast"] ~ .sheet-wildwest-sheet {
   color: #2e1c0b;
 }
 
-.skill-group-content textarea.sheet-wildwest {
+.skill-group-content textarea.sheet-d6pp {
   width: 100%;
   box-sizing: border-box;
   margin: 0;
@@ -1055,3 +1068,232 @@ input[name="attr_preaction_selection_ignorepain"][value="Dodge"] ~ .sheet-dodge-
 input[name="attr_preaction_selection_disengage"][value="Dodge"] ~ .sheet-dodge-toggle {
   display: inline-block;
 }
+
+/***** Grid Tables *****/
+
+.sheet-grid-table {
+  display: grid;
+  width: 500px;
+  grid-auto-rows: auto;
+  box-sizing: border-box;
+}
+
+.sheet-grid-table.full-width {
+  width: 100%;
+}
+
+/* Column count variants */
+.sheet-grid-table.two-col   { grid-template-columns: repeat(2, 1fr); }
+.sheet-grid-table.three-col { grid-template-columns: repeat(3, 1fr); }
+.sheet-grid-table.four-col  { grid-template-columns: repeat(4, 1fr); }
+.sheet-grid-table.five-col  { grid-template-columns: repeat(5, 1fr); }
+.sheet-grid-table.six-col   { grid-template-columns: repeat(6, 1fr); }
+.sheet-grid-table.seven-col { grid-template-columns: repeat(7, 1fr); }
+.sheet-grid-table.eight-col { grid-template-columns: repeat(8, 1fr); }
+
+/* All cells */
+.sheet-grid-table .grid-header,
+.sheet-grid-table .grid-cell {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  padding: 6px 8px;
+  font-size: 1.0em;
+  text-align: center;
+  box-sizing: border-box;
+
+  /* Only top and left borders to prevent doubling */
+  border-top: 1px solid #8B4513;
+  border-left: 1px solid #8B4513;
+  border-bottom: 0px;
+  border-right: 0px;
+}
+
+/* Header styling */
+.sheet-grid-table .grid-header {
+  background-color: #d2b48c;
+  font-weight: bold;
+  color: #4b2e0f;
+}
+
+/* Body cell background */
+.sheet-grid-table .grid-cell {
+  background-color: #f5f0e6;
+}
+
+/* Add bottom border to last row */
+.sheet-grid-table.two-col   > *:nth-last-child(-n+2),
+.sheet-grid-table.three-col > *:nth-last-child(-n+3),
+.sheet-grid-table.four-col  > *:nth-last-child(-n+4),
+.sheet-grid-table.five-col  > *:nth-last-child(-n+5),
+.sheet-grid-table.six-col   > *:nth-last-child(-n+6),
+.sheet-grid-table.seven-col > *:nth-last-child(-n+7),
+.sheet-grid-table.eight-col > *:nth-last-child(-n+8) {
+  border-bottom: 1px solid #8B4513;
+}
+
+/* Add right border to the last column of every row */
+.sheet-grid-table.two-col   > *:nth-child(2n),
+.sheet-grid-table.three-col > *:nth-child(3n),
+.sheet-grid-table.four-col  > *:nth-child(4n),
+.sheet-grid-table.five-col  > *:nth-child(5n),
+.sheet-grid-table.six-col   > *:nth-child(6n),
+.sheet-grid-table.seven-col > *:nth-child(7n),
+.sheet-grid-table.eight-col > *:nth-child(8n) {
+  border-right: 1px solid #8B4513;
+}
+
+/***** FIREARM TABLE *****/
+
+/* === Base Attack Grid Styling === */
+.sheet-grid-attack {
+  display: grid;
+  width: 500px; /* default */
+  grid-auto-rows: auto;
+  box-sizing: border-box;
+}
+
+.sheet-grid-attack.full-width {
+  width: 100%;
+}
+
+.sheet-grid-table .target-number-cell {
+  font-weight: bold;
+  font-size: 2em;
+  color: #3B2F2F;
+}
+
+.sheet-grid-attack > div {
+  border: 1px solid #8B4513;
+  padding: 6px 8px;
+  font-size: 1em;
+  font-family: 'Georgia', serif;
+  text-align: center;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-sizing: border-box;
+}
+
+.sheet-grid-attack .grid-header {
+  background-color: #d2b48c;
+  color: #4b2e0f;
+  font-weight: bold;
+}
+
+.sheet-grid-attack .grid-cell,
+.sheet-grid-attack .grid-header {
+  border-top: 1px solid #8B4513;
+  border-left: 1px solid #8B4513;
+  border-bottom: 0;
+  border-right: 0;
+}
+
+.sheet-grid-attack select {
+  width: 100%;
+  font-size: 14px;
+}
+
+.sheet-grid-attack button {
+  font-size: 1.1em;
+  margin: 0;
+  padding: 4px 8px;
+}
+
+.stack-tight {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 4px;
+}
+
+.stack-weapon {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 4px;
+  text-align: center;
+}
+
+.weapon-skill {
+  font-style: italic;
+  font-size: 0.9em;
+  color: #444;
+  font-family: Georgia, serif;
+  line-height: 1.2em;
+}
+
+.weapon-skill .small-hint {
+  display: inline;
+}
+
+.ammo-button-row {
+  display: flex;
+  flex-direction: row;
+  gap: 4px;
+}
+
+.grid-cell.ammo-display {
+  display: flex;              /* Ensure flex container */
+  justify-content: flex-start; /* Align contents to left */
+  align-items: center;         /* Vertically center if desired */
+  text-align: left;
+  padding-left: 4px;
+  font-size: 1.5em;
+}
+
+/* === Specific Grid Column Layouts === */
+.sheet-grid-firearms {
+  grid-template-columns:
+    2fr   /* Weapon */
+    1fr   /* Dice */
+    1fr   /* Damage */
+    1.2fr /* Ammo */
+    1fr   /* Short */
+    1fr   /* Medium */
+    1fr   /* Long */
+    1fr;  /* Extreme */
+}
+
+.sheet-grid-ranged {
+  grid-template-columns:
+    2fr   /* Weapon */
+    1fr   /* Dice */
+    1fr   /* Damage */
+    1fr   /* Short */
+    1fr   /* Medium */
+    1fr   /* Long */
+    1fr;  /* Extreme */
+}
+
+.sheet-grid-melee {
+  grid-template-columns:
+    2fr   /* Weapon */
+    1fr   /* Dice */
+    1fr;  /* Damage */
+}
+
+/* Add bottom border to last row when grid is melee or ranged */
+/*.sheet-grid-attack.sheet-grid-firearms > *:nth-last-child(-n+8),*/
+.sheet-grid-attack.sheet-grid-melee > *:nth-last-child(-n+3),
+.sheet-grid-attack.sheet-grid-ranged > *:nth-last-child(-n+7) {
+  border-bottom: 1px solid #8B4513;
+}
+
+/* Add right border to the last column of every row when grid is melee or ranged */
+.sheet-grid-attack.sheet-grid-firearms > *:nth-child(8n),
+.sheet-grid-attack.sheet-grid-melee > *:nth-child(3n),
+.sheet-grid-attack.sheet-grid-ranged > *:nth-child(7n) {
+  border-right: 1px solid #8B4513;
+}
+
+.sheet-grid-attack.sheet-grid-firearms > .full-row {
+  grid-column: span 8;
+  border-right: 1px solid #8B4513;
+}
+
+.sheet-grid-attack.sheet-grid-firearms > .last-row {
+  grid-column: span 8;
+  border-bottom: 1px solid #8B4513;
+}
diff --git a/D6pp_Wild_West/d6ppww.html b/D6pp_Wild_West/d6ppww.html
index fa57b4c016..034725dbb4 100644
--- a/D6pp_Wild_West/d6ppww.html
+++ b/D6pp_Wild_West/d6ppww.html
@@ -1,5 +1,5 @@
 <input type="hidden" name="attr_character_type" value="pc" />
-<div class="sheet-wildwest-sheet">
+<div class="sheet-d6pp-sheet">
   <input type="hidden" name="attr_defaults_set" value="0" />
 
   <input type="hidden" name="attr_strength_string" />
@@ -443,6 +443,14 @@
   <input type="hidden" name="attr_forging_active" />
   <input type="hidden" name="attr_forging_displayname" value="Forging" />
 
+  <input type="hidden" name="attr_scavenging_attributes" />
+  <input type="hidden" name="attr_scavenging_specialized" value="" />
+  <input type="hidden" name="attr_scavenging_rollcode" />
+  <input type="hidden" name="attr_scavenging_string" />
+  <input type="hidden" name="attr_scavenging_skillgroup" />
+  <input type="hidden" name="attr_scavenging_active" />
+  <input type="hidden" name="attr_scavenging_displayname" value="Scavenging" />
+
   <input type="hidden" name="attr_cooking_attributes" />
   <input type="hidden" name="attr_cooking_specialized" value="" />
   <input type="hidden" name="attr_cooking_rollcode" />
@@ -923,7 +931,7 @@
   <div class="sheet-step sheet-step-type sheet-mode-type">
     <h1>Choose Character Type</h1>
     <div class="spacer-md"></div>
-    <button type="action" name="act_type_continue" class="sheet-wildwest type-continue-button">Continue</button>
+    <button type="action" name="act_type_continue" class="sheet-d6pp type-continue-button">Continue</button>
     <div class="spacer-md"></div>
     <label><input type="radio" class="sheet-tab" name="attr_character_type" value="pc" checked /> Player Character</label>
     <p>The heroes of the story. Fully customizable with access to all attributes, skills, gear, and abilities.</p>
@@ -936,9 +944,6 @@
     <div class="spacer-md"></div>
     <label><input type="radio" class="sheet-tab" name="attr_character_type" value="quick_npc" /> Quick NPC [GM Only]</label>
     <p>Background characters or disposable extras. Fast to build and play with 2D in all attributes and skills.</p>
-    <div class="spacer-md"></div>
-    <label><input type="radio" class="sheet-tab" name="attr_character_type" value="beast" /> Beast - temp</label>
-    <p>Non-humans. Focused on instinctual behavior and combat ability.</p>
   </div> <!-- End Character Type Selection -->
 
   <!-- Background Selection -->
@@ -946,11 +951,11 @@
     <h2>Choose a background and "Continue"</h2>
     <div class="final-button-wrapper">
       <input type="checkbox" name="attr_ready_to_advance_background" class="training-ready-toggle" value="1" style="display: none;" />
-      <button type="action" name="act_next_step" class="sheet-wildwest next-step-button">Continue</button>
+      <button type="action" name="act_next_step" class="sheet-d6pp next-step-button">Continue</button>
     </div>
     <div class="spacer-md"></div>
     <h3>Choose a Background</h3>
-    <select name="attr_background_choice" class="background-select sheet-wildwest-select" id="background_choice">
+    <select name="attr_background_choice" class="background-select sheet-d6pp-select" id="background_choice">
       <option value="">-- Select --</option>
       <option value="Army Medic">Army Medic</option>
       <option value="Bounty Hunter">Bounty Hunter</option>
@@ -989,12 +994,12 @@
       <option value="Thief">Thief</option>
     </select>
     <div class="sheet-character-desc-grid">
-      <textarea name="attr_background_combined" class="sheet-wildwest" rows="4" readonly></textarea>
+      <textarea name="attr_background_combined" class="sheet-d6pp" rows="4" readonly></textarea>
     </div>
     <label>Starting Equipment:</label>
     <div class="sheet-character-desc-grid">
-      <textarea name="attr_background_items1" class="sheet-wildwest textarea-tall" readonly rows="10"></textarea>
-      <textarea name="attr_background_items2" class="sheet-wildwest textarea-tall" readonly rows="10"></textarea>
+      <textarea name="attr_background_items1" class="sheet-d6pp textarea-tall" readonly rows="10"></textarea>
+      <textarea name="attr_background_items2" class="sheet-d6pp textarea-tall" readonly rows="10"></textarea>
     </div>
   </div> <!-- End Background Selection -->
 
@@ -1015,116 +1020,95 @@
 
     <div class="finish-button-wrapper">
       <input type="checkbox" name="attr_ready_to_advance_training" class="sheet-ready-toggle" value="1" style="display: none;" />
-      <button type="action" name="act_final_step" class="sheet-wildwest final-step-button">Finish</button>
+      <button type="action" name="act_final_step" class="sheet-d6pp final-step-button">Finish</button>
     </div>
 
     <div class="spacer-md"></div>
 
     <h2>Weight (lbs)</h2>
-    <input type="text" class="sheet-wildwest" name="attr_character_weight" placeholder="Your horse carries your weight."/><br/>
+    <input type="text" class="sheet-d6pp" name="attr_character_weight" placeholder="Your horse carries your weight."/><br/>
     <div class="spacer-sm"></div>
-    <span name="attr_recommended_weight" class="sheet-wildwest-span"></span>
+    <span name="attr_recommended_weight" class="sheet-d6pp-span"></span>
     <div class="spacer-sm"></div>
     <h2><span name="attr_background_name"></span>:</h2>
     <div class="sheet-character-desc-grid">
-      <textarea name="attr_background_combined" class="sheet-wildwest" rows="4" readonly></textarea>
+      <textarea name="attr_background_combined" class="sheet-d6pp" rows="4" readonly></textarea>
     </div>
     <h2>Attributes</h2>
-    <table class="sheet-attributes table-equal-width">
-      <thead>
-        <tr>
-          <th class="number-cell">Attribute</th>
-          <th class="number-cell">Base</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td class="number-cell">(S)trength</td>
-          <td class="number-cell"><input type="number" class="sheet-wildwest" name="attr_strength" min="1" max="5" value="1" /></td>
-        </tr>
-        <tr>
-          <td class="number-cell">(A)gility</td>
-          <td class="number-cell"><input type="number" class="sheet-wildwest" name="attr_agility" min="1" max="5" value="1" /></td>
-        </tr>
-        <tr>
-          <td class="number-cell">(H)ealth</td>
-          <td class="number-cell"><input type="number" class="sheet-wildwest" name="attr_health" min="1" max="5" value="1" /></td>
-        </tr>
-        <tr>
-          <td class="number-cell">(P)erception</td>
-          <td class="number-cell"><input type="number" class="sheet-wildwest" name="attr_perception" min="1" max="5" value="1" /></td>
-        </tr>
-        <tr>
-          <td class="number-cell">(Q)uickness</td>
-          <td class="number-cell"><input type="number" class="sheet-wildwest" name="attr_quickness" min="1" max="5" value="1" /></td>
-        </tr>
-        <tr>
-          <td class="number-cell">(W)illpower</td>
-          <td class="number-cell"><input type="number" class="sheet-wildwest" name="attr_willpower" min="1" max="5" value="1" /></td>
-        </tr>
-        <tr>
-          <td class="number-cell">(I)ntelligence</td>
-          <td class="number-cell"><input type="number" class="sheet-wildwest" name="attr_intelligence" min="1" max="5" value="1" /></td>
-        </tr>
-        <tr>
-          <td class="number-cell">(M)anual Dex</td>
-          <td class="number-cell"><input type="number" class="sheet-wildwest" name="attr_manualdex" min="1" max="5" value="1" /></td>
-        </tr>
-        <tr>
-          <td class="number-cell">(C)harisma</td>
-          <td class="number-cell"><input type="number" class="sheet-wildwest" name="attr_charisma" min="1" max="5" value="1" /></td>
-        </tr>
-        <tr>
-          <td class="number-cell"><strong>Total Assigned</strong></td>
-          <td class="number-cell"><span name="attr_attribute_total"></span> / 27</td>
-        </tr>
-      </tbody>
-    </table>
+    <div class="sheet-grid-table two-col">
+      <div class="grid-header">Attribute</div>
+      <div class="grid-header">Base</div>
+
+      <div class="grid-cell">(S)trength</div>
+      <div class="grid-cell"><input type="number" class="sheet-d6pp" name="attr_strength" min="1" max="5" value="1" /></div>
+
+      <div class="grid-cell">(A)gility</div>
+      <div class="grid-cell"><input type="number" class="sheet-d6pp" name="attr_agility" min="1" max="5" value="1" /></div>
+
+      <div class="grid-cell">(H)ealth</div>
+      <div class="grid-cell"><input type="number" class="sheet-d6pp" name="attr_health" min="1" max="5" value="1" /></div>
+
+      <div class="grid-cell">(P)erception</div>
+      <div class="grid-cell"><input type="number" class="sheet-d6pp" name="attr_perception" min="1" max="5" value="1" /></div>
+
+      <div class="grid-cell">(Q)uickness</div>
+      <div class="grid-cell"><input type="number" class="sheet-d6pp" name="attr_quickness" min="1" max="5" value="1" /></div>
+
+      <div class="grid-cell">(W)illpower</div>
+      <div class="grid-cell"><input type="number" class="sheet-d6pp" name="attr_willpower" min="1" max="5" value="1" /></div>
+
+      <div class="grid-cell">(I)ntelligence</div>
+      <div class="grid-cell"><input type="number" class="sheet-d6pp" name="attr_intelligence" min="1" max="5" value="1" /></div>
+
+      <div class="grid-cell">(M)anual Dex</div>
+      <div class="grid-cell"><input type="number" class="sheet-d6pp" name="attr_manualdex" min="1" max="5" value="1" /></div>
+
+      <div class="grid-cell">(C)harisma</div>
+      <div class="grid-cell"><input type="number" class="sheet-d6pp" name="attr_charisma" min="1" max="5" value="1" /></div>
+
+      <div class="grid-cell grid-total"><strong>Total Assigned</strong></div>
+      <div class="grid-cell grid-total"><span name="attr_attribute_total">0</span> / 27</div>
+    </div>
     <div class="spacer-md"></div>
     <div class="show-if-not-npc">
-      <button type="action" class="sheet-wildwest" name="act_expand_all">Expand All</button>
-      <button type="action" class="sheet-wildwest" name="act_collapse_all">Collapse All</button>
+      <button type="action" class="sheet-d6pp" name="act_expand_all">Expand All</button>
+      <button type="action" class="sheet-d6pp" name="act_collapse_all">Collapse All</button>
       <div class="spacer-md"></div>
       <div class="skill-section-collapsible">
         <input type="checkbox" class="skill-toggle" id="toggle_core_training" name="attr_toggle_core_training" value="1" checked hidden />
         <label class="skill-toggle-label" for="toggle_core_training">Core Skill Group (can't be trained)</label>
         <div class="skill-group-content">
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th>Skill</th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_avoid_displayname"></span><span name="attr_avoid_specialized"></span></td>
-                <td class="number-cell"><span name="attr_avoid_attributes"></span></td>
-                <td class="number-cell"><span name="attr_avoid_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_dodge_displayname"></span><span name="attr_dodge_specialized"></span></td>
-                <td class="number-cell"><span name="attr_dodge_attributes"></span></td>
-                <td class="number-cell"><span name="attr_dodge_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_endure_displayname"></span><span name="attr_endure_specialized"></span></td>
-                <td class="number-cell"><span name="attr_endure_attributes"></span></td>
-                <td class="number-cell"><span name="attr_endure_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_initiative_displayname"></span><span name="attr_initiative_specialized"></span></td>
-                <td class="number-cell"><span name="attr_initiative_attributes"></span></td>
-                <td class="number-cell"><span name="attr_initiative_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <!-- Header Row -->
+            <div class="grid-header">Skill</div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header"></div>
+
+            <!-- Row 1 -->
+            <div class="grid-cell"><span name="attr_avoid_displayname"></span><span name="attr_avoid_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_avoid_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_avoid_string"></span></div>
+            <div class="grid-cell">Activated</div>
+
+            <!-- Row 2 -->
+            <div class="grid-cell"><span name="attr_dodge_displayname"></span><span name="attr_dodge_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_dodge_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_dodge_string"></span></div>
+            <div class="grid-cell">Activated</div>
+
+            <!-- Row 3 -->
+            <div class="grid-cell"><span name="attr_endure_displayname"></span><span name="attr_endure_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_endure_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_endure_string"></span></div>
+            <div class="grid-cell">Activated</div>
+
+            <!-- Row 4 -->
+            <div class="grid-cell"><span name="attr_initiative_displayname"></span><span name="attr_initiative_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_initiative_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_initiative_string"></span></div>
+            <div class="grid-cell">Activated</div>
+          </div>
         </div>
       </div>
       <h2>Trainable Skill Groups</h2>
@@ -1147,42 +1131,32 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_empathy_displayname"></span><span name="attr_empathy_specialized"></span></td>
-                <td class="number-cell"><span name="attr_empathy_attributes"></span></td>
-                <td class="number-cell"><span name="attr_empathy_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_insight_displayname"></span><span name="attr_insight_specialized"></span></td>
-                <td class="number-cell"><span name="attr_insight_attributes"></span></td>
-                <td class="number-cell"><span name="attr_insight_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_investigate_displayname"></span><span name="attr_investigate_specialized"></span></td>
-                <td class="number-cell"><span name="attr_investigate_attributes"></span></td>
-                <td class="number-cell"><span name="attr_investigate_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_search_displayname"></span><span name="attr_search_specialized"></span></td>
-                <td class="number-cell"><span name="attr_search_attributes"></span></td>
-                <td class="number-cell"><span name="attr_search_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header"></div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header"></div>
+
+            <div class="grid-cell"><span name="attr_empathy_displayname"></span><span name="attr_empathy_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_empathy_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_empathy_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_insight_displayname"></span><span name="attr_insight_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_insight_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_insight_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_investigate_displayname"></span><span name="attr_investigate_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_investigate_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_investigate_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_search_displayname"></span><span name="attr_search_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_search_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_search_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+          </div>
         </div>
       </div>
 
@@ -1202,30 +1176,22 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_drive_boat_displayname"></span><span name="attr_drive_boat_specialized"></span></td>
-                <td class="number-cell"><span name="attr_drive_boat_attributes"></span></td>
-                <td class="number-cell"><span name="attr_drive_boat_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_sailing_displayname"></span><span name="attr_sailing_specialized"></span></td>
-                <td class="number-cell"><span name="attr_sailing_attributes"></span></td>
-                <td class="number-cell"><span name="attr_sailing_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header"></div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header"></div>
+
+            <div class="grid-cell"><span name="attr_drive_boat_displayname"></span><span name="attr_drive_boat_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_drive_boat_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_drive_boat_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_sailing_displayname"></span><span name="attr_sailing_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_sailing_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_sailing_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+          </div>
         </div>
       </div>
 
@@ -1245,42 +1211,32 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_cattle_care_displayname"></span><span name="attr_cattle_care_specialized"></span></td>
-                <td class="number-cell"><span name="attr_cattle_care_attributes"></span></td>
-                <td class="number-cell"><span name="attr_cattle_care_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_cattle_empathy_displayname"></span><span name="attr_cattle_empathy_specialized"></span></td>
-                <td class="number-cell"><span name="attr_cattle_empathy_attributes"></span></td>
-                <td class="number-cell"><span name="attr_cattle_empathy_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_cattle_handling_displayname"></span><span name="attr_cattle_handling_specialized"></span></td>
-                <td class="number-cell"><span name="attr_cattle_handling_attributes"></span></td>
-                <td class="number-cell"><span name="attr_cattle_handling_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_roping_displayname"></span><span name="attr_roping_specialized"></span></td>
-                <td class="number-cell"><span name="attr_roping_attributes"></span></td>
-                <td class="number-cell"><span name="attr_roping_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header"></div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header"></div>
+
+            <div class="grid-cell"><span name="attr_cattle_care_displayname"></span><span name="attr_cattle_care_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_cattle_care_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_cattle_care_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_cattle_empathy_displayname"></span><span name="attr_cattle_empathy_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_cattle_empathy_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_cattle_empathy_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_cattle_handling_displayname"></span><span name="attr_cattle_handling_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_cattle_handling_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_cattle_handling_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_roping_displayname"></span><span name="attr_roping_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_roping_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_roping_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+          </div>
         </div>
       </div>
 
@@ -1300,42 +1256,32 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_drive_cart_displayname"></span><span name="attr_drive_cart_specialized"></span></td>
-                <td class="number-cell"><span name="attr_drive_cart_attributes"></span></td>
-                <td class="number-cell"><span name="attr_drive_cart_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_horse_care_displayname"></span><span name="attr_horse_care_specialized"></span></td>
-                <td class="number-cell"><span name="attr_horse_care_attributes"></span></td>
-                <td class="number-cell"><span name="attr_horse_care_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_horse_empathy_displayname"></span><span name="attr_horse_empathy_specialized"></span></td>
-                <td class="number-cell"><span name="attr_horse_empathy_attributes"></span></td>
-                <td class="number-cell"><span name="attr_horse_empathy_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_riding_displayname"></span><span name="attr_riding_specialized"></span></td>
-                <td class="number-cell"><span name="attr_riding_attributes"></span></td>
-                <td class="number-cell"><span name="attr_riding_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header"></div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header"></div>
+
+            <div class="grid-cell"><span name="attr_drive_cart_displayname"></span><span name="attr_drive_cart_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_drive_cart_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_drive_cart_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_horse_care_displayname"></span><span name="attr_horse_care_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_horse_care_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_horse_care_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_horse_empathy_displayname"></span><span name="attr_horse_empathy_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_horse_empathy_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_horse_empathy_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_riding_displayname"></span><span name="attr_riding_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_riding_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_riding_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+          </div>
         </div>
       </div>
 
@@ -1355,70 +1301,56 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_appraisal_displayname"></span><span name="attr_appraisal_specialized"></span></td>
-                <td class="number-cell"><span name="attr_appraisal_attributes"></span></td>
-                <td class="number-cell"><span name="attr_appraisal_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_cartography_displayname"></span><span name="attr_cartography_specialized"></span></td>
-                <td class="number-cell"><span name="attr_cartography_attributes"></span></td>
-                <td class="number-cell"><span name="attr_cartography_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_education_displayname"></span><span name="attr_education_specialized"></span></td>
-                <td class="number-cell"><span name="attr_education_attributes"></span></td>
-                <td class="number-cell"><span name="attr_education_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_engineering_displayname"></span><span name="attr_engineering_specialized"></span></td>
-                <td class="number-cell"><span name="attr_engineering_attributes"></span></td>
-                <td class="number-cell"><span name="attr_engineering_string"></span></td>
-                <td>
-                  <input type="hidden" name="attr_engineering_active" value="2" />
-                  <div class="skill-roll-buttons">
-                    <button type="action" name="act_activate_engineering" class="activate-skill-button">Activate</button>
-                    <button type="action" name="act_undo_activate_engineering" class="undo-activate-skill-button">Undo Activate</button>
-                    <span class="activated-label">Activated</span>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_law_displayname"></span><span name="attr_law_specialized"></span></td>
-                <td class="number-cell"><span name="attr_law_attributes"></span></td>
-                <td class="number-cell"><span name="attr_law_string"></span></td>
-                <td>
-                  <input type="hidden" name="attr_law_active" value="2" />
-                  <div class="skill-roll-buttons">
-                    <div class="skill-roll-buttons">
-                      <button type="action" name="act_activate_law" class="activate-skill-button">Activate</button>
-                      <button type="action" name="act_undo_activate_law" class="undo-activate-skill-button">Undo Activate</button>
-                      <span class="activated-label">Activated</span>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_writing_displayname"></span><span name="attr_writing_specialized"></span></td>
-                <td class="number-cell"><span name="attr_writing_attributes"></span></td>
-                <td class="number-cell"><span name="attr_writing_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header"></div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header"></div>
+
+            <div class="grid-cell"><span name="attr_appraisal_displayname"></span><span name="attr_appraisal_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_appraisal_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_appraisal_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_cartography_displayname"></span><span name="attr_cartography_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_cartography_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_cartography_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_education_displayname"></span><span name="attr_education_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_education_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_education_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_engineering_displayname"></span><span name="attr_engineering_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_engineering_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_engineering_string"></span></div>
+            <div class="grid-cell">
+              <input type="hidden" name="attr_engineering_active" value="2" />
+              <div class="skill-roll-buttons">
+                <button type="action" name="act_activate_engineering" class="activate-skill-button">Activate</button>
+                <button type="action" name="act_undo_activate_engineering" class="undo-activate-skill-button">Undo Activate</button>
+                <span class="activated-label">Activated</span>
+              </div>
+            </div>
+
+            <div class="grid-cell"><span name="attr_law_displayname"></span><span name="attr_law_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_law_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_law_string"></span></div>
+            <div class="grid-cell">
+              <input type="hidden" name="attr_law_active" value="2" />
+              <div class="skill-roll-buttons">
+                <button type="action" name="act_activate_law" class="activate-skill-button">Activate</button>
+                <button type="action" name="act_undo_activate_law" class="undo-activate-skill-button">Undo Activate</button>
+                <span class="activated-label">Activated</span>
+              </div>
+            </div>
+
+            <div class="grid-cell"><span name="attr_writing_displayname"></span><span name="attr_writing_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_writing_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_writing_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+          </div>
           <span class="small-hint">Activating Law or Engineering costs 12 skill points.</span>
         </div>
       </div>
@@ -1439,43 +1371,34 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_first_aid_displayname"></span><span name="attr_first_aid_specialized"></span></td>
-                <td class="number-cell"><span name="attr_first_aid_attributes"></span></td>
-                <td class="number-cell"><span name="attr_first_aid_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_medical_care_displayname"></span><span name="attr_medical_care_specialized"></span></td>
-                <td class="number-cell"><span name="attr_medical_care_attributes"></span></td>
-                <td class="number-cell"><span name="attr_medical_care_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_surgery_displayname"></span><span name="attr_surgery_specialized"></span></td>
-                <td class="number-cell"><span name="attr_surgery_attributes"></span></td>
-                <td class="number-cell"><span name="attr_surgery_string"></span></td>
-                <td>
-                  <input type="hidden" name="attr_surgery_active" value="2" />
-                  <div class="skill-roll-buttons">
-                    <button type="action" name="act_activate_surgery" class="activate-skill-button">Activate</button>
-                    <button type="action" name="act_undo_activate_surgery" class="undo-activate-skill-button">Undo Activate</button>
-                    <span class="activated-label">Activated</span>
-                  </div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header"></div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header"></div>
+
+            <div class="grid-cell"><span name="attr_first_aid_displayname"></span><span name="attr_first_aid_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_first_aid_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_first_aid_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_medical_care_displayname"></span><span name="attr_medical_care_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_medical_care_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_medical_care_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_surgery_displayname"></span><span name="attr_surgery_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_surgery_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_surgery_string"></span></div>
+            <div class="grid-cell">
+              <input type="hidden" name="attr_surgery_active" value="2" />
+              <div class="skill-roll-buttons">
+                <button type="action" name="act_activate_surgery" class="activate-skill-button">Activate</button>
+                <button type="action" name="act_undo_activate_surgery" class="undo-activate-skill-button">Undo Activate</button>
+                <span class="activated-label">Activated</span>
+              </div>
+            </div>
+          </div>
           <span class="small-hint">Activating Surgery costs 12 skill points.</span>
         </div>
       </div>
@@ -1496,72 +1419,57 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_acting_displayname"></span><span name="attr_acting_specialized"></span></td>
-                <td class="number-cell"><span name="attr_acting_attributes"></span></td>
-                <td class="number-cell"><span name="attr_acting_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_art_displayname"></span><span name="attr_art_specialized"></span></td>
-                <td class="number-cell"><span name="attr_art_attributes"></span></td>
-                <td class="number-cell"><span name="attr_art_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_comedy_displayname"></span><span name="attr_comedy_specialized"></span></td>
-                <td class="number-cell"><span name="attr_comedy_attributes"></span></td>
-                <td class="number-cell"><span name="attr_comedy_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_dance_displayname"></span><span name="attr_dance_specialized"></span></td>
-                <td class="number-cell"><span name="attr_dance_attributes"></span></td>
-                <td class="number-cell"><span name="attr_dance_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_disguise_displayname"></span><span name="attr_disguise_specialized"></span></td>
-                <td class="number-cell"><span name="attr_disguise_attributes"></span></td>
-                <td class="number-cell"><span name="attr_disguise_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_gambling_displayname"></span><span name="attr_gambling_specialized"></span></td>
-                <td class="number-cell"><span name="attr_gambling_attributes"></span></td>
-                <td class="number-cell"><span name="attr_gambling_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_play_instrument_displayname"></span><span name="attr_play_instrument_specialized"></span></td>
-                <td class="number-cell"><span name="attr_play_instrument_attributes"></span></td>
-                <td class="number-cell"><span name="attr_play_instrument_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_showmanship_displayname"></span><span name="attr_showmanship_specialized"></span></td>
-                <td class="number-cell"><span name="attr_showmanship_attributes"></span></td>
-                <td class="number-cell"><span name="attr_showmanship_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_sing_displayname"></span><span name="attr_sing_specialized"></span></td>
-                <td class="number-cell"><span name="attr_sing_attributes"></span></td>
-                <td class="number-cell"><span name="attr_sing_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header"></div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header"></div>
+
+            <div class="grid-cell"><span name="attr_acting_displayname"></span><span name="attr_acting_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_acting_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_acting_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_art_displayname"></span><span name="attr_art_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_art_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_art_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_comedy_displayname"></span><span name="attr_comedy_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_comedy_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_comedy_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_dance_displayname"></span><span name="attr_dance_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_dance_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_dance_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_disguise_displayname"></span><span name="attr_disguise_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_disguise_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_disguise_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_gambling_displayname"></span><span name="attr_gambling_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_gambling_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_gambling_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_play_instrument_displayname"></span><span name="attr_play_instrument_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_play_instrument_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_play_instrument_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_showmanship_displayname"></span><span name="attr_showmanship_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_showmanship_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_showmanship_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_sing_displayname"></span><span name="attr_sing_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_sing_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_sing_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+          </div>
         </div>
       </div>
 
@@ -1580,54 +1488,42 @@
               </div>
               <div class="spacer-sm"></div>
             </div>
-            <table class="sheet-attributes table-equal-width">
-              <thead>
-                <tr>
-                  <th>Skill</th>
-                  <th>Attr Code</th>
-                  <th>Dice Code</th>
-                  <th>Roll</th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <td class="number-cell"><span name="attr_acrobatics_displayname"></span><span name="attr_acrobatics_specialized"></span></td>
-                  <td class="number-cell"><span name="attr_acrobatics_attributes"></span></td>
-                  <td class="number-cell"><span name="attr_acrobatics_string"></span></td>
-                  <td><span>Activated</span></td>
-                </tr>
-                <tr>
-                  <td class="number-cell"><span name="attr_athletics_displayname"></span><span name="attr_athletics_specialized"></span></td>
-                  <td class="number-cell"><span name="attr_athletics_attributes"></span></td>
-                  <td class="number-cell"><span name="attr_athletics_string"></span></td>
-                  <td><span>Activated</span></td>
-                </tr>
-                <tr>
-                  <td class="number-cell"><span name="attr_climbing_displayname"></span><span name="attr_climbing_specialized"></span></td>
-                  <td class="number-cell"><span name="attr_climbing_attributes"></span></td>
-                  <td class="number-cell"><span name="attr_climbing_string"></span></td>
-                  <td><span>Activated</span></td>
-                </tr>
-                <tr>
-                  <td class="number-cell"><span name="attr_jumping_displayname"></span><span name="attr_jumping_specialized"></span></td>
-                  <td class="number-cell"><span name="attr_jumping_attributes"></span></td>
-                  <td class="number-cell"><span name="attr_jumping_string"></span></td>
-                  <td><span>Activated</span></td>
-                </tr>
-                <tr>
-                  <td class="number-cell"><span name="attr_lifting_displayname"></span><span name="attr_lifting_specialized"></span></td>
-                  <td class="number-cell"><span name="attr_lifting_attributes"></span></td>
-                  <td class="number-cell"><span name="attr_lifting_string"></span></td>
-                  <td><span>Activated</span></td>
-                </tr>
-                <tr>
-                  <td class="number-cell"><span name="attr_swimming_displayname"></span><span name="attr_swimming_specialized"></span></td>
-                  <td class="number-cell"><span name="attr_swimming_attributes"></span></td>
-                  <td class="number-cell"><span name="attr_swimming_string"></span></td>
-                  <td><span>Activated</span></td>
-                </tr>
-              </tbody>
-            </table>
+            <div class="sheet-grid-table four-col">
+              <div class="grid-header">Skill</div>
+              <div class="grid-header">Attr Code</div>
+              <div class="grid-header">Dice Code</div>
+              <div class="grid-header">Roll</div>
+
+              <div class="grid-cell"><span name="attr_acrobatics_displayname"></span><span name="attr_acrobatics_specialized"></span></div>
+              <div class="grid-cell"><span name="attr_acrobatics_attributes"></span></div>
+              <div class="grid-cell"><span name="attr_acrobatics_string"></span></div>
+              <div class="grid-cell"><span>Activated</span></div>
+
+              <div class="grid-cell"><span name="attr_athletics_displayname"></span><span name="attr_athletics_specialized"></span></div>
+              <div class="grid-cell"><span name="attr_athletics_attributes"></span></div>
+              <div class="grid-cell"><span name="attr_athletics_string"></span></div>
+              <div class="grid-cell"><span>Activated</span></div>
+
+              <div class="grid-cell"><span name="attr_climbing_displayname"></span><span name="attr_climbing_specialized"></span></div>
+              <div class="grid-cell"><span name="attr_climbing_attributes"></span></div>
+              <div class="grid-cell"><span name="attr_climbing_string"></span></div>
+              <div class="grid-cell"><span>Activated</span></div>
+
+              <div class="grid-cell"><span name="attr_jumping_displayname"></span><span name="attr_jumping_specialized"></span></div>
+              <div class="grid-cell"><span name="attr_jumping_attributes"></span></div>
+              <div class="grid-cell"><span name="attr_jumping_string"></span></div>
+              <div class="grid-cell"><span>Activated</span></div>
+
+              <div class="grid-cell"><span name="attr_lifting_displayname"></span><span name="attr_lifting_specialized"></span></div>
+              <div class="grid-cell"><span name="attr_lifting_attributes"></span></div>
+              <div class="grid-cell"><span name="attr_lifting_string"></span></div>
+              <div class="grid-cell"><span>Activated</span></div>
+
+              <div class="grid-cell"><span name="attr_swimming_displayname"></span><span name="attr_swimming_specialized"></span></div>
+              <div class="grid-cell"><span name="attr_swimming_attributes"></span></div>
+              <div class="grid-cell"><span name="attr_swimming_string"></span></div>
+              <div class="grid-cell"><span>Activated</span></div>
+            </div>
           </div>
         </div>
       </div>
@@ -1648,54 +1544,42 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_persuade_displayname"></span><span name="attr_persuade_specialized"></span></td>
-                <td class="number-cell"><span name="attr_persuade_attributes"></span></td>
-                <td class="number-cell"><span name="attr_persuade_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_intimidate_displayname"></span><span name="attr_intimidate_specialized"></span></td>
-                <td class="number-cell"><span name="attr_intimidate_attributes"></span></td>
-                <td class="number-cell"><span name="attr_intimidate_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_deceive_displayname"></span><span name="attr_deceive_specialized"></span></td>
-                <td class="number-cell"><span name="attr_deceive_attributes"></span></td>
-                <td class="number-cell"><span name="attr_deceive_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_negotiate_displayname"></span><span name="attr_negotiate_specialized"></span></td>
-                <td class="number-cell"><span name="attr_negotiate_attributes"></span></td>
-                <td class="number-cell"><span name="attr_negotiate_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_seduce_displayname"></span><span name="attr_seduce_specialized"></span></td>
-                <td class="number-cell"><span name="attr_seduce_attributes"></span></td>
-                <td class="number-cell"><span name="attr_seduce_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_streetwise_displayname"></span><span name="attr_streetwise_specialized"></span></td>
-                <td class="number-cell"><span name="attr_streetwise_attributes"></span></td>
-                <td class="number-cell"><span name="attr_streetwise_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header">Skill</div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header">Roll</div>
+
+            <div class="grid-cell"><span name="attr_persuade_displayname"></span><span name="attr_persuade_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_persuade_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_persuade_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_intimidate_displayname"></span><span name="attr_intimidate_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_intimidate_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_intimidate_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_deceive_displayname"></span><span name="attr_deceive_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_deceive_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_deceive_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_negotiate_displayname"></span><span name="attr_negotiate_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_negotiate_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_negotiate_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_seduce_displayname"></span><span name="attr_seduce_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_seduce_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_seduce_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_streetwise_displayname"></span><span name="attr_streetwise_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_streetwise_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_streetwise_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+          </div>
         </div>
       </div>
 
@@ -1715,42 +1599,32 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_ambush_displayname"></span><span name="attr_ambush_specialized"></span></td>
-                <td class="number-cell"><span name="attr_ambush_attributes"></span></td>
-                <td class="number-cell"><span name="attr_ambush_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_hide_displayname"></span><span name="attr_hide_specialized"></span></td>
-                <td class="number-cell"><span name="attr_hide_attributes"></span></td>
-                <td class="number-cell"><span name="attr_hide_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_sneak_displayname"></span><span name="attr_sneak_specialized"></span></td>
-                <td class="number-cell"><span name="attr_sneak_attributes"></span></td>
-                <td class="number-cell"><span name="attr_sneak_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_subtle_displayname"></span><span name="attr_subtle_specialized"></span></td>
-                <td class="number-cell"><span name="attr_subtle_attributes"></span></td>
-                <td class="number-cell"><span name="attr_subtle_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header">Skill</div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header">Roll</div>
+
+            <div class="grid-cell"><span name="attr_ambush_displayname"></span><span name="attr_ambush_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_ambush_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_ambush_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_hide_displayname"></span><span name="attr_hide_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_hide_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_hide_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_sneak_displayname"></span><span name="attr_sneak_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_sneak_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_sneak_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_subtle_displayname"></span><span name="attr_subtle_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_subtle_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_subtle_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+          </div>
         </div>
       </div>
 
@@ -1770,48 +1644,42 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_cooking_displayname"></span><span name="attr_cooking_specialized"></span></td>
-                <td class="number-cell"><span name="attr_cooking_attributes"></span></td>
-                <td class="number-cell"><span name="attr_cooking_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_fletching_displayname"></span><span name="attr_fletching_specialized"></span></td>
-                <td class="number-cell"><span name="attr_fletching_attributes"></span></td>
-                <td class="number-cell"><span name="attr_fletching_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_forging_displayname"></span><span name="attr_forging_specialized"></span></td>
-                <td class="number-cell"><span name="attr_forging_attributes"></span></td>
-                <td class="number-cell"><span name="attr_forging_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_hunting_displayname"></span><span name="attr_hunting_specialized"></span></td>
-                <td class="number-cell"><span name="attr_hunting_attributes"></span></td>
-                <td class="number-cell"><span name="attr_hunting_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_tracking_displayname"></span><span name="attr_tracking_specialized"></span></td>
-                <td class="number-cell"><span name="attr_tracking_attributes"></span></td>
-                <td class="number-cell"><span name="attr_tracking_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header">Skill</div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header">Roll</div>
+
+            <div class="grid-cell"><span name="attr_cooking_displayname"></span><span name="attr_cooking_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_cooking_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_cooking_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_fletching_displayname"></span><span name="attr_fletching_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_fletching_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_fletching_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_forging_displayname"></span><span name="attr_forging_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_forging_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_forging_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_hunting_displayname"></span><span name="attr_hunting_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_hunting_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_hunting_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_scavenging_displayname"></span><span name="attr_scavenging_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_scavenging_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_scavenging_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_tracking_displayname"></span><span name="attr_tracking_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_tracking_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_tracking_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+          </div>
         </div>
       </div>
 
@@ -1831,54 +1699,42 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_blacksmithing_displayname"></span><span name="attr_blacksmithing_specialized"></span></td>
-                <td class="number-cell"><span name="attr_blacksmithing_attributes"></span></td>
-                <td class="number-cell"><span name="attr_blacksmithing_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_carpentry_displayname"></span><span name="attr_carpentry_specialized"></span></td>
-                <td class="number-cell"><span name="attr_carpentry_attributes"></span></td>
-                <td class="number-cell"><span name="attr_carpentry_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_disarm_explosives_displayname"></span><span name="attr_disarm_explosives_specialized"></span></td>
-                <td class="number-cell"><span name="attr_disarm_explosives_attributes"></span></td>
-                <td class="number-cell"><span name="attr_disarm_explosives_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_gunsmithing_displayname"></span><span name="attr_gunsmithing_specialized"></span></td>
-                <td class="number-cell"><span name="attr_gunsmithing_attributes"></span></td>
-                <td class="number-cell"><span name="attr_gunsmithing_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_mining_displayname"></span><span name="attr_mining_specialized"></span></td>
-                <td class="number-cell"><span name="attr_mining_attributes"></span></td>
-                <td class="number-cell"><span name="attr_mining_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_set_explosives_displayname"></span><span name="attr_set_explosives_specialized"></span></td>
-                <td class="number-cell"><span name="attr_set_explosives_attributes"></span></td>
-                <td class="number-cell"><span name="attr_set_explosives_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header">Skill</div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header">Roll</div>
+
+            <div class="grid-cell"><span name="attr_blacksmithing_displayname"></span><span name="attr_blacksmithing_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_blacksmithing_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_blacksmithing_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_carpentry_displayname"></span><span name="attr_carpentry_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_carpentry_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_carpentry_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_disarm_explosives_displayname"></span><span name="attr_disarm_explosives_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_disarm_explosives_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_disarm_explosives_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_gunsmithing_displayname"></span><span name="attr_gunsmithing_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_gunsmithing_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_gunsmithing_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_mining_displayname"></span><span name="attr_mining_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_mining_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_mining_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_set_explosives_displayname"></span><span name="attr_set_explosives_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_set_explosives_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_set_explosives_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+          </div>
         </div>
       </div>
 
@@ -1898,42 +1754,32 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_cheating_displayname"></span><span name="attr_cheating_specialized"></span></td>
-                <td class="number-cell"><span name="attr_cheating_attributes"></span></td>
-                <td class="number-cell"><span name="attr_cheating_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_forgery_displayname"></span><span name="attr_forgery_specialized"></span></td>
-                <td class="number-cell"><span name="attr_forgery_attributes"></span></td>
-                <td class="number-cell"><span name="attr_forgery_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_lockpicking_displayname"></span><span name="attr_lockpicking_specialized"></span></td>
-                <td class="number-cell"><span name="attr_lockpicking_attributes"></span></td>
-                <td class="number-cell"><span name="attr_lockpicking_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_sleight_of_hand_displayname"></span><span name="attr_sleight_of_hand_specialized"></span></td>
-                <td class="number-cell"><span name="attr_sleight_of_hand_attributes"></span></td>
-                <td class="number-cell"><span name="attr_sleight_of_hand_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header">Skill</div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header">Roll</div>
+
+            <div class="grid-cell"><span name="attr_cheating_displayname"></span><span name="attr_cheating_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_cheating_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_cheating_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_forgery_displayname"></span><span name="attr_forgery_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_forgery_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_forgery_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_lockpicking_displayname"></span><span name="attr_lockpicking_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_lockpicking_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_lockpicking_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_sleight_of_hand_displayname"></span><span name="attr_sleight_of_hand_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_sleight_of_hand_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_sleight_of_hand_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+          </div>
         </div>
       </div>
 
@@ -1956,30 +1802,22 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_improvised_weapon_displayname"></span><span name="attr_improvised_weapon_specialized"></span></td>
-                <td class="number-cell"><span name="attr_improvised_weapon_attributes"></span></td>
-                <td class="number-cell"><span name="attr_improvised_weapon_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_melee_weapon_displayname"></span><span name="attr_melee_weapon_specialized"></span></td>
-                <td class="number-cell"><span name="attr_melee_weapon_attributes"></span></td>
-                <td class="number-cell"><span name="attr_melee_weapon_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header">Skill</div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header">Roll</div>
+
+            <div class="grid-cell"><span name="attr_improvised_weapon_displayname"></span><span name="attr_improvised_weapon_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_improvised_weapon_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_improvised_weapon_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_melee_weapon_displayname"></span><span name="attr_melee_weapon_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_melee_weapon_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_melee_weapon_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+          </div>
         </div>
       </div>
 
@@ -1999,30 +1837,22 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_rifle_displayname"></span><span name="attr_rifle_specialized"></span></td>
-                <td class="number-cell"><span name="attr_rifle_attributes"></span></td>
-                <td class="number-cell"><span name="attr_rifle_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_shotgun_displayname"></span><span name="attr_shotgun_specialized"></span></td>
-                <td class="number-cell"><span name="attr_shotgun_attributes"></span></td>
-                <td class="number-cell"><span name="attr_shotgun_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header">Skill</div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header">Roll</div>
+
+            <div class="grid-cell"><span name="attr_rifle_displayname"></span><span name="attr_rifle_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_rifle_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_rifle_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_shotgun_displayname"></span><span name="attr_shotgun_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_shotgun_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_shotgun_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+          </div>
         </div>
       </div>
 
@@ -2042,43 +1872,34 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_bow_displayname"></span><span name="attr_bow_specialized"></span></td>
-                <td class="number-cell"><span name="attr_bow_attributes"></span></td>
-                <td class="number-cell"><span name="attr_bow_string"></span></td>
-                <td>
-                  <input type="hidden" name="attr_bow_active" value="2" />
-                  <div class="skill-roll-buttons">
-                    <button type="action" name="act_activate_bow" class="activate-skill-button">Activate</button>
-                    <button type="action" name="act_undo_activate_bow" class="undo-activate-skill-button">Undo Activate</button>
-                    <span class="activated-label">Activated</span>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_slingshot_displayname"></span><span name="attr_slingshot_specialized"></span></td>
-                <td class="number-cell"><span name="attr_slingshot_attributes"></span></td>
-                <td class="number-cell"><span name="attr_slingshot_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_thrown_displayname"></span><span name="attr_thrown_specialized"></span></td>
-                <td class="number-cell"><span name="attr_thrown_attributes"></span></td>
-                <td class="number-cell"><span name="attr_thrown_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header">Skill</div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header">Roll</div>
+
+            <div class="grid-cell"><span name="attr_bow_displayname"></span><span name="attr_bow_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_bow_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_bow_string"></span></div>
+            <div class="grid-cell">
+              <input type="hidden" name="attr_bow_active" value="2" />
+              <div class="skill-roll-buttons">
+                <button type="action" name="act_activate_bow" class="activate-skill-button">Activate</button>
+                <button type="action" name="act_undo_activate_bow" class="undo-activate-skill-button">Undo Activate</button>
+                <span class="activated-label">Activated</span>
+              </div>
+            </div>
+
+            <div class="grid-cell"><span name="attr_slingshot_displayname"></span><span name="attr_slingshot_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_slingshot_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_slingshot_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_thrown_displayname"></span><span name="attr_thrown_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_thrown_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_thrown_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+          </div>
           <span class="small-hint">Activating Bow costs 12 skill points.</span>
         </div>
       </div>
@@ -2099,30 +1920,22 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_pistol_displayname"></span><span name="attr_pistol_specialized"></span></td>
-                <td class="number-cell"><span name="attr_pistol_attributes"></span></td>
-                <td class="number-cell"><span name="attr_pistol_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_sawed_off_shotgun_displayname"></span><span name="attr_sawed_off_shotgun_specialized"></span></td>
-                <td class="number-cell"><span name="attr_sawed_off_shotgun_attributes"></span></td>
-                <td class="number-cell"><span name="attr_sawed_off_shotgun_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header">Skill</div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header">Roll</div>
+
+            <div class="grid-cell"><span name="attr_pistol_displayname"></span><span name="attr_pistol_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_pistol_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_pistol_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_sawed_off_shotgun_displayname"></span><span name="attr_sawed_off_shotgun_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_sawed_off_shotgun_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_sawed_off_shotgun_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+          </div>
         </div>
       </div>
 
@@ -2142,49 +1955,39 @@
             </div>
             <div class="spacer-sm"></div>
           </div>
-          <table class="sheet-attributes table-equal-width">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Attr Code</th>
-                <th>Dice Code</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="number-cell"><span name="attr_brawling_displayname"></span><span name="attr_brawling_specialized"></span></td>
-                <td class="number-cell"><span name="attr_brawling_attributes"></span></td>
-                <td class="number-cell"><span name="attr_brawling_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_martial_arts_displayname"></span><span name="attr_martial_arts_specialized"></span></td>
-                <td class="number-cell"><span name="attr_martial_arts_attributes"></span></td>
-                <td class="number-cell"><span name="attr_martial_arts_string"></span></td>
-                <td>
-                  <input type="hidden" name="attr_martial_arts_active" value="2" />
-                  <div class="skill-roll-buttons">
-                    <button type="action" name="act_activate_martial_arts" class="activate-skill-button">Activate</button>
-                    <button type="action" name="act_undo_activate_martial_arts" class="undo-activate-skill-button">Undo Activate</button>
-                    <span class="activated-label">Activated</span>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_push_displayname"></span><span name="attr_push_specialized"></span></td>
-                <td class="number-cell"><span name="attr_push_attributes"></span></td>
-                <td class="number-cell"><span name="attr_push_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-              <tr>
-                <td class="number-cell"><span name="attr_wrestling_displayname"></span><span name="attr_wrestling_specialized"></span></td>
-                <td class="number-cell"><span name="attr_wrestling_attributes"></span></td>
-                <td class="number-cell"><span name="attr_wrestling_string"></span></td>
-                <td><span>Activated</span></td>
-              </tr>
-            </tbody>
-          </table>
+          <div class="sheet-grid-table four-col">
+            <div class="grid-header">Skill</div>
+            <div class="grid-header">Attr Code</div>
+            <div class="grid-header">Dice Code</div>
+            <div class="grid-header">Roll</div>
+
+            <div class="grid-cell"><span name="attr_brawling_displayname"></span><span name="attr_brawling_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_brawling_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_brawling_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_martial_arts_displayname"></span><span name="attr_martial_arts_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_martial_arts_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_martial_arts_string"></span></div>
+            <div class="grid-cell">
+              <input type="hidden" name="attr_martial_arts_active" value="2" />
+              <div class="skill-roll-buttons">
+                <button type="action" name="act_activate_martial_arts" class="activate-skill-button">Activate</button>
+                <button type="action" name="act_undo_activate_martial_arts" class="undo-activate-skill-button">Undo Activate</button>
+                <span class="activated-label">Activated</span>
+              </div>
+            </div>
+
+            <div class="grid-cell"><span name="attr_push_displayname"></span><span name="attr_push_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_push_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_push_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+
+            <div class="grid-cell"><span name="attr_wrestling_displayname"></span><span name="attr_wrestling_specialized"></span></div>
+            <div class="grid-cell"><span name="attr_wrestling_attributes"></span></div>
+            <div class="grid-cell"><span name="attr_wrestling_string"></span></div>
+            <div class="grid-cell"><span>Activated</span></div>
+          </div>
           <span class="small-hint">Activating Martial Arts costs 12 skill points.</span>
         </div>
       </div>
@@ -2202,14 +2005,14 @@
           <div class="sheet-controls-row">
             <!-- Left: Expand/Collapse -->
             <div class="sheet-controls-group">
-              <button type="action" class="sheet-wildwest" name="act_expand_all">Expand All</button>
-              <button type="action" class="sheet-wildwest" name="act_collapse_all">Collapse All</button>
+              <button type="action" class="sheet-d6pp" name="act_expand_all">Expand All</button>
+              <button type="action" class="sheet-d6pp" name="act_collapse_all">Collapse All</button>
             </div>
 
             <!-- Middle: Skill Points + Spend -->
             <div class="sheet-controls-group">
-              <label for="attr_skill_points" class="sheet-wildwest-label">Skill Points:</label>
-              <input type="number" class="sheet-wildwest" name="attr_skill_points" value="1" id="attr_skill_points" />
+              <label for="attr_skill_points" class="sheet-d6pp-label">Skill Points:</label>
+              <input type="number" class="sheet-d6pp" name="attr_skill_points" value="1" id="attr_skill_points" />
               <div class="sheet-spendblock">
                 <input type="hidden" name="attr_spend_mode" value="0" />
                 <div class="spend-mode">
@@ -2221,7 +2024,7 @@
 
             <!-- Right: View Inventory -->
             <div class="sheet-controls-group">
-              <button type="action" class="sheet-wildwest" name="act_view_inventory">View Inventory</button>
+              <button type="action" class="sheet-d6pp" name="act_view_inventory">View Inventory</button>
             </div>
           </div>
 
@@ -2233,41 +2036,41 @@
               <label class="skill-toggle-label" for="toggle_details">Character Details</label>
               <div class="skill-group-content">
                 <div class="sheet-character-top-grid">
-                  <label class="sheet-wildwest-label">Name:</label>
-                  <input type="text" class="sheet-wildwest" name="attr_character_name" />
-                  <label class="sheet-wildwest-label">Age:</label>
-                  <input type="text" class="sheet-wildwest" name="attr_character_age" />
-                  <label class="sheet-wildwest-label">Height:</label>
-                  <input type="text" class="sheet-wildwest" name="attr_character_height" />
-                  <label class="sheet-wildwest-label">Weight:</label>
-                  <input type="text" class="sheet-wildwest" name="attr_character_weight" />
-                  <label class="sheet-wildwest-label">Gender:</label>
-                  <input type="text" class="sheet-wildwest" name="attr_character_gender" />
+                  <label class="sheet-d6pp-label">Name:</label>
+                  <input type="text" class="sheet-d6pp" name="attr_character_name" />
+                  <label class="sheet-d6pp-label">Age:</label>
+                  <input type="text" class="sheet-d6pp" name="attr_character_age" />
+                  <label class="sheet-d6pp-label">Height:</label>
+                  <input type="text" class="sheet-d6pp" name="attr_character_height" />
+                  <label class="sheet-d6pp-label">Weight:</label>
+                  <input type="text" class="sheet-d6pp" name="attr_character_weight" />
+                  <label class="sheet-d6pp-label">Gender:</label>
+                  <input type="text" class="sheet-d6pp" name="attr_character_gender" />
                 </div>
 
                 <!-- Background and Description -->
                 <div class="sheet-character-desc-grid">
-                  <label for="attr_background_combined" class="sheet-wildwest-label"><span name="attr_background_name"></span>:</label>
-                  <label for="character_description" class="sheet-wildwest-label">Description:</label>
-                  <textarea name="attr_background_combined" id="attr_background_combined" class="sheet-wildwest" rows="4" readonly></textarea>
-                  <textarea class="sheet-wildwest" name="attr_character_description" rows="4" id="character_description"></textarea>
+                  <label for="attr_background_combined" class="sheet-d6pp-label"><span name="attr_background_name"></span>:</label>
+                  <label for="character_description" class="sheet-d6pp-label">Description:</label>
+                  <textarea name="attr_background_combined" id="attr_background_combined" class="sheet-d6pp" rows="4" readonly></textarea>
+                  <textarea class="sheet-d6pp" name="attr_character_description" rows="4" id="character_description"></textarea>
                 </div>
                 <div class="spacer-sm"></div>
                 <!-- GM Whisper + Move/Run/Advantage Row -->
                 <div class="sheet-controls-row" style="justify-content: space-between;">
-                  <div class="wildwest-checkbox">
+                  <div class="d6pp-checkbox">
                     <label class="inline-checkbox-label">
                       <input type="checkbox" name="attr_whisper_toggle" value="/w gm " />
                       Whisper to GM
                     </label>
                   </div>
                   <div style="display: flex; align-items: center; gap: 8px;">
-                    <label class="sheet-wildwest-label">Move:</label>
-                    <input type="text" class="sheet-wildwest sheet-small-input" name="attr_current_move" readonly />
-                    <label class="sheet-wildwest-label">Run:</label>
-                    <input type="text" class="sheet-wildwest sheet-small-input" name="attr_current_run" readonly />
-                    <label class="sheet-wildwest-label">Advantage:</label>
-                    <input type="number" class="sheet-wildwest" name="attr_advantage" />
+                    <label class="sheet-d6pp-label">Move:</label>
+                    <input type="text" class="sheet-d6pp sheet-small-input" name="attr_current_move" readonly />
+                    <label class="sheet-d6pp-label">Run:</label>
+                    <input type="text" class="sheet-d6pp sheet-small-input" name="attr_current_run" readonly />
+                    <label class="sheet-d6pp-label">Advantage:</label>
+                    <input type="number" class="sheet-d6pp" name="attr_advantage" />
                   </div>
                 </div>
               </div>
@@ -2289,11 +2092,11 @@
                   <div class="action-grid-header">On Your Turn</div>
                   <!-- Row 2: Pre-Action / Significant Action -->
                   <div>
-                    <label class="sheet-wildwest-label">Pre-Action (start of round)</label>
+                    <label class="sheet-d6pp-label">Pre-Action (start of round)</label>
                     <div class="inline-action-row">
                       <input type="hidden" name="attr_preaction_ignorepain_active" value="0" />
                       <input type="hidden" name="attr_preaction_disengage_active" value="0" />
-                      <select class="preaction-normal sheet-wildwest-select" name="attr_preaction_selection_normal">
+                      <select class="preaction-normal sheet-d6pp-select" name="attr_preaction_selection_normal">
                         <option value="None">None</option>
                         <option value="Hold Actions">Hold Actions</option>
                         <option value="Haste Actions">Haste Actions</option>
@@ -2308,7 +2111,7 @@
                         <option value="Break Grapple">Break Grapple</option>
                         <option value="Break Lassoed">Break Lassoed</option>
                       </select>
-                      <select class="preaction-ignorepain sheet-wildwest-select" name="attr_preaction_selection_ignorepain">
+                      <select class="preaction-ignorepain sheet-d6pp-select" name="attr_preaction_selection_ignorepain">
                         <option value="None">None</option>
                         <option value="Hold Actions">Hold Actions</option>
                         <option value="Haste Actions">Haste Actions</option>
@@ -2324,7 +2127,7 @@
                         <option value="Break Lassoed">Break Lassoed</option>
                         <option value="Ignore Pain">Ignore Pain</option>
                       </select>
-                      <select class="preaction-disengage sheet-wildwest-select" name="attr_preaction_selection_disengage">
+                      <select class="preaction-disengage sheet-d6pp-select" name="attr_preaction_selection_disengage">
                         <option value="None">None</option>
                         <option value="Hold Actions">Hold Actions</option>
                         <option value="Haste Actions">Haste Actions</option>
@@ -2344,9 +2147,9 @@
                     </div>
                   </div>
                   <div>
-                    <label class="sheet-wildwest-label">Significant Action</label>
+                    <label class="sheet-d6pp-label">Significant Action</label>
                     <div class="inline-action-row">
-                      <select class="sheet-wildwest-select" name="attr_significant_action_selection">
+                      <select class="sheet-d6pp-select" name="attr_significant_action_selection">
                         <option value="None">None</option>
                         <option value="Attack">Attack</option>
                         <option value="Skill Check">Make a Skill Check</option>
@@ -2360,12 +2163,12 @@
                   </div>
                   <!-- Row 3: Reaction / Simple Action -->
                   <div>
-                    <label class="sheet-wildwest-label">Reaction (once per turn)</label>
+                    <label class="sheet-d6pp-label">Reaction (once per turn)</label>
                     <div class="inline-action-row">
                       <input type="hidden" name="attr_reaction_fixit_active" value="0" />
                       <input type="hidden" name="attr_reaction_medic_active" value="0" />
                       <input type="hidden" name="attr_reaction_mode" value="normal" />
-                      <select class="reaction-normal sheet-wildwest-select" name="attr_reaction_selection_normal">
+                      <select class="reaction-normal sheet-d6pp-select" name="attr_reaction_selection_normal">
                         <option value="None">None</option>
                         <option value="Block">Block</option>
                         <option value="Impede">Impede</option>
@@ -2375,7 +2178,7 @@
                         <option value="Keep Grapple">Keep Grapple</option>
                         <option value="Keep Lassoed">Keep Lassoed</option>
                       </select>
-                      <select class="reaction-medic sheet-wildwest-select" name="attr_reaction_selection_medic">
+                      <select class="reaction-medic sheet-d6pp-select" name="attr_reaction_selection_medic">
                         <option value="None">None</option>
                         <option value="Block">Block</option>
                         <option value="Impede">Impede</option>
@@ -2386,7 +2189,7 @@
                         <option value="Keep Lassoed">Keep Lassoed</option>
                         <option value="Medic">Medic</option>
                       </select>
-                      <select class="reaction-fixit sheet-wildwest-select" name="attr_reaction_selection_fixit">
+                      <select class="reaction-fixit sheet-d6pp-select" name="attr_reaction_selection_fixit">
                         <option value="None">None</option>
                         <option value="Block">Block</option>
                         <option value="Impede">Impede</option>
@@ -2401,8 +2204,8 @@
                     </div>
                   </div>
                   <div>
-                    <label class="sheet-wildwest-label">Simple Action</label>
-                    <select class="sheet-wildwest-select" name="attr_simple_action_selection">
+                    <label class="sheet-d6pp-label">Simple Action</label>
+                    <select class="sheet-d6pp-select" name="attr_simple_action_selection">
                       <option value="None">None</option>
                       <option value="Use an item">Use an item</option>
                       <option value="Open/close door">Open/close door</option>
@@ -2424,22 +2227,22 @@
                     <input type="hidden" name="attr_preaction_selection_ignorepain" />
                     <input type="hidden" name="attr_preaction_selection_disengage" />
                     <div class="sheet-dodge-toggle">
-                      <label class="sheet-wildwest-label" style="margin: 0; display: inline;">Times Attacked:</label>
-                      <input type="number" class="sheet-wildwest" name="attr_times_attacked" />
+                      <label class="sheet-d6pp-label" style="margin: 0; display: inline;">Times Attacked:</label>
+                      <input type="number" class="sheet-d6pp" name="attr_times_attacked" />
                     </div>
                     <div class="sheet-controls-group">
                       <input type="hidden" name="attr_preaction_selection_normal" />
                       <input type="hidden" name="attr_preaction_selection_ignorepain" />
                       <input type="hidden" name="attr_preaction_selection_disengage" />
                       <div class="sheet-dodge-toggle">
-                        <button type="action" class="sheet-wildwest" name="act_dodge">Roll Dodge</button>
-                        <input type="text" class="sheet-wildwest sheet-small-input" name="attr_dodge_value" readonly />
+                        <button type="action" class="sheet-d6pp" name="act_dodge">Roll Dodge</button>
+                        <input type="text" class="sheet-d6pp sheet-small-input" name="attr_dodge_value" readonly />
                       </div>
                     </div>
                   </div>
 
                   <div class="sheet-controls-group">
-                    <button type="action" class="sheet-wildwest" name="act_new_turn">New Turn</button>
+                    <button type="action" class="sheet-d6pp" name="act_new_turn">New Turn</button>
                   </div>
 
                 </div>
@@ -2451,37 +2254,30 @@
               <input type="checkbox" class="skill-toggle" id="toggle_skillcheck" name="attr_toggle_skillcheck" value="1" checked hidden />
               <label class="skill-toggle-label" for="toggle_skillcheck">Skill Check</label>
               <div class="skill-group-content">
-                <table class="sheet-attributes">
-                  <thead>
-                    <tr>
-                      <th>Target Number</th>
-                      <th>Challenge Rating</th>
-                      <th>Times Attacked</th>
-                      <th>Modifier</th>
-                      <th>Wound Penalty</th>
-                      <th>Mounted Penalty</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr>
-                      <td class="target-number-cell"><span name="attr_skill_check_target">0</span></td>
-                      <td>
-                        <select name="attr_skillcheck_cr">
-                          <option value="0">Trivial</option>
-                          <option value="5">Easy (+5)</option>
-                          <option value="10">Moderate (+10)</option>
-                          <option value="15">Hard (+15)</option>
-                          <option value="20">Very Hard (+20)</option>
-                          <option value="25">Extremely Hard (+25)</option>
-                        </select>
-                      </td>
-                      <td class="number-cell"><span name="attr_times_attacked">0</span></td>
-                      <td><input type="number" name="attr_skillcheck_modifier" value="0" /></td>
-                      <td class="number-cell"><span name="attr_skillcheck_wound_penalty">0</span></td>
-                      <td class="number-cell"><span name="attr_skillcheck_mounted_penalty">0</span></td>
-                    </tr>
-                  </tbody>
-                </table>
+                <div class="sheet-grid-table six-col full-width">
+                  <div class="grid-header">Target Number</div>
+                  <div class="grid-header">Challenge Rating</div>
+                  <div class="grid-header">Times Attacked</div>
+                  <div class="grid-header">Modifier</div>
+                  <div class="grid-header">Wound Penalty</div>
+                  <div class="grid-header">Mounted Penalty</div>
+
+                  <div class="grid-cell target-number-cell"><span name="attr_skill_check_target">0</span></div>
+                  <div class="grid-cell">
+                    <select name="attr_skillcheck_cr" class="sheet-d6pp-select">
+                      <option value="0">Trivial</option>
+                      <option value="5">Easy (+5)</option>
+                      <option value="10">Moderate (+10)</option>
+                      <option value="15">Hard (+15)</option>
+                      <option value="20">Very Hard (+20)</option>
+                      <option value="25">Extremely Hard (+25)</option>
+                    </select>
+                  </div>
+                  <div class="grid-cell number-cell"><span name="attr_times_attacked">0</span></div>
+                  <div class="grid-cell"><input type="number" name="attr_skillcheck_modifier" class="sheet-d6pp" value="0" /></div>
+                  <div class="grid-cell number-cell"><span name="attr_skillcheck_wound_penalty">0</span></div>
+                  <div class="grid-cell number-cell"><span name="attr_skillcheck_mounted_penalty">0</span></div>
+                </div>
                 <span class="small-hint">Each attack during Dodge adds +3 to your TN. Modifier includes Help, Prep, and situational bonuses.</span>
               </div>
             </div>
@@ -2491,51 +2287,50 @@
               <input type="checkbox" class="skill-toggle" id="toggle_combat" name="attr_toggle_combat" value="1" checked hidden />
               <label class="skill-toggle-label" for="toggle_combat">Combat</label>
               <div class="skill-group-content">
-                <table class="sheet-attributes">
-                  <thead>
-                    <tr>
-                      <th>Target Number</th>
-                      <th>Range</th>
-                      <th>Cover</th>
-                      <th>Opponent's Dodge</th>
-                      <th>Times Attacked</th>
-                      <th>Modifier</th>
-                      <th>Wound Penalty</th>
-                      <th>Mounted Penalty</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr>
-                      <td class="target-number-cell"><span name="attr_combat_target">0</span></td>
-                      <td>
-                        <select name="attr_combat_range">
-                          <option value="5">Point Blank (5)</option>
-                          <option value="10">Short (10)</option>
-                          <option value="15">Medium (15)</option>
-                          <option value="20">Long (20)</option>
-                          <option value="25">Extreme (25)</option>
-                        </select>
-                      </td>
-                      <td>
-                        <select name="attr_combat_cover">
-                          <option value="0">None (0)</option>
-                          <option value="5">Light (5)</option>
-                          <option value="10">Half (10)</option>
-                          <option value="15">Heavy (15)</option>
-                          <option value="30">Full (30)</option>
-                        </select>
-                      </td>
-                      <td><input type="number" name="attr_combat_opponent_dodge" value="0" min="0" /></td>
-                      <td class="number-cell"><span name="attr_times_attacked">0</span></td>
-                      <td><input type="number" name="attr_combat_modifier" value="0" /></td>
-                      <td class="number-cell"><span name="attr_skillcheck_wound_penalty">0</span></td>
-                      <td class="number-cell"><span name="attr_skillcheck_mounted_penalty">0</span></td>
-                    </tr>
-                  </tbody>
-                </table>
+                <div class="sheet-grid-table eight-col full-width">
+
+                  <!-- Headers -->
+                  <div class="grid-header">Target Number</div>
+                  <div class="grid-header">Range</div>
+                  <div class="grid-header">Cover</div>
+                  <div class="grid-header">Opponent's Dodge</div>
+                  <div class="grid-header">Times Attacked</div>
+                  <div class="grid-header">Modifier</div>
+                  <div class="grid-header">Wound Penalty</div>
+                  <div class="grid-header">Mounted Penalty</div>
+
+                  <!-- Row values -->
+                  <div class="grid-cell target-number-cell"><span name="attr_combat_target">0</span></div>
+                  <div class="grid-cell">
+                    <select name="attr_combat_range" class="sheet-d6pp-select">
+                      <option value="5">Point Blank (5)</option>
+                      <option value="10">Short (10)</option>
+                      <option value="15">Medium (15)</option>
+                      <option value="20">Long (20)</option>
+                      <option value="25">Extreme (25)</option>
+                    </select>
+                  </div>
+                  <div class="grid-cell">
+                    <select name="attr_combat_cover" class="sheet-d6pp-select">
+                      <option value="0">None (0)</option>
+                      <option value="5">Light (5)</option>
+                      <option value="10">Half (10)</option>
+                      <option value="15">Heavy (15)</option>
+                      <option value="30">Full (30)</option>
+                    </select>
+                  </div>
+                  <div class="grid-cell">
+                    <input type="number" name="attr_combat_opponent_dodge" class="sheet-d6pp" value="0" min="0" />
+                  </div>
+                  <div class="grid-cell"><span name="attr_times_attacked">0</span></div>
+                  <div class="grid-cell"><input type="number" name="attr_combat_modifier" class="sheet-d6pp" value="0" /></div>
+                  <div class="grid-cell"><span name="attr_skillcheck_wound_penalty">0</span></div>
+                  <div class="grid-cell"><span name="attr_skillcheck_mounted_penalty">0</span></div>
+
+                </div>
                 <span class="small-hint">Each attack during Dodge adds +3 to your TN. Modifier includes Help, Prep, and situational bonuses.</span>
                 <div class="spacer-md"></div>
-                <label class="sheet-wildwest-label">Select a Form of Attack</label>
+                <label class="sheet-d6pp-label">Select a Form of Attack</label>
                 <div class="sheet-attack-tabs">
                   <!-- Radio buttons -->
                   <input type="radio" name="attr_attack_mode" value="firearms" class="sheet-tab" checked />
@@ -2546,238 +2341,252 @@
                   <span>Melee</span>
                   <div class="spacer-sm"></div>
                   <div class="sheet-attack-section sheet-firearms">
-                    <table class="sheet-attributes">
-                      <thead>
-                        <tr>
-                          <th>Weapon</th>
-                          <th>Dice</th>
-                          <th>Damage</th>
-                          <th>Ammo</th>
-                          <th>Short</th>
-                          <th>Medium</th>
-                          <th>Long</th>
-                          <th>Extreme</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        <tr>
-                          <td>
-                            <select name="attr_firearm1_weapon">
-                              <option value="None">None</option>
-                              <option value="Revolver">Revolver</option>
-                              <option value="Derringer">Derringer</option>
-                              <option value="Lever-Action Rifle">Lever-Action Rifle</option>
-                              <option value="Single Shot Rifle">Single Shot Rifle</option>
-                              <option value="Shotgun">Shotgun</option>
-                              <option value="Sawed-off Shotgun">Sawed-off Shotgun</option>
-                            </select>
-                            <br />
-                            <span class="small-hint" style="display: inline;">Skill: </span>
-                            <span class="small-hint" style="display: inline;" name="attr_firearm1_attr"></span>
-                          </td>
-                          <td>
-                            <span class="wildwest-span" name="attr_firearm1_actual"></span><br />
-                            <button type="action" class="sheet-wildwest" name="act_firearm1_attack">Roll</button>
-                          </td>
-                          <td>
-                            <span class="wildwest-span" name="attr_firearm1_damage"></span><br />
-                            <button type="action" class="sheet-wildwest" name="act_firearm1_damage">Damage</button>
-                          </td>
-                          <td>
-                            <button type="action" class="sheet-wildwest" name="act_firearm1_ammo_add">+</button>
-                            <button type="action" class="sheet-wildwest" name="act_firearm1_ammo_sub">−</button><br />
-                            <button type="action" class="sheet-wildwest" name="act_firearm1_ammo_reload">Reload</button>
-                          </td>
-                          <td><span class="wildwest-span" name="attr_firearm1_short"></span></td>
-                          <td><span class="wildwest-span" name="attr_firearm1_medium"></span></td>
-                          <td><span class="wildwest-span" name="attr_firearm1_long"></span></td>
-                          <td><span class="wildwest-span" name="attr_firearm1_extreme"></span></td>
-                        </tr>
-                        <tr>
-                          <td colspan="10" style="text-align: left;">
-                            <span class="sheet-ammo-display" name="attr_firearm1_ammo_display"></span>
-                          </td>
-                        </tr>
-                        <tr>
-                          <td>
-                            <select name="attr_firearm2_weapon">
-                              <option value="None">None</option>
-                              <option value="Revolver">Revolver</option>
-                              <option value="Derringer">Derringer</option>
-                              <option value="Lever-Action Rifle">Lever-Action Rifle</option>
-                              <option value="Single Shot Rifle">Single Shot Rifle</option>
-                              <option value="Shotgun">Shotgun</option>
-                              <option value="Sawed-off Shotgun">Sawed-off Shotgun</option>
-                            </select>
-                            <br />
-                            <span class="small-hint" style="display: inline;">Skill: </span>
-                            <span class="small-hint" style="display: inline;" name="attr_firearm2_attr"></span>
-                          </td>
-                          <td>
-                            <span class="wildwest-span" name="attr_firearm2_actual"></span><br />
-                            <button type="action" class="sheet-wildwest" name="act_firearm2_attack">Roll</button>
-                          </td>
-                          <td>
-                            <span class="wildwest-span" name="attr_firearm2_damage"></span><br />
-                            <button type="action" class="sheet-wildwest" name="act_firearm2_damage">Damage</button>
-                          </td>
-                          <td>
-                            <button type="action" class="sheet-wildwest" name="act_firearm2_ammo_add">+</button>
-                            <button type="action" class="sheet-wildwest" name="act_firearm2_ammo_sub">−</button><br />
-                            <button type="action" class="sheet-wildwest" name="act_firearm2_ammo_reload">Reload</button>
-                          </td>
-                          <td><span class="wildwest-span" name="attr_firearm2_short"></span></td>
-                          <td><span class="wildwest-span" name="attr_firearm2_medium"></span></td>
-                          <td><span class="wildwest-span" name="attr_firearm2_long"></span></td>
-                          <td><span class="wildwest-span" name="attr_firearm2_extreme"></span></td>
-                        </tr>
-                        <tr>
-                          <td colspan="10" style="text-align: left;">
-                            <span class="sheet-ammo-display" name="attr_firearm2_ammo_display"></span>
-                          </td>
-                        </tr>
-                        <tr>
-                          <td>
-                            <select name="attr_firearm3_weapon">
-                              <option value="None">None</option>
-                              <option value="Revolver">Revolver</option>
-                              <option value="Derringer">Derringer</option>
-                              <option value="Lever-Action Rifle">Lever-Action Rifle</option>
-                              <option value="Single Shot Rifle">Single Shot Rifle</option>
-                              <option value="Shotgun">Shotgun</option>
-                              <option value="Sawed-off Shotgun">Sawed-off Shotgun</option>
-                            </select>
-                            <br />
-                            <span class="small-hint" style="display: inline;">Skill: </span>
-                            <span class="small-hint" style="display: inline;" name="attr_firearm3_attr"></span>
-                          </td>
-                          <td>
-                            <span class="wildwest-span" name="attr_firearm3_actual"></span><br />
-                            <button type="action" class="sheet-wildwest" name="act_firearm3_attack">Roll</button>
-                          </td>
-                          <td>
-                            <span class="wildwest-span" name="attr_firearm3_damage"></span><br />
-                            <button type="action" class="sheet-wildwest" name="act_firearm3_damage">Damage</button>
-                          </td>
-                          <td>
-                            <button type="action" class="sheet-wildwest" name="act_firearm3_ammo_add">+</button>
-                            <button type="action" class="sheet-wildwest" name="act_firearm3_ammo_sub">−</button><br />
-                            <button type="action" class="sheet-wildwest" name="act_firearm3_ammo_reload">Reload</button>
-                          </td>
-                          <td><span class="wildwest-span" name="attr_firearm3_short"></span></td>
-                          <td><span class="wildwest-span" name="attr_firearm3_medium"></span></td>
-                          <td><span class="wildwest-span" name="attr_firearm3_long"></span></td>
-                          <td><span class="wildwest-span" name="attr_firearm3_extreme"></span></td>
-                        </tr>
-                        <tr>
-                          <td colspan="10" style="text-align: left;">
-                            <span class="sheet-ammo-display" name="attr_firearm3_ammo_display"></span>
-                          </td>
-                        </tr>
-                      </tbody>
-                    </table>
+                    <!-- Weapon 1 -->
+                    <div class="sheet-grid-attack sheet-grid-firearms full-width">
+                      <!-- Headers -->
+                      <div class="grid-header">Weapon</div>
+                      <div class="grid-header">Dice</div>
+                      <div class="grid-header">Damage</div>
+                      <div class="grid-header">Ammo</div>
+                      <div class="grid-header">Short</div>
+                      <div class="grid-header">Medium</div>
+                      <div class="grid-header">Long</div>
+                      <div class="grid-header">Extreme</div>
+
+                      <!-- Row 1: Weapon 1 -->
+                      <div class="grid-cell stack-weapon">
+                        <select name="attr_firearm1_weapon" class="sheet-d6pp-select">
+                          <option value="None">None</option>
+                          <option value="Revolver">Revolver</option>
+                          <option value="Derringer">Derringer</option>
+                          <option value="Lever-Action Rifle">Lever-Action Rifle</option>
+                          <option value="Single Shot Rifle">Single Shot Rifle</option>
+                          <option value="Shotgun">Shotgun</option>
+                          <option value="Sawed-off Shotgun">Sawed-off Shotgun</option>
+                        </select>
+                        <div class="weapon-skill">
+                          <span class="small-hint">Skill:</span>
+                          <span class="small-hint" name="attr_firearm1_attr"></span>
+                        </div>
+                      </div>
+
+                      <div class="grid-cell stack-tight">
+                        <span name="attr_firearm1_actual"></span>
+                        <button type="action" name="act_firearm1_attack">Roll</button>
+                      </div>
+
+                      <div class="grid-cell stack-tight">
+                        <span name="attr_firearm1_damage"></span>
+                        <button type="action" name="act_firearm1_damage">Damage</button>
+                      </div>
+
+                      <div class="grid-cell stack-tight">
+                        <div class="ammo-button-row">
+                          <button type="action" name="act_firearm1_ammo_add">+</button>
+                          <button type="action" name="act_firearm1_ammo_sub">−</button>
+                        </div>
+                        <button type="action" name="act_firearm1_ammo_reload">Reload</button>
+                      </div>
+
+                      <div class="grid-cell"><span name="attr_firearm1_short"></span></div>
+                      <div class="grid-cell"><span name="attr_firearm1_medium"></span></div>
+                      <div class="grid-cell"><span name="attr_firearm1_long"></span></div>
+                      <div class="grid-cell"><span name="attr_firearm1_extreme"></span></div>
+
+                      <!-- Ammo Display Row -->
+                      <div class="grid-cell ammo-display full-row"> <!-- not grid-span-8 -->
+                        <span name="attr_firearm1_ammo_display"></span>
+                      </div>
+                    </div>
+                    <!-- Weapon 2 -->
+                    <div class="sheet-grid-attack sheet-grid-firearms full-width">
+                      <!-- Row 1: Weapon 2 -->
+                      <div class="grid-cell stack-weapon">
+                        <select name="attr_firearm2_weapon" class="sheet-d6pp-select">
+                          <option value="None">None</option>
+                          <option value="Revolver">Revolver</option>
+                          <option value="Derringer">Derringer</option>
+                          <option value="Lever-Action Rifle">Lever-Action Rifle</option>
+                          <option value="Single Shot Rifle">Single Shot Rifle</option>
+                          <option value="Shotgun">Shotgun</option>
+                          <option value="Sawed-off Shotgun">Sawed-off Shotgun</option>
+                        </select>
+                        <div class="weapon-skill">
+                          <span class="small-hint">Skill:</span>
+                          <span class="small-hint" name="attr_firearm2_attr"></span>
+                        </div>
+                      </div>
+
+                      <div class="grid-cell stack-tight">
+                        <span name="attr_firearm2_actual"></span>
+                        <button type="action" name="act_firearm2_attack">Roll</button>
+                      </div>
+
+                      <div class="grid-cell stack-tight">
+                        <span name="attr_firearm2_damage"></span>
+                        <button type="action" name="act_firearm2_damage">Damage</button>
+                      </div>
+
+                      <div class="grid-cell stack-tight">
+                        <div class="ammo-button-row">
+                          <button type="action" name="act_firearm2_ammo_add">+</button>
+                          <button type="action" name="act_firearm2_ammo_sub">−</button>
+                        </div>
+                        <button type="action" name="act_firearm2_ammo_reload">Reload</button>
+                      </div>
+
+                      <div class="grid-cell"><span name="attr_firearm2_short"></span></div>
+                      <div class="grid-cell"><span name="attr_firearm2_medium"></span></div>
+                      <div class="grid-cell"><span name="attr_firearm2_long"></span></div>
+                      <div class="grid-cell"><span name="attr_firearm2_extreme"></span></div>
+
+                      <!-- Ammo Display Row -->
+                      <div class="grid-cell ammo-display full-row"> <!-- not grid-span-8 -->
+                        <span name="attr_firearm2_ammo_display"></span>
+                      </div>
+                    </div>
+                    <!-- Weapon 3 -->
+                    <div class="sheet-grid-attack sheet-grid-firearms full-width">
+                      <!-- Row 1: Weapon 3 -->
+                      <div class="grid-cell stack-weapon">
+                        <select name="attr_firearm3_weapon" class="sheet-d6pp-select">
+                          <option value="None">None</option>
+                          <option value="Revolver">Revolver</option>
+                          <option value="Derringer">Derringer</option>
+                          <option value="Lever-Action Rifle">Lever-Action Rifle</option>
+                          <option value="Single Shot Rifle">Single Shot Rifle</option>
+                          <option value="Shotgun">Shotgun</option>
+                          <option value="Sawed-off Shotgun">Sawed-off Shotgun</option>
+                        </select>
+                        <div class="weapon-skill">
+                          <span class="small-hint">Skill:</span>
+                          <span class="small-hint" name="attr_firearm3_attr"></span>
+                        </div>
+                      </div>
+
+                      <div class="grid-cell stack-tight">
+                        <span name="attr_firearm3_actual"></span>
+                        <button type="action" name="act_firearm3_attack">Roll</button>
+                      </div>
+
+                      <div class="grid-cell stack-tight">
+                        <span name="attr_firearm3_damage"></span>
+                        <button type="action" name="act_firearm3_damage">Damage</button>
+                      </div>
+
+                      <div class="grid-cell stack-tight">
+                        <div class="ammo-button-row">
+                          <button type="action" name="act_firearm3_ammo_add">+</button>
+                          <button type="action" name="act_firearm3_ammo_sub">−</button>
+                        </div>
+                        <button type="action" name="act_firearm3_ammo_reload">Reload</button>
+                      </div>
+
+                      <div class="grid-cell"><span name="attr_firearm3_short"></span></div>
+                      <div class="grid-cell"><span name="attr_firearm3_medium"></span></div>
+                      <div class="grid-cell"><span name="attr_firearm3_long"></span></div>
+                      <div class="grid-cell"><span name="attr_firearm3_extreme"></span></div>
+
+                      <!-- Ammo Display Row -->
+                      <div class="grid-cell ammo-display full-row last-row">
+                        <span name="attr_firearm3_ammo_display"></span>
+                      </div>
+                    </div>
+
                   </div>
                   <div class="sheet-attack-section sheet-ranged">
-                    <table class="sheet-attributes">
-                      <thead>
-                        <tr>
-                          <th>Weapon</th>
-                          <th>Dice</th>
-                          <th>Damage</th>
-                          <th>Short</th>
-                          <th>Medium</th>
-                          <th>Long</th>
-                          <th>Extreme</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        <tr>
-                          <td>
-                            <select name="attr_ranged_weapon">
-                              <option value="None">None</option>
-                              <option value="Bow">Bow</option>
-                              <option value="Slingshot">Slingshot</option>
-                              <option value="Thrown Knife/Axe">Thrown Knife/Axe</option>
-                              <option value="Improvised Thrown">Improvised Thrown</option>
-                              <option value="Lasso">Lasso</option>
-                            </select>
-                            <br />
-                            <span class="small-hint" style="display: inline;">Skill: </span>
-                            <span class="small-hint" style="display: inline;" name="attr_ranged_attr"></span>
-                          </td>
-                          <td>
-                            <span class="wildwest-span" name="attr_ranged_actual"></span><br />
-                            <button type="action" class="sheet-wildwest" name="act_ranged_attack">Roll</button>
-                          </td>
-                          <td>
-                            <span class="wildwest-span" name="attr_ranged_damage"></span><br />
-                            <button type="action" class="sheet-wildwest" name="act_ranged_damage">Damage</button>
-                          </td>
-                          <td><span class="wildwest-span" name="attr_ranged_short"></span></td>
-                          <td><span class="wildwest-span" name="attr_ranged_medium"></span></td>
-                          <td><span class="wildwest-span" name="attr_ranged_long"></span></td>
-                          <td><span class="wildwest-span" name="attr_ranged_extreme"></span></td>
-                        </tr>
-                      </tbody>
-                    </table>
+                    <div class="sheet-grid-attack sheet-grid-ranged full-width">
+                      <!-- Headers -->
+                      <div class="grid-header">Weapon</div>
+                      <div class="grid-header">Dice</div>
+                      <div class="grid-header">Damage</div>
+                      <div class="grid-header">Short</div>
+                      <div class="grid-header">Medium</div>
+                      <div class="grid-header">Long</div>
+                      <div class="grid-header">Extreme</div>
+
+                      <!-- Weapon Row -->
+                      <div class="grid-cell stack-weapon">
+                        <select name="attr_ranged_weapon" class="sheet-d6pp-select">
+                          <option value="None">None</option>
+                          <option value="Bow">Bow</option>
+                          <option value="Slingshot">Slingshot</option>
+                          <option value="Thrown Knife/Axe">Thrown Knife/Axe</option>
+                          <option value="Improvised Thrown">Improvised Thrown</option>
+                          <option value="Lasso">Lasso</option>
+                        </select>
+                        <div class="weapon-skill">
+                          <span class="small-hint">Skill:</span>
+                          <span class="small-hint" name="attr_ranged_attr"></span>
+                        </div>
+                      </div>
+
+                      <div class="grid-cell stack-tight">
+                        <span name="attr_ranged_actual"></span>
+                        <button type="action" name="act_ranged_attack" class="sheet-d6pp">Roll</button>
+                      </div>
+
+                      <div class="grid-cell stack-tight">
+                        <span name="attr_ranged_damage"></span>
+                        <button type="action" name="act_ranged_damage" class="sheet-d6pp">Damage</button>
+                      </div>
+
+                      <div class="grid-cell"><span name="attr_ranged_short"></span></div>
+                      <div class="grid-cell"><span name="attr_ranged_medium"></span></div>
+                      <div class="grid-cell"><span name="attr_ranged_long"></span></div>
+                      <div class="grid-cell"><span name="attr_ranged_extreme"></span></div>
+                    </div>
                   </div>
                   <div class="sheet-attack-section sheet-melee">
-                    <table class="sheet-attributes table-equal-width">
-                      <colgroup>
-                        <col style="width: 50%;" />
-                        <col style="width: 25%;" />
-                        <col style="width: 25%;" />
-                      </colgroup>
-                      <thead>
-                        <tr>
-                          <th>Weapon</th>
-                          <th>Dice</th>
-                          <th>Damage</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        <tr>
-                          <td>
-                            <select name="attr_melee_weapon">
-                              <option value="None">None</option>
-                              <option value="Brawling">Brawling</option>
-                              <option value="Wrestling">Wrestling</option>
-                              <option value="Martial Arts">Martial Arts</option>
-                              <option value="Improvised Weapon">Improvised Weapon</option>
-                              <option value="Pistol Whip">Pistol Whip</option>
-                              <option value="Knife/Hatchet">Knife/Hatchet</option>
-                              <option value="Cavalry Sword">Cavalry Sword</option>
-                              <option value="Club">Club</option>
-                              <option value="Push">Push</option>
-                              <option value="Hitting with Butt of Rifle">Hitting with Butt of Rifle</option>
-                            </select>
-                            <br />
-                            <span class="small-hint" style="display: inline;">Skill: </span>
-                            <span class="small-hint" style="display: inline;" name="attr_melee_attr"></span>
-                          </td>
-                          <td>
-                            <span class="wildwest-span" name="attr_melee_actual"></span><br />
-                            <button type="action" class="sheet-wildwest" name="act_melee_attack">Roll</button>
-                          </td>
-                          <td>
-                            <span class="wildwest-span" name="attr_melee_damage"></span><br />
-                            <button type="action" class="sheet-wildwest" name="act_melee_damage">Damage</button>
-                          </td>
-                        </tr>
-                      </tbody>
-                    </table>
+                    <div class="sheet-grid-attack sheet-grid-melee">
+                      <!-- Headers -->
+                      <div class="grid-header">Weapon</div>
+                      <div class="grid-header">Dice</div>
+                      <div class="grid-header">Damage</div>
+
+                      <!-- Row: Melee Weapon -->
+                      <div class="grid-cell stack-weapon">
+                        <select name="attr_melee_weapon" class="sheet-d6pp-select">
+                          <option value="None">None</option>
+                          <option value="Brawling">Brawling</option>
+                          <option value="Wrestling">Wrestling</option>
+                          <option value="Martial Arts">Martial Arts</option>
+                          <option value="Improvised Weapon">Improvised Weapon</option>
+                          <option value="Pistol Whip">Pistol Whip</option>
+                          <option value="Knife/Hatchet">Knife/Hatchet</option>
+                          <option value="Cavalry Sword">Cavalry Sword</option>
+                          <option value="Club">Club</option>
+                          <option value="Push">Push</option>
+                          <option value="Hitting with Butt of Rifle">Hitting with Butt of Rifle</option>
+                        </select>
+                        <div class="weapon-skill">
+                          <span class="small-hint">Skill:</span>
+                          <span class="small-hint" name="attr_melee_attr"></span>
+                        </div>
+                      </div>
+
+                      <div class="grid-cell stack-tight">
+                        <span name="attr_melee_actual"></span>
+                        <button type="action" class="sheet-d6pp" name="act_melee_attack">Roll</button>
+                      </div>
+
+                      <div class="grid-cell stack-tight">
+                        <span name="attr_melee_damage"></span>
+                        <button type="action" class="sheet-d6pp" name="act_melee_damage">Damage</button>
+                      </div>
+                    </div>
                   </div>
                 </div>
                 <div class="spacer-sm"></div>
                 <div class="sheet-controls-row">
                   <!-- Left -->
                   <div class="sheet-controls-group">
-                    <button type="action" class="sheet-wildwest" name="act_initiative">Roll Initiative</button>
+                    <button type="action" class="sheet-d6pp" name="act_initiative">Roll Initiative</button>
                   </div>
                   <div class="sheet-controls-group">
                     <div class="attack-count-group">
-                      <label for="attr_attack_count" class="sheet-wildwest-label">Multi-Attack:</label>
-                      <input type="number" name="attr_attack_count" class="sheet-wildwest" value="0" min="0" />
+                      <label for="attr_attack_count" class="sheet-d6pp-label">Multi-Attack:</label>
+                      <input type="number" name="attr_attack_count" class="sheet-d6pp" value="0" min="0" />
                     </div>
                   </div>
                 </div>
@@ -2789,34 +2598,35 @@
               <input type="checkbox" class="skill-toggle" id="toggle_wounds" name="attr_toggle_wounds" value="1" checked hidden />
               <label class="skill-toggle-label" for="toggle_wounds">Wounds</label>
               <div class="skill-group-content">
-                <table class="sheet-attributes table-equal-width">
-                  <thead>
-                    <tr>
-                      <th>First Aid Target Number</th>
-                      <th>Wound Points</th>
-                      <th>Wounds Ignored</th>
-                      <th># First Aid</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr>
-                      <td <td class="target-number-cell"><span name="attr_first_aid_target">0</span></td>
-                      <td><input type="number" name="attr_wounds_total" value="0" min="0" /></td>
-                      <td><input type="number" name="attr_wounds_ignored" value="0" min="0" /></td>
-                      <td><input type="number" name="attr_first_aid_count" value="0" min="0" /></td>
-                    </tr>
-                  </tbody>
-                </table>
+                <div class="sheet-grid-table four-col">
+                  <div class="grid-header">First Aid Target Number</div>
+                  <div class="grid-header">Wound Points</div>
+                  <div class="grid-header">Wounds Ignored</div>
+                  <div class="grid-header"># First Aid</div>
+
+                  <div class="grid-cell target-number-cell">
+                    <span name="attr_first_aid_target">0</span>
+                  </div>
+                  <div class="grid-cell">
+                    <input type="number" name="attr_wounds_total" value="0" min="0" class="sheet-d6pp" />
+                  </div>
+                  <div class="grid-cell">
+                    <input type="number" name="attr_wounds_ignored" value="0" min="0" class="sheet-d6pp" />
+                  </div>
+                  <div class="grid-cell">
+                    <input type="number" name="attr_first_aid_count" value="0" min="0" class="sheet-d6pp" />
+                  </div>
+                </div>
                 <div class="spacer-md"></div>
 
                 <div class="sheet-controls-row">
                   <!-- Left -->
                   <div class="sheet-controls-group">
-                    <button type="action" class="sheet-wildwest" name="act_endure">Roll Endure</button>
+                    <button type="action" class="sheet-d6pp" name="act_endure">Roll Endure</button>
                   </div>
                   <div class="sheet-controls-group">
-                    <label class="sheet-wildwest-label" style="margin: 0; display: inline;">Status:</label>
-                    <input type="text" class="sheet-wildwest" name="attr_status" readonly/>
+                    <label class="sheet-d6pp-label" style="margin: 0; display: inline;">Status:</label>
+                    <input type="text" class="sheet-d6pp" name="attr_status" readonly/>
                   </div>
                 </div>
               </div>
@@ -2828,17 +2638,17 @@
               <label class="skill-toggle-label" for="toggle_conditions">Conditions</label>
               <div class="skill-group-content">
                 <div class="sheet-condition-grid">
-                  <label class="wildwest-checkbox"><input type="checkbox" name="attr_condition_dehydrated" /> Dehydrated</label>
-                  <label class="wildwest-checkbox"><input type="checkbox" name="attr_condition_diseased" /> Diseased</label>
-                  <label class="wildwest-checkbox"><input type="checkbox" name="attr_condition_drunk" /> Drunk</label>
-                  <label class="wildwest-checkbox"><input type="checkbox" name="attr_condition_exhausted" /> Exhausted</label>
-                  <label class="wildwest-checkbox"><input type="checkbox" name="attr_condition_frightened" /> Frightened</label>
-                  <label class="wildwest-checkbox"><input type="checkbox" name="attr_condition_grappled" /> Grappled</label>
-                  <label class="wildwest-checkbox"><input type="checkbox" name="attr_condition_hypothermic" /> Hypothermic</label>
-                  <label class="wildwest-checkbox"><input type="checkbox" name="attr_condition_knockout" /> Knockout</label>
-                  <label class="wildwest-checkbox"><input type="checkbox" name="attr_condition_lassoed" /> Lassoed</label>
-                  <label class="wildwest-checkbox"><input type="checkbox" name="attr_mounted_checked" /> Mounted</label>
-                  <label class="wildwest-checkbox"><input type="checkbox" name="attr_condition_poisoned" /> Poisoned</label>
+                  <label class="d6pp-checkbox"><input type="checkbox" name="attr_condition_dehydrated" /> Dehydrated</label>
+                  <label class="d6pp-checkbox"><input type="checkbox" name="attr_condition_diseased" /> Diseased</label>
+                  <label class="d6pp-checkbox"><input type="checkbox" name="attr_condition_drunk" /> Drunk</label>
+                  <label class="d6pp-checkbox"><input type="checkbox" name="attr_condition_exhausted" /> Exhausted</label>
+                  <label class="d6pp-checkbox"><input type="checkbox" name="attr_condition_frightened" /> Frightened</label>
+                  <label class="d6pp-checkbox"><input type="checkbox" name="attr_condition_grappled" /> Grappled</label>
+                  <label class="d6pp-checkbox"><input type="checkbox" name="attr_condition_hypothermic" /> Hypothermic</label>
+                  <label class="d6pp-checkbox"><input type="checkbox" name="attr_condition_knockout" /> Knockout</label>
+                  <label class="d6pp-checkbox"><input type="checkbox" name="attr_condition_lassoed" /> Lassoed</label>
+                  <label class="d6pp-checkbox"><input type="checkbox" name="attr_mounted_checked" /> Mounted</label>
+                  <label class="d6pp-checkbox"><input type="checkbox" name="attr_condition_poisoned" /> Poisoned</label>
                 </div>
               </div>
             </div>
@@ -2848,100 +2658,77 @@
               <input type="checkbox" class="skill-toggle" id="toggle_attibutes" name="attr_toggle_attibutes" value="1" checked hidden />
               <label class="skill-toggle-label" for="toggle_attibutes">Attributes</label>
               <div class="skill-group-content">
-                <table class="sheet-attributes table-equal-width">
-                  <thead>
-                    <tr>
-                      <th></th>
-                      <th>Base</th>
-                      <th>Adjustment</th>
-                      <th>Actual</th>
-                      <th>Roll</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr>
-                      <td class="number-cell">(S)trength</td>
-                      <td class="number-cell"><span name="attr_strength_base_string"></span></td>
-                      <td class="number-cell"><input type="number" name="attr_strength_adjustment" value="0" /></td>
-                      <td class="number-cell"><span name="attr_strength_string"></span></td>
-                      <td>
-                        <button type="action" class="sheet-wildwest" name="act_strength">Roll</button>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell">(A)gility</td>
-                      <td class="number-cell"><span name="attr_agility_base_string"></span></td>
-                      <td class="number-cell"><input type="number" name="attr_agility_adjustment" value="0" /></td>
-                      <td class="number-cell"><span name="attr_agility_string"></span></td>
-                      <td>
-                        <button type="action" class="sheet-wildwest" name="act_agility">Roll</button>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell">(H)ealth</td>
-                      <td class="number-cell"><span name="attr_health_base_string"></span></td>
-                      <td class="number-cell"><input type="number" name="attr_health_adjustment" value="0" /></td>
-                      <td class="number-cell"><span name="attr_health_string"></span></td>
-                      <td>
-                        <button type="action" class="sheet-wildwest" name="act_health">Roll</button>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell">(P)erception</td>
-                      <td class="number-cell"><span name="attr_perception_base_string"></span></td>
-                      <td class="number-cell"><input type="number" name="attr_perception_adjustment" value="0" /></td>
-                      <td class="number-cell"><span name="attr_perception_string"></span></td>
-                      <td>
-                        <button type="action" class="sheet-wildwest" name="act_perception">Roll</button>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell">(Q)uickness</td>
-                      <td class="number-cell"><span name="attr_quickness_base_string"></span></td>
-                      <td class="number-cell"><input type="number" name="attr_quickness_adjustment" value="0" /></td>
-                      <td class="number-cell"><span name="attr_quickness_string"></span></td>
-                      <td>
-                        <button type="action" class="sheet-wildwest" name="act_quickness">Roll</button>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell">(W)illpower</td>
-                      <td class="number-cell"><span name="attr_willpower_base_string"></span></td>
-                      <td class="number-cell"><input type="number" name="attr_willpower_adjustment" value="0" /></td>
-                      <td class="number-cell"><span name="attr_willpower_string"></span></td>
-                      <td>
-                        <button type="action" class="sheet-wildwest" name="act_willpower">Roll</button>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell">(I)ntelligence</td>
-                      <td class="number-cell"><span name="attr_intelligence_base_string"></span></td>
-                      <td class="number-cell"><input type="number" name="attr_intelligence_adjustment" value="0" /></td>
-                      <td class="number-cell"><span name="attr_intelligence_string"></span></td>
-                      <td>
-                        <button type="action" class="sheet-wildwest" name="act_intelligence">Roll</button>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell">(M)anual Dex</td>
-                      <td class="number-cell"><span name="attr_manualdex_base_string"></span></td>
-                      <td class="number-cell"><input type="number" name="attr_manualdex_adjustment" value="0" /></td>
-                      <td class="number-cell"><span name="attr_manualdex_string"></span></td>
-                      <td>
-                        <button type="action" class="sheet-wildwest" name="act_manualdex">Roll</button>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell">(C)harisma</td>
-                      <td class="number-cell"><span name="attr_charisma_base_string"></span></td>
-                      <td class="number-cell"><input type="number" name="attr_charisma_adjustment" value="0" /></td>
-                      <td class="number-cell"><span name="attr_charisma_string"></span></td>
-                      <td>
-                        <button type="action" class="sheet-wildwest" name="act_charisma">Roll</button>
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
+                <div class="sheet-grid-table five-col">
+                  <!-- Headers -->
+                  <div class="grid-header"></div>
+                  <div class="grid-header">Base</div>
+                  <div class="grid-header">Adjustment</div>
+                  <div class="grid-header">Actual</div>
+                  <div class="grid-header">Roll</div>
+
+                  <!-- Row: Strength -->
+                  <div class="grid-cell number-cell">(S)trength</div>
+                  <div class="grid-cell number-cell"><span name="attr_strength_base_string"></span></div>
+                  <div class="grid-cell number-cell"><input type="number" name="attr_strength_adjustment" value="0" class="sheet-d6pp" /></div>
+                  <div class="grid-cell number-cell"><span name="attr_strength_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_strength">Roll</button></div>
+
+                  <!-- Row: Agility -->
+                  <div class="grid-cell number-cell">(A)gility</div>
+                  <div class="grid-cell number-cell"><span name="attr_agility_base_string"></span></div>
+                  <div class="grid-cell number-cell"><input type="number" name="attr_agility_adjustment" value="0" class="sheet-d6pp" /></div>
+                  <div class="grid-cell number-cell"><span name="attr_agility_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_agility">Roll</button></div>
+
+                  <!-- Row: Health -->
+                  <div class="grid-cell number-cell">(H)ealth</div>
+                  <div class="grid-cell number-cell"><span name="attr_health_base_string"></span></div>
+                  <div class="grid-cell number-cell"><input type="number" name="attr_health_adjustment" value="0" class="sheet-d6pp" /></div>
+                  <div class="grid-cell number-cell"><span name="attr_health_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_health">Roll</button></div>
+
+                  <!-- Row: Perception -->
+                  <div class="grid-cell number-cell">(P)erception</div>
+                  <div class="grid-cell number-cell"><span name="attr_perception_base_string"></span></div>
+                  <div class="grid-cell number-cell"><input type="number" name="attr_perception_adjustment" value="0" class="sheet-d6pp" /></div>
+                  <div class="grid-cell number-cell"><span name="attr_perception_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_perception">Roll</button></div>
+
+                  <!-- Row: Quickness -->
+                  <div class="grid-cell number-cell">(Q)uickness</div>
+                  <div class="grid-cell number-cell"><span name="attr_quickness_base_string"></span></div>
+                  <div class="grid-cell number-cell"><input type="number" name="attr_quickness_adjustment" value="0" class="sheet-d6pp" /></div>
+                  <div class="grid-cell number-cell"><span name="attr_quickness_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_quickness">Roll</button></div>
+
+                  <!-- Row: Willpower -->
+                  <div class="grid-cell number-cell">(W)illpower</div>
+                  <div class="grid-cell number-cell"><span name="attr_willpower_base_string"></span></div>
+                  <div class="grid-cell number-cell"><input type="number" name="attr_willpower_adjustment" value="0" class="sheet-d6pp" /></div>
+                  <div class="grid-cell number-cell"><span name="attr_willpower_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_willpower">Roll</button></div>
+
+                  <!-- Row: Intelligence -->
+                  <div class="grid-cell number-cell">(I)ntelligence</div>
+                  <div class="grid-cell number-cell"><span name="attr_intelligence_base_string"></span></div>
+                  <div class="grid-cell number-cell"><input type="number" name="attr_intelligence_adjustment" value="0" class="sheet-d6pp" /></div>
+                  <div class="grid-cell number-cell"><span name="attr_intelligence_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_intelligence">Roll</button></div>
+
+                  <!-- Row: Manual Dexterity -->
+                  <div class="grid-cell number-cell">(M)anual Dex</div>
+                  <div class="grid-cell number-cell"><span name="attr_manualdex_base_string"></span></div>
+                  <div class="grid-cell number-cell"><input type="number" name="attr_manualdex_adjustment" value="0" class="sheet-d6pp" /></div>
+                  <div class="grid-cell number-cell"><span name="attr_manualdex_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_manualdex">Roll</button></div>
+
+                  <!-- Row: Charisma -->
+                  <div class="grid-cell number-cell">(C)harisma</div>
+                  <div class="grid-cell number-cell"><span name="attr_charisma_base_string"></span></div>
+                  <div class="grid-cell number-cell"><input type="number" name="attr_charisma_adjustment" value="0" class="sheet-d6pp" /></div>
+                  <div class="grid-cell number-cell"><span name="attr_charisma_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_charisma">Roll</button></div>
+                </div>
               </div>
             </div>
 
@@ -2950,42 +2737,45 @@
               <input type="checkbox" class="skill-toggle" id="toggle_core" name="attr_toggle_core" value="1" checked hidden />
               <label class="skill-toggle-label" for="toggle_core">Core Skill Group</label>
               <div class="skill-group-content">
-                <table class="sheet-attributes table-equal-width">
-                  <thead>
-                    <tr>
-                      <th>Skill</th>
-                      <th>Attr Code</th>
-                      <th>Dice Code</th>
-                      <th>Roll</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr>
-                      <td class="number-cell"><span name="attr_avoid_displayname"></span><span name="attr_avoid_specialized"></span></td>
-                      <td class="number-cell"><span name="attr_avoid_attributes"></span></td>
-                      <td class="number-cell"><span name="attr_avoid_string"></span></td>
-                      <td><button type="action" class="sheet-wildwest" name="act_avoid">Roll</button></td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell"><span name="attr_dodge_displayname"></span><span name="attr_dodge_specialized"></span></td>
-                      <td class="number-cell"><span name="attr_dodge_attributes"></span></td>
-                      <td class="number-cell"><span name="attr_dodge_string"></span></td>
-                      <td><button type="action" class="sheet-wildwest" name="act_dodge">Roll</button></td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell"><span name="attr_endure_displayname"></span><span name="attr_endure_specialized"></span></td>
-                      <td class="number-cell"><span name="attr_endure_attributes"></span></td>
-                      <td class="number-cell"><span name="attr_endure_string"></span></td>
-                      <td><button type="action" class="sheet-wildwest" name="act_endure">Roll</button></td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell"><span name="attr_initiative_displayname"></span><span name="attr_initiative_specialized"></span></td>
-                      <td class="number-cell"><span name="attr_initiative_attributes"></span></td>
-                      <td class="number-cell"><span name="attr_initiative_string"></span></td>
-                      <td><button type="action" class="sheet-wildwest" name="act_initiative">Roll</button></td>
-                    </tr>
-                  </tbody>
-                </table>
+                <div class="sheet-grid-table four-col">
+                  <!-- Headers -->
+                  <div class="grid-header">Skill</div>
+                  <div class="grid-header">Attr Code</div>
+                  <div class="grid-header">Dice Code</div>
+                  <div class="grid-header">Roll</div>
+
+                  <!-- Row: Avoid -->
+                  <div class="grid-cell grid-skill-name">
+                    <span name="attr_avoid_displayname"></span><span name="attr_avoid_specialized"></span>
+                  </div>
+                  <div class="grid-cell number-cell"><span name="attr_avoid_attributes"></span></div>
+                  <div class="grid-cell number-cell"><span name="attr_avoid_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_avoid">Roll</button></div>
+
+                  <!-- Row: Dodge -->
+                  <div class="grid-cell grid-skill-name">
+                    <span name="attr_dodge_displayname"></span><span name="attr_dodge_specialized"></span>
+                  </div>
+                  <div class="grid-cell number-cell"><span name="attr_dodge_attributes"></span></div>
+                  <div class="grid-cell number-cell"><span name="attr_dodge_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_dodge">Roll</button></div>
+
+                  <!-- Row: Endure -->
+                  <div class="grid-cell grid-skill-name">
+                    <span name="attr_endure_displayname"></span><span name="attr_endure_specialized"></span>
+                  </div>
+                  <div class="grid-cell number-cell"><span name="attr_endure_attributes"></span></div>
+                  <div class="grid-cell number-cell"><span name="attr_endure_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_endure">Roll</button></div>
+
+                  <!-- Row: Initiative -->
+                  <div class="grid-cell grid-skill-name">
+                    <span name="attr_initiative_displayname"></span><span name="attr_initiative_specialized"></span>
+                  </div>
+                  <div class="grid-cell number-cell"><span name="attr_initiative_attributes"></span></div>
+                  <div class="grid-cell number-cell"><span name="attr_initiative_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_initiative">Roll</button></div>
+                </div>
               </div>
             </div>
 
@@ -2999,52 +2789,37 @@
               <input type="checkbox" class="skill-toggle" id="toggle_attibutes_ro" name="attr_toggle_attibutes_ro" value="1" checked hidden />
               <label class="skill-toggle-label" for="toggle_attibutes_ro">Attributes</label>
               <div class="skill-group-content">
-                <table class="sheet-attributes table-equal-width">
-                  <thead>
-                    <tr>
-                      <th></th>
-                      <th>Base</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr>
-                      <td class="number-cell">(S)trength</td>
-                      <td class="number-cell"><span name="attr_strength_base_string"></span></td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell">(A)gility</td>
-                      <td class="number-cell"><span name="attr_agility_base_string"></span></td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell">(H)ealth</td>
-                      <td class="number-cell"><span name="attr_health_base_string"></span></td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell">(P)erception</td>
-                      <td class="number-cell"><span name="attr_perception_base_string"></span></td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell">(Q)uickness</td>
-                      <td class="number-cell"><span name="attr_quickness_base_string"></span></td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell">(W)illpower</td>
-                      <td class="number-cell"><span name="attr_willpower_base_string"></span></td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell">(I)ntelligence</td>
-                      <td class="number-cell"><span name="attr_intelligence_base_string"></span></td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell">(M)anual Dex</td>
-                      <td class="number-cell"><span name="attr_manualdex_base_string"></span></td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell">(C)harisma</td>
-                      <td class="number-cell"><span name="attr_charisma_base_string"></span></td>
-                    </tr>
-                  </tbody>
-                </table>
+                <div class="sheet-grid-table two-col">
+                  <div class="grid-header"></div>
+                  <div class="grid-header">Base</div>
+
+                  <div class="grid-cell number-cell">(S)trength</div>
+                  <div class="grid-cell number-cell"><span name="attr_strength_base_string"></span></div>
+
+                  <div class="grid-cell number-cell">(A)gility</div>
+                  <div class="grid-cell number-cell"><span name="attr_agility_base_string"></span></div>
+
+                  <div class="grid-cell number-cell">(H)ealth</div>
+                  <div class="grid-cell number-cell"><span name="attr_health_base_string"></span></div>
+
+                  <div class="grid-cell number-cell">(P)erception</div>
+                  <div class="grid-cell number-cell"><span name="attr_perception_base_string"></span></div>
+
+                  <div class="grid-cell number-cell">(Q)uickness</div>
+                  <div class="grid-cell number-cell"><span name="attr_quickness_base_string"></span></div>
+
+                  <div class="grid-cell number-cell">(W)illpower</div>
+                  <div class="grid-cell number-cell"><span name="attr_willpower_base_string"></span></div>
+
+                  <div class="grid-cell number-cell">(I)ntelligence</div>
+                  <div class="grid-cell number-cell"><span name="attr_intelligence_base_string"></span></div>
+
+                  <div class="grid-cell number-cell">(M)anual Dex</div>
+                  <div class="grid-cell number-cell"><span name="attr_manualdex_base_string"></span></div>
+
+                  <div class="grid-cell number-cell">(C)harisma</div>
+                  <div class="grid-cell number-cell"><span name="attr_charisma_base_string"></span></div>
+                </div>
               </div>
             </div>
 
@@ -3069,42 +2844,32 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_empathy_displayname"></span><span name="attr_empathy_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_empathy_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_empathy_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_empathy">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_insight_displayname"></span><span name="attr_insight_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_insight_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_insight_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_insight">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_investigate_displayname"></span><span name="attr_investigate_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_investigate_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_investigate_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_investigate">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_search_displayname"></span><span name="attr_search_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_search_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_search_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_search">Roll</button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_empathy_displayname"></span><span name="attr_empathy_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_empathy_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_empathy_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_empathy">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_insight_displayname"></span><span name="attr_insight_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_insight_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_insight_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_insight">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_investigate_displayname"></span><span name="attr_investigate_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_investigate_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_investigate_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_investigate">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_search_displayname"></span><span name="attr_search_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_search_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_search_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_search">Roll</button></div>
+              </div>
             </div>
           </div>
 
@@ -3124,30 +2889,22 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_drive_boat_displayname"></span><span name="attr_drive_boat_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_drive_boat_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_drive_boat_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_drive_boat">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_sailing_displayname"></span><span name="attr_sailing_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_sailing_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_sailing_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_sailing">Roll</button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_drive_boat_displayname"></span><span name="attr_drive_boat_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_drive_boat_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_drive_boat_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_drive_boat">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_sailing_displayname"></span><span name="attr_sailing_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_sailing_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_sailing_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_sailing">Roll</button></div>
+              </div>
             </div>
           </div>
 
@@ -3167,42 +2924,32 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_cattle_care_displayname"></span><span name="attr_cattle_care_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_cattle_care_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_cattle_care_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_cattle_care">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_cattle_empathy_displayname"></span><span name="attr_cattle_empathy_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_cattle_empathy_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_cattle_empathy_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_cattle_empathy">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_cattle_handling_displayname"></span><span name="attr_cattle_handling_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_cattle_handling_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_cattle_handling_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_cattle_handling">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_roping_displayname"></span><span name="attr_roping_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_roping_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_roping_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_roping">Roll</button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_cattle_care_displayname"></span><span name="attr_cattle_care_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_cattle_care_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_cattle_care_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_cattle_care">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_cattle_empathy_displayname"></span><span name="attr_cattle_empathy_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_cattle_empathy_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_cattle_empathy_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_cattle_empathy">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_cattle_handling_displayname"></span><span name="attr_cattle_handling_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_cattle_handling_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_cattle_handling_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_cattle_handling">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_roping_displayname"></span><span name="attr_roping_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_roping_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_roping_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_roping">Roll</button></div>
+              </div>
             </div>
           </div>
 
@@ -3222,42 +2969,32 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_drive_cart_displayname"></span><span name="attr_drive_cart_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_drive_cart_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_drive_cart_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_drive_cart">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_horse_care_displayname"></span><span name="attr_horse_care_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_horse_care_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_horse_care_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_horse_care">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_horse_empathy_displayname"></span><span name="attr_horse_empathy_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_horse_empathy_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_horse_empathy_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_horse_empathy">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_riding_displayname"></span><span name="attr_riding_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_riding_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_riding_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_riding">Roll</button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_drive_cart_displayname"></span><span name="attr_drive_cart_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_drive_cart_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_drive_cart_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_drive_cart">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_horse_care_displayname"></span><span name="attr_horse_care_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_horse_care_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_horse_care_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_horse_care">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_horse_empathy_displayname"></span><span name="attr_horse_empathy_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_horse_empathy_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_horse_empathy_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_horse_empathy">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_riding_displayname"></span><span name="attr_riding_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_riding_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_riding_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_riding">Roll</button></div>
+              </div>
             </div>
           </div>
 
@@ -3277,70 +3014,58 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_appraisal_displayname"></span><span name="attr_appraisal_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_appraisal_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_appraisal_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_appraisal">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_cartography_displayname"></span><span name="attr_cartography_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_cartography_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_cartography_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_cartography">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_education_displayname"></span><span name="attr_education_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_education_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_education_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_education">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_engineering_displayname"></span><span name="attr_engineering_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_engineering_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_engineering_string"></span></td>
-                    <td>
-                      <input type="hidden" name="attr_engineering_active" value="2" />
-                      <div class="skill-roll-buttons">
-                        <button type="action" name="act_activate_engineering" class="activate-skill-button" title="Activation costs 12 skill points.">Activate</button>
-                        <button type="action" name="act_undo_activate_engineering" class="undo-activate-skill-button">Undo Activate</button>
-                        <button type="action" name="act_engineering" class="roll-skill-button">Roll</button>
-                        <span class="unactivated-label">Not Activated</span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_law_displayname"></span><span name="attr_law_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_law_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_law_string"></span></td>
-                    <td>
-                      <input type="hidden" name="attr_law_active" value="2" />
-                      <div class="skill-roll-buttons">
-                        <button type="action" name="act_activate_law" class="activate-skill-button" title="Activation costs 12 skill points.">Activate</button>
-                        <button type="action" name="act_undo_activate_law" class="undo-activate-skill-button">Undo Activate</button>
-                        <button type="action" name="act_law" class="roll-skill-button">Roll</button>
-                        <span class="unactivated-label">Not Activated</span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_writing_displayname"></span><span name="attr_writing_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_writing_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_writing_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_writing">Roll</button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_appraisal_displayname"></span><span name="attr_appraisal_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_appraisal_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_appraisal_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_appraisal">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_cartography_displayname"></span><span name="attr_cartography_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_cartography_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_cartography_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_cartography">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_education_displayname"></span><span name="attr_education_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_education_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_education_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_education">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_engineering_displayname"></span><span name="attr_engineering_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_engineering_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_engineering_string"></span></div>
+                <div class="grid-cell">
+                  <input type="hidden" name="attr_engineering_active" value="2" />
+                  <div class="skill-roll-buttons">
+                    <button type="action" name="act_activate_engineering" class="activate-skill-button" title="Activation costs 12 skill points.">Activate</button>
+                    <button type="action" name="act_undo_activate_engineering" class="undo-activate-skill-button">Undo Activate</button>
+                    <button type="action" name="act_engineering" class="roll-skill-button">Roll</button>
+                    <span class="unactivated-label">Not Activated</span>
+                  </div>
+                </div>
+
+                <div class="grid-cell number-cell"><span name="attr_law_displayname"></span><span name="attr_law_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_law_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_law_string"></span></div>
+                <div class="grid-cell">
+                  <input type="hidden" name="attr_law_active" value="2" />
+                  <div class="skill-roll-buttons">
+                    <button type="action" name="act_activate_law" class="activate-skill-button" title="Activation costs 12 skill points.">Activate</button>
+                    <button type="action" name="act_undo_activate_law" class="undo-activate-skill-button">Undo Activate</button>
+                    <button type="action" name="act_law" class="roll-skill-button">Roll</button>
+                    <span class="unactivated-label">Not Activated</span>
+                  </div>
+                </div>
+
+                <div class="grid-cell number-cell"><span name="attr_writing_displayname"></span><span name="attr_writing_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_writing_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_writing_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_writing">Roll</button></div>
+              </div>
               <span class="small-hint">Activating Law or Engineering costs 12 skill points.</span>
             </div>
           </div>
@@ -3361,44 +3086,35 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_first_aid_displayname"></span><span name="attr_first_aid_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_first_aid_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_first_aid_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_first_aid">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_medical_care_displayname"></span><span name="attr_medical_care_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_medical_care_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_medical_care_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_medical_care">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_surgery_displayname"></span><span name="attr_surgery_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_surgery_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_surgery_string"></span></td>
-                    <td>
-                      <input type="hidden" name="attr_surgery_active" value="2" />
-                      <div class="skill-roll-buttons">
-                        <button type="action" name="act_activate_surgery" class="activate-skill-button" title="Activation costs 12 skill points.">Activate</button>
-                        <button type="action" name="act_undo_activate_surgery" class="undo-activate-skill-button">Undo Activate</button>
-                        <button type="action" name="act_surgery" class="roll-skill-button">Roll</button>
-                        <span class="unactivated-label">Not Activated</span>
-                      </div>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_first_aid_displayname"></span><span name="attr_first_aid_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_first_aid_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_first_aid_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_first_aid">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_medical_care_displayname"></span><span name="attr_medical_care_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_medical_care_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_medical_care_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_medical_care">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_surgery_displayname"></span><span name="attr_surgery_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_surgery_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_surgery_string"></span></div>
+                <div class="grid-cell">
+                  <input type="hidden" name="attr_surgery_active" value="2" />
+                  <div class="skill-roll-buttons">
+                    <button type="action" name="act_activate_surgery" class="activate-skill-button" title="Activation costs 12 skill points.">Activate</button>
+                    <button type="action" name="act_undo_activate_surgery" class="undo-activate-skill-button">Undo Activate</button>
+                    <button type="action" name="act_surgery" class="roll-skill-button">Roll</button>
+                    <span class="unactivated-label">Not Activated</span>
+                  </div>
+                </div>
+              </div>
               <span class="small-hint">Activating Surgery costs 12 skill points.</span>
             </div>
           </div>
@@ -3419,72 +3135,57 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_acting_displayname"></span><span name="attr_acting_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_acting_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_acting_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_acting">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_art_displayname"></span><span name="attr_art_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_art_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_art_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_art">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_comedy_displayname"></span><span name="attr_comedy_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_comedy_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_comedy_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_comedy">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_dance_displayname"></span><span name="attr_dance_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_dance_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_dance_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_dance">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_disguise_displayname"></span><span name="attr_disguise_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_disguise_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_disguise_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_disguise">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_gambling_displayname"></span><span name="attr_gambling_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_gambling_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_gambling_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_gambling">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_play_instrument_displayname"></span><span name="attr_play_instrument_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_play_instrument_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_play_instrument_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_play_instrument">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_showmanship_displayname"></span><span name="attr_showmanship_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_showmanship_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_showmanship_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_showmanship">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_sing_displayname"></span><span name="attr_sing_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_sing_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_sing_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_sing">Roll</button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_acting_displayname"></span><span name="attr_acting_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_acting_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_acting_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_acting">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_art_displayname"></span><span name="attr_art_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_art_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_art_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_art">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_comedy_displayname"></span><span name="attr_comedy_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_comedy_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_comedy_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_comedy">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_dance_displayname"></span><span name="attr_dance_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_dance_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_dance_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_dance">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_disguise_displayname"></span><span name="attr_disguise_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_disguise_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_disguise_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_disguise">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_gambling_displayname"></span><span name="attr_gambling_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_gambling_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_gambling_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_gambling">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_play_instrument_displayname"></span><span name="attr_play_instrument_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_play_instrument_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_play_instrument_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_play_instrument">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_showmanship_displayname"></span><span name="attr_showmanship_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_showmanship_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_showmanship_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_showmanship">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_sing_displayname"></span><span name="attr_sing_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_sing_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_sing_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_sing">Roll</button></div>
+              </div>
             </div>
           </div>
 
@@ -3503,54 +3204,42 @@
                   </div>
                   <div class="spacer-sm"></div>
                 </div>
-                <table class="sheet-attributes table-equal-width">
-                  <thead>
-                    <tr>
-                      <th>Skill</th>
-                      <th>Attr Code</th>
-                      <th>Dice Code</th>
-                      <th>Roll</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr>
-                      <td class="number-cell"><span name="attr_acrobatics_displayname"></span><span name="attr_acrobatics_specialized"></span></td>
-                      <td class="number-cell"><span name="attr_acrobatics_attributes"></span></td>
-                      <td class="number-cell"><span name="attr_acrobatics_string"></span></td>
-                      <td><button type="action" class="sheet-wildwest" name="act_acrobatics">Roll</button></td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell"><span name="attr_athletics_displayname"></span><span name="attr_athletics_specialized"></span></td>
-                      <td class="number-cell"><span name="attr_athletics_attributes"></span></td>
-                      <td class="number-cell"><span name="attr_athletics_string"></span></td>
-                      <td><button type="action" class="sheet-wildwest" name="act_athletics">Roll</button></td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell"><span name="attr_climbing_displayname"></span><span name="attr_climbing_specialized"></span></td>
-                      <td class="number-cell"><span name="attr_climbing_attributes"></span></td>
-                      <td class="number-cell"><span name="attr_climbing_string"></span></td>
-                      <td><button type="action" class="sheet-wildwest" name="act_climbing">Roll</button></td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell"><span name="attr_jumping_displayname"></span><span name="attr_jumping_specialized"></span></td>
-                      <td class="number-cell"><span name="attr_jumping_attributes"></span></td>
-                      <td class="number-cell"><span name="attr_jumping_string"></span></td>
-                      <td><button type="action" class="sheet-wildwest" name="act_jumping">Roll</button></td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell"><span name="attr_lifting_displayname"></span><span name="attr_lifting_specialized"></span></td>
-                      <td class="number-cell"><span name="attr_lifting_attributes"></span></td>
-                      <td class="number-cell"><span name="attr_lifting_string"></span></td>
-                      <td><button type="action" class="sheet-wildwest" name="act_lifting">Roll</button></td>
-                    </tr>
-                    <tr>
-                      <td class="number-cell"><span name="attr_swimming_displayname"></span><span name="attr_swimming_specialized"></span></td>
-                      <td class="number-cell"><span name="attr_swimming_attributes"></span></td>
-                      <td class="number-cell"><span name="attr_swimming_string"></span></td>
-                      <td><button type="action" class="sheet-wildwest" name="act_swimming">Roll</button></td>
-                    </tr>
-                  </tbody>
-                </table>
+                <div class="sheet-grid-table four-col">
+                  <div class="grid-header">Skill</div>
+                  <div class="grid-header">Attr Code</div>
+                  <div class="grid-header">Dice Code</div>
+                  <div class="grid-header">Roll</div>
+
+                  <div class="grid-cell number-cell"><span name="attr_acrobatics_displayname"></span><span name="attr_acrobatics_specialized"></span></div>
+                  <div class="grid-cell number-cell"><span name="attr_acrobatics_attributes"></span></div>
+                  <div class="grid-cell number-cell"><span name="attr_acrobatics_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_acrobatics">Roll</button></div>
+
+                  <div class="grid-cell number-cell"><span name="attr_athletics_displayname"></span><span name="attr_athletics_specialized"></span></div>
+                  <div class="grid-cell number-cell"><span name="attr_athletics_attributes"></span></div>
+                  <div class="grid-cell number-cell"><span name="attr_athletics_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_athletics">Roll</button></div>
+
+                  <div class="grid-cell number-cell"><span name="attr_climbing_displayname"></span><span name="attr_climbing_specialized"></span></div>
+                  <div class="grid-cell number-cell"><span name="attr_climbing_attributes"></span></div>
+                  <div class="grid-cell number-cell"><span name="attr_climbing_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_climbing">Roll</button></div>
+
+                  <div class="grid-cell number-cell"><span name="attr_jumping_displayname"></span><span name="attr_jumping_specialized"></span></div>
+                  <div class="grid-cell number-cell"><span name="attr_jumping_attributes"></span></div>
+                  <div class="grid-cell number-cell"><span name="attr_jumping_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_jumping">Roll</button></div>
+
+                  <div class="grid-cell number-cell"><span name="attr_lifting_displayname"></span><span name="attr_lifting_specialized"></span></div>
+                  <div class="grid-cell number-cell"><span name="attr_lifting_attributes"></span></div>
+                  <div class="grid-cell number-cell"><span name="attr_lifting_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_lifting">Roll</button></div>
+
+                  <div class="grid-cell number-cell"><span name="attr_swimming_displayname"></span><span name="attr_swimming_specialized"></span></div>
+                  <div class="grid-cell number-cell"><span name="attr_swimming_attributes"></span></div>
+                  <div class="grid-cell number-cell"><span name="attr_swimming_string"></span></div>
+                  <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_swimming">Roll</button></div>
+                </div>
               </div>
             </div>
           </div>
@@ -3571,54 +3260,42 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_persuade_displayname"></span><span name="attr_persuade_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_persuade_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_persuade_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_persuade">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_intimidate_displayname"></span><span name="attr_intimidate_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_intimidate_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_intimidate_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_intimidate">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_deceive_displayname"></span><span name="attr_deceive_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_deceive_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_deceive_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_deceive">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_negotiate_displayname"></span><span name="attr_negotiate_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_negotiate_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_negotiate_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_negotiate">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_seduce_displayname"></span><span name="attr_seduce_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_seduce_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_seduce_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_seduce">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_streetwise_displayname"></span><span name="attr_streetwise_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_streetwise_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_streetwise_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_streetwise">Roll</button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_persuade_displayname"></span><span name="attr_persuade_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_persuade_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_persuade_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_persuade">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_intimidate_displayname"></span><span name="attr_intimidate_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_intimidate_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_intimidate_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_intimidate">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_deceive_displayname"></span><span name="attr_deceive_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_deceive_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_deceive_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_deceive">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_negotiate_displayname"></span><span name="attr_negotiate_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_negotiate_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_negotiate_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_negotiate">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_seduce_displayname"></span><span name="attr_seduce_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_seduce_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_seduce_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_seduce">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_streetwise_displayname"></span><span name="attr_streetwise_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_streetwise_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_streetwise_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_streetwise">Roll</button></div>
+              </div>
             </div>
           </div>
 
@@ -3638,42 +3315,32 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_ambush_displayname"></span><span name="attr_ambush_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_ambush_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_ambush_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_ambush">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_hide_displayname"></span><span name="attr_hide_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_hide_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_hide_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_hide">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_sneak_displayname"></span><span name="attr_sneak_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_sneak_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_sneak_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_sneak">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_subtle_displayname"></span><span name="attr_subtle_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_subtle_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_subtle_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_subtle">Roll</button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_ambush_displayname"></span><span name="attr_ambush_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_ambush_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_ambush_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_ambush">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_hide_displayname"></span><span name="attr_hide_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_hide_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_hide_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_hide">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_sneak_displayname"></span><span name="attr_sneak_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_sneak_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_sneak_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_sneak">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_subtle_displayname"></span><span name="attr_subtle_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_subtle_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_subtle_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_subtle">Roll</button></div>
+              </div>
             </div>
           </div>
 
@@ -3693,48 +3360,42 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_cooking_displayname"></span><span name="attr_cooking_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_cooking_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_cooking_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_cooking">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_fletching_displayname"></span><span name="attr_fletching_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_fletching_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_fletching_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_fletching">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_forging_displayname"></span><span name="attr_forging_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_forging_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_forging_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_forging">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_hunting_displayname"></span><span name="attr_hunting_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_hunting_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_hunting_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_hunting">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_tracking_displayname"></span><span name="attr_tracking_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_tracking_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_tracking_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_tracking">Roll</button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_cooking_displayname"></span><span name="attr_cooking_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_cooking_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_cooking_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_cooking">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_fletching_displayname"></span><span name="attr_fletching_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_fletching_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_fletching_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_fletching">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_forging_displayname"></span><span name="attr_forging_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_forging_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_forging_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_forging">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_hunting_displayname"></span><span name="attr_hunting_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_hunting_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_hunting_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_hunting">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_scavenging_displayname"></span><span name="attr_scavenging_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_scavenging_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_scavenging_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_scavenging">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_tracking_displayname"></span><span name="attr_tracking_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_tracking_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_tracking_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_tracking">Roll</button></div>
+              </div>
             </div>
           </div>
 
@@ -3754,54 +3415,42 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_blacksmithing_displayname"></span><span name="attr_blacksmithing_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_blacksmithing_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_blacksmithing_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_blacksmithing">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_carpentry_displayname"></span><span name="attr_carpentry_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_carpentry_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_carpentry_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_carpentry">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_disarm_explosives_displayname"></span><span name="attr_disarm_explosives_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_disarm_explosives_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_disarm_explosives_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_disarm_explosives">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_gunsmithing_displayname"></span><span name="attr_gunsmithing_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_gunsmithing_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_gunsmithing_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_gunsmithing">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_mining_displayname"></span><span name="attr_mining_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_mining_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_mining_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_mining">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_set_explosives_displayname"></span><span name="attr_set_explosives_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_set_explosives_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_set_explosives_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_set_explosives">Roll</button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_blacksmithing_displayname"></span><span name="attr_blacksmithing_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_blacksmithing_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_blacksmithing_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_blacksmithing">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_carpentry_displayname"></span><span name="attr_carpentry_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_carpentry_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_carpentry_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_carpentry">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_disarm_explosives_displayname"></span><span name="attr_disarm_explosives_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_disarm_explosives_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_disarm_explosives_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_disarm_explosives">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_gunsmithing_displayname"></span><span name="attr_gunsmithing_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_gunsmithing_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_gunsmithing_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_gunsmithing">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_mining_displayname"></span><span name="attr_mining_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_mining_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_mining_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_mining">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_set_explosives_displayname"></span><span name="attr_set_explosives_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_set_explosives_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_set_explosives_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_set_explosives">Roll</button></div>
+              </div>
             </div>
           </div>
 
@@ -3821,42 +3470,32 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_cheating_displayname"></span><span name="attr_cheating_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_cheating_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_cheating_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_cheating">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_forgery_displayname"></span><span name="attr_forgery_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_forgery_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_forgery_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_forgery">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_lockpicking_displayname"></span><span name="attr_lockpicking_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_lockpicking_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_lockpicking_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_lockpicking">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_sleight_of_hand_displayname"></span><span name="attr_sleight_of_hand_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_sleight_of_hand_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_sleight_of_hand_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_sleight_of_hand">Roll</button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_cheating_displayname"></span><span name="attr_cheating_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_cheating_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_cheating_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_cheating">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_forgery_displayname"></span><span name="attr_forgery_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_forgery_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_forgery_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_forgery">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_lockpicking_displayname"></span><span name="attr_lockpicking_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_lockpicking_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_lockpicking_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_lockpicking">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_sleight_of_hand_displayname"></span><span name="attr_sleight_of_hand_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_sleight_of_hand_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_sleight_of_hand_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_sleight_of_hand">Roll</button></div>
+              </div>
             </div>
           </div>
 
@@ -3879,30 +3518,22 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_improvised_weapon_displayname"></span><span name="attr_improvised_weapon_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_improvised_weapon_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_improvised_weapon_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_improvised_weapon">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_melee_weapon_displayname"></span><span name="attr_melee_weapon_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_melee_weapon_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_melee_weapon_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_melee_weapon">Roll</button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_improvised_weapon_displayname"></span><span name="attr_improvised_weapon_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_improvised_weapon_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_improvised_weapon_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_improvised_weapon">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_melee_weapon_displayname"></span><span name="attr_melee_weapon_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_melee_weapon_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_melee_weapon_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_melee_weapon">Roll</button></div>
+              </div>
             </div>
           </div>
 
@@ -3922,30 +3553,22 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_rifle_displayname"></span><span name="attr_rifle_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_rifle_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_rifle_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_rifle">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_shotgun_displayname"></span><span name="attr_shotgun_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_shotgun_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_shotgun_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_shotgun">Roll</button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_rifle_displayname"></span><span name="attr_rifle_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_rifle_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_rifle_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_rifle">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_shotgun_displayname"></span><span name="attr_shotgun_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_shotgun_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_shotgun_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_shotgun">Roll</button></div>
+              </div>
             </div>
           </div>
 
@@ -3965,44 +3588,35 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_bow_displayname"></span><span name="attr_bow_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_bow_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_bow_string"></span></td>
-                    <td>
-                      <input type="hidden" name="attr_bow_active" value="2" />
-                      <div class="skill-roll-buttons">
-                        <button type="action" name="act_activate_bow" class="activate-skill-button" title="Activation costs 12 skill points.">Activate</button>
-                        <button type="action" name="act_undo_activate_bow" class="undo-activate-skill-button">Undo Activate</button>
-                        <button type="action" name="act_bow" class="roll-skill-button">Roll</button>
-                        <span class="unactivated-label">Not Activated</span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_slingshot_displayname"></span><span name="attr_slingshot_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_slingshot_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_slingshot_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_slingshot">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_thrown_displayname"></span><span name="attr_thrown_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_thrown_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_thrown_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_thrown">Roll</button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_bow_displayname"></span><span name="attr_bow_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_bow_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_bow_string"></span></div>
+                <div class="grid-cell">
+                  <input type="hidden" name="attr_bow_active" value="2" />
+                  <div class="skill-roll-buttons">
+                    <button type="action" name="act_activate_bow" class="activate-skill-button" title="Activation costs 12 skill points.">Activate</button>
+                    <button type="action" name="act_undo_activate_bow" class="undo-activate-skill-button">Undo Activate</button>
+                    <button type="action" name="act_bow" class="roll-skill-button">Roll</button>
+                    <span class="unactivated-label">Not Activated</span>
+                  </div>
+                </div>
+
+                <div class="grid-cell number-cell"><span name="attr_slingshot_displayname"></span><span name="attr_slingshot_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_slingshot_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_slingshot_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_slingshot">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_thrown_displayname"></span><span name="attr_thrown_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_thrown_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_thrown_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_thrown">Roll</button></div>
+              </div>
               <span class="small-hint">Activating Bow costs 12 skill points.</span>
             </div>
           </div>
@@ -4023,30 +3637,22 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_pistol_displayname"></span><span name="attr_pistol_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_pistol_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_pistol_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_pistol">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_sawed_off_shotgun_displayname"></span><span name="attr_sawed_off_shotgun_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_sawed_off_shotgun_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_sawed_off_shotgun_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_sawed_off_shotgun">Roll</button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_pistol_displayname"></span><span name="attr_pistol_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_pistol_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_pistol_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_pistol">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_sawed_off_shotgun_displayname"></span><span name="attr_sawed_off_shotgun_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_sawed_off_shotgun_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_sawed_off_shotgun_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_sawed_off_shotgun">Roll</button></div>
+              </div>
             </div>
           </div>
 
@@ -4066,50 +3672,40 @@
                 </div>
                 <div class="spacer-sm"></div>
               </div>
-              <table class="sheet-attributes table-equal-width">
-                <thead>
-                  <tr>
-                    <th></th>
-                    <th>Attr Code</th>
-                    <th>Dice Code</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td class="number-cell"><span name="attr_brawling_displayname"></span><span name="attr_brawling_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_brawling_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_brawling_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_brawling">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_martial_arts_displayname"></span><span name="attr_martial_arts_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_martial_arts_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_martial_arts_string"></span></td>
-                    <td>
-                      <input type="hidden" name="attr_martial_arts_active" value="2" />
-                      <div class="skill-roll-buttons">
-                        <button type="action" name="act_activate_martial_arts" class="activate-skill-button" title="Activation costs 12 skill points.">Activate</button>
-                        <button type="action" name="act_undo_activate_martial_arts" class="undo-activate-skill-button">Undo Activate</button>
-                        <button type="action" name="act_martial_arts" class="roll-skill-button">Roll</button>
-                        <span class="unactivated-label">Not Activated</span>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_push_displayname"></span><span name="attr_push_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_push_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_push_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_push">Roll</button></td>
-                  </tr>
-                  <tr>
-                    <td class="number-cell"><span name="attr_wrestling_displayname"></span><span name="attr_wrestling_specialized"></span></td>
-                    <td class="number-cell"><span name="attr_wrestling_attributes"></span></td>
-                    <td class="number-cell"><span name="attr_wrestling_string"></span></td>
-                    <td><button type="action" class="sheet-wildwest" name="act_wrestling">Roll</button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="sheet-grid-table four-col">
+                <div class="grid-header">Skill</div>
+                <div class="grid-header">Attr Code</div>
+                <div class="grid-header">Dice Code</div>
+                <div class="grid-header">Roll</div>
+
+                <div class="grid-cell number-cell"><span name="attr_brawling_displayname"></span><span name="attr_brawling_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_brawling_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_brawling_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_brawling">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_martial_arts_displayname"></span><span name="attr_martial_arts_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_martial_arts_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_martial_arts_string"></span></div>
+                <div class="grid-cell">
+                  <input type="hidden" name="attr_martial_arts_active" value="2" />
+                  <div class="skill-roll-buttons">
+                    <button type="action" name="act_activate_martial_arts" class="activate-skill-button" title="Activation costs 12 skill points.">Activate</button>
+                    <button type="action" name="act_undo_activate_martial_arts" class="undo-activate-skill-button">Undo Activate</button>
+                    <button type="action" name="act_martial_arts" class="roll-skill-button">Roll</button>
+                    <span class="unactivated-label">Not Activated</span>
+                  </div>
+                </div>
+
+                <div class="grid-cell number-cell"><span name="attr_push_displayname"></span><span name="attr_push_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_push_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_push_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_push">Roll</button></div>
+
+                <div class="grid-cell number-cell"><span name="attr_wrestling_displayname"></span><span name="attr_wrestling_specialized"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_wrestling_attributes"></span></div>
+                <div class="grid-cell number-cell"><span name="attr_wrestling_string"></span></div>
+                <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_wrestling">Roll</button></div>
+              </div>
               <span class="small-hint">Activating Martial Arts costs 12 skill points.</span>
             </div>
           </div>
@@ -4125,28 +3721,28 @@
 
           <!-- Middle: Skill Points + Spend -->
           <div class="sheet-controls-group">
-            <label class="sheet-wildwest-label">Move:</label>
-            <input type="text" class="sheet-wildwest sheet-small-input" name="attr_current_move" readonly />
-            <label class="sheet-wildwest-label">Run:</label>
-            <input type="text" class="sheet-wildwest sheet-small-input" name="attr_current_run" readonly />
+            <label class="sheet-d6pp-label">Move:</label>
+            <input type="text" class="sheet-d6pp sheet-small-input" name="attr_current_move" readonly />
+            <label class="sheet-d6pp-label">Run:</label>
+            <input type="text" class="sheet-d6pp sheet-small-input" name="attr_current_run" readonly />
           </div>
 
             <!-- Right: View Inventory -->
           <div class="sheet-controls-group">
-            <button type="action" class="sheet-wildwest" name="act_view_character">View Character</button>
+            <button type="action" class="sheet-d6pp" name="act_view_character">View Character</button>
           </div>
       </div>
 
       <div class="sheet-controls-row" style="justify-content: space-between;">
-        <div class="wildwest-checkbox">
+        <div class="d6pp-checkbox">
           <label class="inline-checkbox-label">
             <input type="checkbox" name="attr_use_encumbrance" checked />
             Use Encumbrance
           </label>
         </div>
         <div style="display: flex; align-items: center; gap: 8px;">
-          <label class="sheet-wildwest-label">Cash:</label>
-          <input type="text" class="sheet-wildwest" name="attr_character_cash" />
+          <label class="sheet-d6pp-label">Cash:</label>
+          <input type="text" class="sheet-d6pp" name="attr_character_cash" />
         </div>
       </div>
       <p>All weights in pounds. Encumbrance assumes you use a horse or a sulky. If you use a wagon ignore Horse Load and Mounted Load. Storage is for items that you do not carry with you, or for items (like horses) that are not carried at all.</p>
@@ -4158,39 +3754,31 @@
               <input type="checkbox" class="skill-toggle" id="toggle_details" name="attr_toggle_details" value="1" checked hidden />
               <label class="skill-toggle-label" for="toggle_details">Encumbrance Table</label>
               <div class="skill-group-content">
-                <table class="sheet-attributes">
-                  <thead>
-                    <tr>
-                      <th></th>
-                      <th>Capacity (lbs)</th>
-                      <th>-5 Move/Run</th>
-                      <th>-10 Move/Run</th>
-                      <th>-15 Move/Run</th>
-                      <th>-20 Move/Run</th>
-                      <th>-25 Move/Run</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr>
-                      <td><strong>Character</strong></td>
-                      <td><input type="text" class="sheet-wildwest sheet-small-input" name="attr_character_capacity" readonly /></td>
-                      <td><input type="text" class="sheet-wildwest sheet-small-input" name="attr_character_enc_5" readonly /></td>
-                      <td><input type="text" class="sheet-wildwest sheet-small-input" name="attr_character_enc_10" readonly /></td>
-                      <td><input type="text" class="sheet-wildwest sheet-small-input" name="attr_character_enc_15" readonly /></td>
-                      <td><input type="text" class="sheet-wildwest sheet-small-input" name="attr_character_enc_20" readonly /></td>
-                      <td><input type="text" class="sheet-wildwest sheet-small-input" name="attr_character_enc_25" readonly /></td>
-                    </tr>
-                    <tr>
-                      <td><strong>Horse</strong></td>
-                      <td><input type="text" class="sheet-wildwest sheet-small-input" name="attr_horse_capacity" readonly value="250"/></td>
-                      <td><input type="text" class="sheet-wildwest sheet-small-input" name="attr_horse_enc_5" readonly value = "275"/></td>
-                      <td><input type="text" class="sheet-wildwest sheet-small-input" name="attr_horse_enc_10" readonly value = "300"/></td>
-                      <td><input type="text" class="sheet-wildwest sheet-small-input" name="attr_horse_enc_15" readonly value = "325"/></td>
-                      <td><input type="text" class="sheet-wildwest sheet-small-input" name="attr_horse_enc_20" readonly value = "350"/></td>
-                      <td><input type="text" class="sheet-wildwest sheet-small-input" name="attr_horse_enc_25" readonly value = "375"/></td>
-                    </tr>
-                  </tbody>
-                </table>
+                <div class="sheet-grid-table seven-col full-width">
+                  <div class="grid-header"></div>
+                  <div class="grid-header">Capacity (lbs)</div>
+                  <div class="grid-header">-5 Move/Run</div>
+                  <div class="grid-header">-10 Move/Run</div>
+                  <div class="grid-header">-15 Move/Run</div>
+                  <div class="grid-header">-20 Move/Run</div>
+                  <div class="grid-header">-25 Move/Run</div>
+
+                  <div class="grid-cell"><strong>Character</strong></div>
+                  <div class="grid-cell"><input type="text" class="sheet-d6pp sheet-small-input" name="attr_character_capacity" readonly /></div>
+                  <div class="grid-cell"><input type="text" class="sheet-d6pp sheet-small-input" name="attr_character_enc_5" readonly /></div>
+                  <div class="grid-cell"><input type="text" class="sheet-d6pp sheet-small-input" name="attr_character_enc_10" readonly /></div>
+                  <div class="grid-cell"><input type="text" class="sheet-d6pp sheet-small-input" name="attr_character_enc_15" readonly /></div>
+                  <div class="grid-cell"><input type="text" class="sheet-d6pp sheet-small-input" name="attr_character_enc_20" readonly /></div>
+                  <div class="grid-cell"><input type="text" class="sheet-d6pp sheet-small-input" name="attr_character_enc_25" readonly /></div>
+
+                  <div class="grid-cell"><strong>Horse</strong></div>
+                  <div class="grid-cell"><input type="text" class="sheet-d6pp sheet-small-input" name="attr_horse_capacity" readonly value="250" /></div>
+                  <div class="grid-cell"><input type="text" class="sheet-d6pp sheet-small-input" name="attr_horse_enc_5" readonly value="275" /></div>
+                  <div class="grid-cell"><input type="text" class="sheet-d6pp sheet-small-input" name="attr_horse_enc_10" readonly value="300" /></div>
+                  <div class="grid-cell"><input type="text" class="sheet-d6pp sheet-small-input" name="attr_horse_enc_15" readonly value="325" /></div>
+                  <div class="grid-cell"><input type="text" class="sheet-d6pp sheet-small-input" name="attr_horse_enc_20" readonly value="350" /></div>
+                  <div class="grid-cell"><input type="text" class="sheet-d6pp sheet-small-input" name="attr_horse_enc_25" readonly value="375" /></div>
+                </div>
               </div>
             </div>
           </div>
@@ -4199,59 +3787,60 @@
 
         <div class="spacer-sm"></div>
         <div class="sheet-character-inventory-grid">
-          <label class="sheet-wildwest-label">Equipped:</label>
-          <input type="text" class="sheet-wildwest sheet-small-input" name="attr_equipped_weight_total" readonly />
+          <label class="sheet-d6pp-label">Equipped:</label>
+          <input type="text" class="sheet-d6pp sheet-small-input" name="attr_equipped_weight_total" readonly />
 
-          <label class="sheet-wildwest-label">Horse Load:</label>
-          <input type="text" class="sheet-wildwest sheet-small-input" name="attr_horse_weight_total" readonly />
+          <label class="sheet-d6pp-label">Horse Load:</label>
+          <input type="text" class="sheet-d6pp sheet-small-input" name="attr_horse_weight_total" readonly />
 
-          <label class="sheet-wildwest-label">Mounted Load:</label>
-          <input type="text" class="sheet-wildwest sheet-small-input" name="attr_mounted_weight_total" readonly />
+          <label class="sheet-d6pp-label">Mounted Load:</label>
+          <input type="text" class="sheet-d6pp sheet-small-input" name="attr_mounted_weight_total" readonly />
         </div>
         <div class="sheet-view-wrapper">
           <input type="hidden" name="attr_encumbrance_visible" />
           <div class="sheet-encumbrance-section">
             <div class="sheet-character-inventory-grid">
-              <label class="sheet-wildwest-label">Effect:</label>
-              <input type="text" class="sheet-wildwest" name="attr_encumbrance_text" readonly />
-              <label class="sheet-wildwest-label">Effect:</label>
-              <input type="text" class="sheet-wildwest" name="attr_horse_encumbrance_text" readonly />
-              <label class="sheet-wildwest-label">Effect:</label>
-              <input type="text" class="sheet-wildwest" name="attr_mounted_encumbrance_text" readonly />
+              <label class="sheet-d6pp-label">Effect:</label>
+              <input type="text" class="sheet-d6pp" name="attr_encumbrance_text" readonly />
+              <label class="sheet-d6pp-label">Effect:</label>
+              <input type="text" class="sheet-d6pp" name="attr_horse_encumbrance_text" readonly />
+              <label class="sheet-d6pp-label">Effect:</label>
+              <input type="text" class="sheet-d6pp" name="attr_mounted_encumbrance_text" readonly />
             </div>
           </div>
         </div>
         <fieldset class="repeating_inventory">
-          <button class="myrol" type="compendium" name="attr_fromcompendium" data-i18n-title="open-compendium-item" title="Open Compendium Item" hidden></button>
-          <div class="inventory-card">
-            <div class="inventory-card-header">
-              <div class="inventory-field">
-                <input type="text" name="attr_item_name" class="inventory-item-name"  placeholder="Name"/>
+          <div class="compendium-drop-target">
+            <div class="inventory-card">
+              <div class="inventory-card-header">
+                <div class="inventory-field">
+                  <input type="text" name="attr_item_name" class="inventory-item-name"  placeholder="Name" accept="item_name"/>
+                </div>
+
+                <div class="inventory-field">
+                  <label class="inventory-labeled-input">Qty:
+                    <input type="number" name="attr_item_qty" class="sheet-d6pp inventory-input qty-input" accept="item_qty"/>
+                  </label>
+                </div>
+
+                <div class="inventory-field">
+                  <label class="inventory-labeled-input">Wt:
+                    <input type="number" step="0.1" name="attr_item_weight" class="sheet-d6pp inventory-input weight-input" accept="item_weight"/>
+                  </label>
+                </div>
+
+                <div class="inventory-field">
+                  <select name="attr_item_location" class="inventory-item-location" accept="item_location">
+                    <option value="equipped">Equipped</option>
+                    <option value="horse">On Horse</option>
+                    <option value="storage">Storage</option>
+                  </select>
+                </div>
               </div>
 
-              <div class="inventory-field">
-                <label class="inventory-labeled-input">Qty:
-                  <input type="number" name="attr_item_qty" class="sheet-wildwest inventory-input qty-input" />
-                </label>
+              <div class="inventory-card-description">
+                <textarea name="attr_item_description" placeholder="Description..." accept="item_description"></textarea>
               </div>
-
-              <div class="inventory-field">
-                <label class="inventory-labeled-input">Wt:
-                  <input type="number" step="0.1" name="attr_item_weight" class="sheet-wildwest inventory-input weight-input" />
-                </label>
-              </div>
-
-              <div class="inventory-field">
-                <select name="attr_item_location" class="inventory-item-location">
-                  <option value="equipped">Equipped</option>
-                  <option value="horse">On Horse</option>
-                  <option value="storage">Storage</option>
-                </select>
-              </div>
-            </div>
-
-            <div class="inventory-card-description">
-              <textarea name="attr_item_description" placeholder="Description..."></textarea>
             </div>
           </div>
         </fieldset>
@@ -4269,8 +3858,8 @@
   <div class="sheet-controls-row" style="justify-content: space-between;">
     <!-- Left: Expand/Collapse -->
     <div>
-      <button type="action" class="sheet-wildwest" name="act_expand_all">Expand All</button>
-      <button type="action" class="sheet-wildwest" name="act_collapse_all">Collapse All</button>
+      <button type="action" class="sheet-d6pp" name="act_expand_all">Expand All</button>
+      <button type="action" class="sheet-d6pp" name="act_collapse_all">Collapse All</button>
     </div>
   </div>
     <!-- Character Info Grid -->
@@ -4279,27 +3868,27 @@
       <label class="skill-toggle-label" for="toggle_details">Character Details</label>
       <div class="skill-group-content">
 
-        <label class="sheet-wildwest-label">Name:</label>
-        <input type="text" class="sheet-wildwest" name="attr_character_name" />
+        <label class="sheet-d6pp-label">Name:</label>
+        <input type="text" class="sheet-d6pp" name="attr_character_name" />
         <div class="spacer-sm"></div>
-        <label class="sheet-wildwest-label">Description:</label>
-        <textarea class="sheet-wildwest" name="attr_character_description"></textarea>
+        <label class="sheet-d6pp-label">Description:</label>
+        <textarea class="sheet-d6pp" name="attr_character_description"></textarea>
         <div class="spacer-sm"></div>
           <!-- GM Whisper + Move/Run/Advantage Row -->
         <div class="sheet-controls-row" style="justify-content: space-between;">
-          <div class="wildwest-checkbox">
+          <div class="d6pp-checkbox">
             <label class="inline-checkbox-label">
               <input type="checkbox" name="attr_whisper_toggle" value="/w gm " />
               Whisper to GM
             </label>
           </div>
           <div style="display: flex; align-items: center; gap: 8px;">
-            <label class="sheet-wildwest-label">Move:</label>
-            <input type="text" class="sheet-wildwest sheet-small-input" name="attr_current_move" readonly />
-            <label class="sheet-wildwest-label">Run:</label>
-            <input type="text" class="sheet-wildwest sheet-small-input" name="attr_current_run" readonly />
-            <label class="sheet-wildwest-label">Advantage:</label>
-            <input type="number" class="sheet-wildwest" name="attr_advantage" />
+            <label class="sheet-d6pp-label">Move:</label>
+            <input type="text" class="sheet-d6pp sheet-small-input" name="attr_current_move" readonly />
+            <label class="sheet-d6pp-label">Run:</label>
+            <input type="text" class="sheet-d6pp sheet-small-input" name="attr_current_run" readonly />
+            <label class="sheet-d6pp-label">Advantage:</label>
+            <input type="number" class="sheet-d6pp" name="attr_advantage" />
           </div>
         </div>
       </div>
@@ -4316,11 +3905,11 @@
           <div class="action-grid-header">On Your Turn</div>
           <!-- Row 2: Pre-Action / Significant Action -->
           <div>
-            <label class="sheet-wildwest-label">Pre-Action (start of round)</label>
+            <label class="sheet-d6pp-label">Pre-Action (start of round)</label>
             <div class="inline-action-row">
               <input type="hidden" name="attr_preaction_ignorepain_active" value="0" />
               <input type="hidden" name="attr_preaction_disengage_active" value="0" />
-              <select class="preaction-normal sheet-wildwest-select" name="attr_preaction_selection_normal">
+              <select class="preaction-normal sheet-d6pp-select" name="attr_preaction_selection_normal">
                 <option value="None">None</option>
                 <option value="Dodge">Dodge</option>
                 <option value="Power Strike">Power Strike</option>
@@ -4334,9 +3923,9 @@
             </div>
           </div>
           <div>
-            <label class="sheet-wildwest-label">Significant Action</label>
+            <label class="sheet-d6pp-label">Significant Action</label>
             <div class="inline-action-row">
-              <select class="sheet-wildwest-select" name="attr_significant_action_selection">
+              <select class="sheet-d6pp-select" name="attr_significant_action_selection">
                 <option value="None">None</option>
                 <option value="Attack">Attack</option>
                 <option value="Skill Check">Make a Skill Check</option>
@@ -4350,12 +3939,12 @@
           </div>
           <!-- Row 3: Reaction / Simple Action -->
           <div>
-            <label class="sheet-wildwest-label">Reaction (once per turn)</label>
+            <label class="sheet-d6pp-label">Reaction (once per turn)</label>
             <div class="inline-action-row">
               <input type="hidden" name="attr_reaction_fixit_active" value="0" />
               <input type="hidden" name="attr_reaction_medic_active" value="0" />
               <input type="hidden" name="attr_reaction_mode" value="normal" />
-              <select class="reaction-normal sheet-wildwest-select" name="attr_reaction_selection_normal">
+              <select class="reaction-normal sheet-d6pp-select" name="attr_reaction_selection_normal">
                 <option value="None">None</option>
                 <option value="Block">Block</option>
                 <option value="Impede">Impede</option>
@@ -4369,8 +3958,8 @@
             </div>
           </div>
           <div>
-            <label class="sheet-wildwest-label">Simple Action</label>
-            <select class="sheet-wildwest-select" name="attr_simple_action_selection">
+            <label class="sheet-d6pp-label">Simple Action</label>
+            <select class="sheet-d6pp-select" name="attr_simple_action_selection">
               <option value="None">None</option>
               <option value="Use an item">Use an item</option>
               <option value="Open/close door">Open/close door</option>
@@ -4387,20 +3976,20 @@
           <div class="sheet-controls-group">
             <input type="hidden" name="attr_preaction_selection_normal" />
             <div class="sheet-dodge-toggle">
-              <label class="sheet-wildwest-label" style="margin: 0; display: inline;">Times Attacked:</label>
-              <input type="number" class="sheet-wildwest" name="attr_times_attacked" />
+              <label class="sheet-d6pp-label" style="margin: 0; display: inline;">Times Attacked:</label>
+              <input type="number" class="sheet-d6pp" name="attr_times_attacked" />
             </div>
             <div class="sheet-controls-group">
               <input type="hidden" name="attr_preaction_selection_normal" />
               <div class="sheet-dodge-toggle">
-                <button type="action" class="sheet-wildwest" name="act_dodge">Roll Dodge</button>
-                <input type="text" class="sheet-wildwest sheet-small-input" name="attr_dodge_value" readonly />
+                <button type="action" class="sheet-d6pp" name="act_dodge">Roll Dodge</button>
+                <input type="text" class="sheet-d6pp sheet-small-input" name="attr_dodge_value" readonly />
               </div>
             </div>
           </div>
 
           <div class="sheet-controls-group">
-            <button type="action" class="sheet-wildwest" name="act_new_turn">New Turn</button>
+            <button type="action" class="sheet-d6pp" name="act_new_turn">New Turn</button>
           </div>
 
         </div>
@@ -4412,37 +4001,30 @@
       <input type="checkbox" class="skill-toggle" id="toggle_skillcheck" name="attr_toggle_skillcheck" value="1" checked hidden />
       <label class="skill-toggle-label" for="toggle_skillcheck">Skill Check</label>
       <div class="skill-group-content">
-        <table class="sheet-attributes">
-          <thead>
-            <tr>
-              <th>Target Number</th>
-              <th>Challenge Rating</th>
-              <th>Times Attacked</th>
-              <th>Modifier</th>
-              <th>Wound Penalty</th>
-              <th>Mounted Penalty</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td class="target-number-cell"><span name="attr_skill_check_target">0</span></td>
-              <td>
-                <select name="attr_skillcheck_cr">
-                  <option value="0">Trivial</option>
-                  <option value="5">Easy (+5)</option>
-                  <option value="10">Moderate (+10)</option>
-                  <option value="15">Hard (+15)</option>
-                  <option value="20">Very Hard (+20)</option>
-                  <option value="25">Extremely Hard (+25)</option>
-                </select>
-              </td>
-              <td class="number-cell"><span name="attr_times_attacked">0</span></td>
-              <td><input type="number" name="attr_skillcheck_modifier" value="0" /></td>
-              <td class="number-cell"><span name="attr_skillcheck_wound_penalty">0</span></td>
-              <td class="number-cell"><span name="attr_skillcheck_mounted_penalty">0</span></td>
-            </tr>
-          </tbody>
-        </table>
+        <div class="sheet-grid-table six-col full-width">
+          <div class="grid-header">Target Number</div>
+          <div class="grid-header">Challenge Rating</div>
+          <div class="grid-header">Times Attacked</div>
+          <div class="grid-header">Modifier</div>
+          <div class="grid-header">Wound Penalty</div>
+          <div class="grid-header">Mounted Penalty</div>
+
+          <div class="grid-cell target-number-cell"><span name="attr_skill_check_target">0</span></div>
+          <div class="grid-cell">
+            <select name="attr_skillcheck_cr" class="sheet-d6pp-select">
+              <option value="0">Trivial</option>
+              <option value="5">Easy (+5)</option>
+              <option value="10">Moderate (+10)</option>
+              <option value="15">Hard (+15)</option>
+              <option value="20">Very Hard (+20)</option>
+              <option value="25">Extremely Hard (+25)</option>
+            </select>
+          </div>
+          <div class="grid-cell number-cell"><span name="attr_times_attacked">0</span></div>
+          <div class="grid-cell"><input type="number" name="attr_skillcheck_modifier" class="sheet-d6pp" value="0" /></div>
+          <div class="grid-cell number-cell"><span name="attr_skillcheck_wound_penalty">0</span></div>
+          <div class="grid-cell number-cell"><span name="attr_skillcheck_mounted_penalty">0</span></div>
+        </div>
         <span class="small-hint">Each attack during Dodge adds +3 to your TN. Modifier includes Help, Prep, and situational bonuses.</span>
       </div>
     </div>
@@ -4452,51 +4034,50 @@
       <input type="checkbox" class="skill-toggle" id="toggle_combat" name="attr_toggle_combat" value="1" checked hidden />
       <label class="skill-toggle-label" for="toggle_combat">Combat</label>
       <div class="skill-group-content">
-        <table class="sheet-attributes">
-          <thead>
-            <tr>
-              <th>Target Number</th>
-              <th>Range</th>
-              <th>Cover</th>
-              <th>Opponent's Dodge</th>
-              <th>Times Attacked</th>
-              <th>Modifier</th>
-              <th>Wound Penalty</th>
-              <th>Mounted Penalty</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td class="target-number-cell"><span name="attr_combat_target">0</span></td>
-              <td>
-                <select name="attr_combat_range">
-                  <option value="5">Point Blank (5)</option>
-                  <option value="10">Short (10)</option>
-                  <option value="15">Medium (15)</option>
-                  <option value="20">Long (20)</option>
-                  <option value="25">Extreme (25)</option>
-                </select>
-              </td>
-              <td>
-                <select name="attr_combat_cover">
-                  <option value="0">None (0)</option>
-                  <option value="5">Light (5)</option>
-                  <option value="10">Half (10)</option>
-                  <option value="15">Heavy (15)</option>
-                  <option value="30">Full (30)</option>
-                </select>
-              </td>
-              <td><input type="number" name="attr_combat_opponent_dodge" value="0" min="0" /></td>
-              <td class="number-cell"><span name="attr_times_attacked">0</span></td>
-              <td><input type="number" name="attr_combat_modifier" value="0" /></td>
-              <td class="number-cell"><span name="attr_skillcheck_wound_penalty">0</span></td>
-              <td class="number-cell"><span name="attr_skillcheck_mounted_penalty">0</span></td>
-            </tr>
-          </tbody>
-        </table>
+        <div class="sheet-grid-table eight-col full-width">
+
+          <!-- Headers -->
+          <div class="grid-header">Target Number</div>
+          <div class="grid-header">Range</div>
+          <div class="grid-header">Cover</div>
+          <div class="grid-header">Opponent's Dodge</div>
+          <div class="grid-header">Times Attacked</div>
+          <div class="grid-header">Modifier</div>
+          <div class="grid-header">Wound Penalty</div>
+          <div class="grid-header">Mounted Penalty</div>
+
+          <!-- Row values -->
+          <div class="grid-cell target-number-cell"><span name="attr_combat_target">0</span></div>
+          <div class="grid-cell">
+            <select name="attr_combat_range" class="sheet-d6pp-select">
+              <option value="5">Point Blank (5)</option>
+              <option value="10">Short (10)</option>
+              <option value="15">Medium (15)</option>
+              <option value="20">Long (20)</option>
+              <option value="25">Extreme (25)</option>
+            </select>
+          </div>
+          <div class="grid-cell">
+            <select name="attr_combat_cover" class="sheet-d6pp-select">
+              <option value="0">None (0)</option>
+              <option value="5">Light (5)</option>
+              <option value="10">Half (10)</option>
+              <option value="15">Heavy (15)</option>
+              <option value="30">Full (30)</option>
+            </select>
+          </div>
+          <div class="grid-cell">
+            <input type="number" name="attr_combat_opponent_dodge" class="sheet-d6pp" value="0" min="0" />
+          </div>
+          <div class="grid-cell"><span name="attr_times_attacked">0</span></div>
+          <div class="grid-cell"><input type="number" name="attr_combat_modifier" class="sheet-d6pp" value="0" /></div>
+          <div class="grid-cell"><span name="attr_skillcheck_wound_penalty">0</span></div>
+          <div class="grid-cell"><span name="attr_skillcheck_mounted_penalty">0</span></div>
+
+        </div>
         <span class="small-hint">Each attack during Dodge adds +3 to your TN. Modifier includes Help, Prep, and situational bonuses.</span>
         <div class="spacer-md"></div>
-        <label class="sheet-wildwest-label">Select a Form of Attack</label>
+        <label class="sheet-d6pp-label">Select a Form of Attack</label>
         <div class="sheet-attack-tabs">
           <!-- Radio buttons -->
           <input type="radio" name="attr_attack_mode_q" value="firearms" class="sheet-tab" checked />
@@ -4507,128 +4088,146 @@
           <span>Melee</span>
           <div class="spacer-sm"></div>
           <div class="sheet-attack-section sheet-firearms">
-            <table class="sheet-attributes">
-              <thead>
-                <tr>
-                  <th>Weapon</th>
-                  <th>Dice</th>
-                  <th>Damage</th>
-                  <th>Ammo</th>
-                  <th>Short</th>
-                  <th>Medium</th>
-                  <th>Long</th>
-                  <th>Extreme</th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <td>
-                    <select name="attr_firearm1_weapon">
-                      <option value="None">None</option>
-                      <option value="Revolver">Revolver</option>
-                      <option value="Derringer">Derringer</option>
-                      <option value="Lever-Action Rifle">Lever-Action Rifle</option>
-                      <option value="Single Shot Rifle">Single Shot Rifle</option>
-                      <option value="Shotgun">Shotgun</option>
-                      <option value="Sawed-off Shotgun">Sawed-off Shotgun</option>
-                    </select>
-                  </td>
-                  <td>
-                    <span class="wildwest-span" name="attr_firearm1_actual"></span><br />
-                    <button type="action" class="sheet-wildwest" name="act_firearm1_attack">Roll</button>
-                  </td>
-                  <td>
-                    <span class="wildwest-span" name="attr_firearm1_damage"></span><br />
-                    <button type="action" class="sheet-wildwest" name="act_firearm1_damage">Damage</button>
-                  </td>
-                  <td>
-                    <button type="action" class="sheet-wildwest" name="act_firearm1_ammo_add">+</button>
-                    <button type="action" class="sheet-wildwest" name="act_firearm1_ammo_sub">−</button><br />
-                    <button type="action" class="sheet-wildwest" name="act_firearm1_ammo_reload">Reload</button>
-                  </td>
-                  <td><span class="wildwest-span" name="attr_firearm1_short"></span></td>
-                  <td><span class="wildwest-span" name="attr_firearm1_medium"></span></td>
-                  <td><span class="wildwest-span" name="attr_firearm1_long"></span></td>
-                  <td><span class="wildwest-span" name="attr_firearm1_extreme"></span></td>
-                </tr>
-                <tr>
-                  <td colspan="10" style="text-align: left;">
-                    <span class="sheet-ammo-display" name="attr_firearm1_ammo_display"></span>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <select name="attr_firearm2_weapon">
-                      <option value="None">None</option>
-                      <option value="Revolver">Revolver</option>
-                      <option value="Derringer">Derringer</option>
-                      <option value="Lever-Action Rifle">Lever-Action Rifle</option>
-                      <option value="Single Shot Rifle">Single Shot Rifle</option>
-                      <option value="Shotgun">Shotgun</option>
-                      <option value="Sawed-off Shotgun">Sawed-off Shotgun</option>
-                    </select>
-                  </td>
-                  <td>
-                    <span class="wildwest-span" name="attr_firearm2_actual"></span><br />
-                    <button type="action" class="sheet-wildwest" name="act_firearm2_attack">Roll</button>
-                  </td>
-                  <td>
-                    <span class="wildwest-span" name="attr_firearm2_damage"></span><br />
-                    <button type="action" class="sheet-wildwest" name="act_firearm2_damage">Damage</button>
-                  </td>
-                  <td>
-                    <button type="action" class="sheet-wildwest" name="act_firearm2_ammo_add">+</button>
-                    <button type="action" class="sheet-wildwest" name="act_firearm2_ammo_sub">−</button><br />
-                    <button type="action" class="sheet-wildwest" name="act_firearm2_ammo_reload">Reload</button>
-                  </td>
-                  <td><span class="wildwest-span" name="attr_firearm2_short"></span></td>
-                  <td><span class="wildwest-span" name="attr_firearm2_medium"></span></td>
-                  <td><span class="wildwest-span" name="attr_firearm2_long"></span></td>
-                  <td><span class="wildwest-span" name="attr_firearm2_extreme"></span></td>
-                </tr>
-                <tr>
-                  <td colspan="10" style="text-align: left;">
-                    <span class="sheet-ammo-display" name="attr_firearm2_ammo_display"></span>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <select name="attr_firearm3_weapon">
-                      <option value="None">None</option>
-                      <option value="Revolver">Revolver</option>
-                      <option value="Derringer">Derringer</option>
-                      <option value="Lever-Action Rifle">Lever-Action Rifle</option>
-                      <option value="Single Shot Rifle">Single Shot Rifle</option>
-                      <option value="Shotgun">Shotgun</option>
-                      <option value="Sawed-off Shotgun">Sawed-off Shotgun</option>
-                    </select>
-                  </td>
-                  <td>
-                    <span class="wildwest-span" name="attr_firearm3_actual"></span><br />
-                    <button type="action" class="sheet-wildwest" name="act_firearm3_attack">Roll</button>
-                  </td>
-                  <td>
-                    <span class="wildwest-span" name="attr_firearm3_damage"></span><br />
-                    <button type="action" class="sheet-wildwest" name="act_firearm3_damage">Damage</button>
-                  </td>
-                  <td>
-                    <button type="action" class="sheet-wildwest" name="act_firearm3_ammo_add">+</button>
-                    <button type="action" class="sheet-wildwest" name="act_firearm3_ammo_sub">−</button><br />
-                    <button type="action" class="sheet-wildwest" name="act_firearm3_ammo_reload">Reload</button>
-                  </td>
-                  <td><span class="wildwest-span" name="attr_firearm3_short"></span></td>
-                  <td><span class="wildwest-span" name="attr_firearm3_medium"></span></td>
-                  <td><span class="wildwest-span" name="attr_firearm3_long"></span></td>
-                  <td><span class="wildwest-span" name="attr_firearm3_extreme"></span></td>
-                </tr>
-                <tr>
-                  <td colspan="10" style="text-align: left;">
-                    <span class="sheet-ammo-display" name="attr_firearm3_ammo_display"></span>
-                  </td>
-                </tr>
+            <!-- Weapon 1 -->
+            <div class="sheet-grid-attack sheet-grid-firearms full-width">
+              <!-- Headers -->
+              <div class="grid-header">Weapon</div>
+              <div class="grid-header">Dice</div>
+              <div class="grid-header">Damage</div>
+              <div class="grid-header">Ammo</div>
+              <div class="grid-header">Short</div>
+              <div class="grid-header">Medium</div>
+              <div class="grid-header">Long</div>
+              <div class="grid-header">Extreme</div>
+
+              <!-- Row 1: Weapon 1 -->
+              <div class="grid-cell stack-weapon">
+                <select name="attr_firearm1_weapon" class="sheet-d6pp-select">
+                  <option value="None">None</option>
+                  <option value="Revolver">Revolver</option>
+                  <option value="Derringer">Derringer</option>
+                  <option value="Lever-Action Rifle">Lever-Action Rifle</option>
+                  <option value="Single Shot Rifle">Single Shot Rifle</option>
+                  <option value="Shotgun">Shotgun</option>
+                  <option value="Sawed-off Shotgun">Sawed-off Shotgun</option>
+                </select>
+              </div>
+
+              <div class="grid-cell stack-tight">
+                <span name="attr_firearm1_actual"></span>
+                <button type="action" name="act_firearm1_attack">Roll</button>
+              </div>
+
+              <div class="grid-cell stack-tight">
+                <span name="attr_firearm1_damage"></span>
+                <button type="action" name="act_firearm1_damage">Damage</button>
+              </div>
+
+              <div class="grid-cell stack-tight">
+                <div class="ammo-button-row">
+                  <button type="action" name="act_firearm1_ammo_add">+</button>
+                  <button type="action" name="act_firearm1_ammo_sub">−</button>
+                </div>
+                <button type="action" name="act_firearm1_ammo_reload">Reload</button>
+              </div>
+
+              <div class="grid-cell"><span name="attr_firearm1_short"></span></div>
+              <div class="grid-cell"><span name="attr_firearm1_medium"></span></div>
+              <div class="grid-cell"><span name="attr_firearm1_long"></span></div>
+              <div class="grid-cell"><span name="attr_firearm1_extreme"></span></div>
+
+              <!-- Ammo Display Row -->
+              <div class="grid-cell ammo-display full-row"> <!-- not grid-span-8 -->
+                <span name="attr_firearm1_ammo_display"></span>
+              </div>
+            </div>
+            <!-- Weapon 2 -->
+            <div class="sheet-grid-attack sheet-grid-firearms full-width">
+              <!-- Row 1: Weapon 2 -->
+              <div class="grid-cell stack-weapon">
+                <select name="attr_firearm2_weapon" class="sheet-d6pp-select">
+                  <option value="None">None</option>
+                  <option value="Revolver">Revolver</option>
+                  <option value="Derringer">Derringer</option>
+                  <option value="Lever-Action Rifle">Lever-Action Rifle</option>
+                  <option value="Single Shot Rifle">Single Shot Rifle</option>
+                  <option value="Shotgun">Shotgun</option>
+                  <option value="Sawed-off Shotgun">Sawed-off Shotgun</option>
+                </select>
+              </div>
+
+              <div class="grid-cell stack-tight">
+                <span name="attr_firearm2_actual"></span>
+                <button type="action" name="act_firearm2_attack">Roll</button>
+              </div>
+
+              <div class="grid-cell stack-tight">
+                <span name="attr_firearm2_damage"></span>
+                <button type="action" name="act_firearm2_damage">Damage</button>
+              </div>
+
+              <div class="grid-cell stack-tight">
+                <div class="ammo-button-row">
+                  <button type="action" name="act_firearm2_ammo_add">+</button>
+                  <button type="action" name="act_firearm2_ammo_sub">−</button>
+                </div>
+                <button type="action" name="act_firearm2_ammo_reload">Reload</button>
+              </div>
+
+              <div class="grid-cell"><span name="attr_firearm2_short"></span></div>
+              <div class="grid-cell"><span name="attr_firearm2_medium"></span></div>
+              <div class="grid-cell"><span name="attr_firearm2_long"></span></div>
+              <div class="grid-cell"><span name="attr_firearm2_extreme"></span></div>
+
+              <!-- Ammo Display Row -->
+              <div class="grid-cell ammo-display full-row"> <!-- not grid-span-8 -->
+                <span name="attr_firearm2_ammo_display"></span>
+              </div>
+            </div>
+            <!-- Weapon 3 -->
+            <div class="sheet-grid-attack sheet-grid-firearms full-width">
+              <!-- Row 1: Weapon 3 -->
+              <div class="grid-cell stack-weapon">
+                <select name="attr_firearm3_weapon" class="sheet-d6pp-select">
+                  <option value="None">None</option>
+                  <option value="Revolver">Revolver</option>
+                  <option value="Derringer">Derringer</option>
+                  <option value="Lever-Action Rifle">Lever-Action Rifle</option>
+                  <option value="Single Shot Rifle">Single Shot Rifle</option>
+                  <option value="Shotgun">Shotgun</option>
+                  <option value="Sawed-off Shotgun">Sawed-off Shotgun</option>
+                </select>
+              </div>
+
+              <div class="grid-cell stack-tight">
+                <span name="attr_firearm3_actual"></span>
+                <button type="action" name="act_firearm3_attack">Roll</button>
+              </div>
+
+              <div class="grid-cell stack-tight">
+                <span name="attr_firearm3_damage"></span>
+                <button type="action" name="act_firearm3_damage">Damage</button>
+              </div>
+
+              <div class="grid-cell stack-tight">
+                <div class="ammo-button-row">
+                  <button type="action" name="act_firearm3_ammo_add">+</button>
+                  <button type="action" name="act_firearm3_ammo_sub">−</button>
+                </div>
+                <button type="action" name="act_firearm3_ammo_reload">Reload</button>
+              </div>
+
+              <div class="grid-cell"><span name="attr_firearm3_short"></span></div>
+              <div class="grid-cell"><span name="attr_firearm3_medium"></span></div>
+              <div class="grid-cell"><span name="attr_firearm3_long"></span></div>
+              <div class="grid-cell"><span name="attr_firearm3_extreme"></span></div>
+
+              <!-- Ammo Display Row -->
+              <div class="grid-cell ammo-display full-row last-row">
+                <span name="attr_firearm3_ammo_display"></span>
+              </div>
+            </div>
 
-              </tbody>
-            </table>
           </div>
           <div class="sheet-attack-section sheet-ranged">
             <table class="sheet-attributes">
@@ -4656,17 +4255,17 @@
                     </select>
                   </td>
                   <td>
-                    <span class="wildwest-span" name="attr_ranged_actual"></span><br />
-                    <button type="action" class="sheet-wildwest" name="act_ranged_attack">Roll</button>
+                    <span class="d6pp-span" name="attr_ranged_actual"></span><br />
+                    <button type="action" class="sheet-d6pp" name="act_ranged_attack">Roll</button>
                   </td>
                   <td>
-                    <span class="wildwest-span" name="attr_ranged_damage"></span><br />
-                    <button type="action" class="sheet-wildwest" name="act_ranged_damage">Damage</button>
+                    <span class="d6pp-span" name="attr_ranged_damage"></span><br />
+                    <button type="action" class="sheet-d6pp" name="act_ranged_damage">Damage</button>
                   </td>
-                  <td><span class="wildwest-span" name="attr_ranged_short"></span></td>
-                  <td><span class="wildwest-span" name="attr_ranged_medium"></span></td>
-                  <td><span class="wildwest-span" name="attr_ranged_long"></span></td>
-                  <td><span class="wildwest-span" name="attr_ranged_extreme"></span></td>
+                  <td><span class="d6pp-span" name="attr_ranged_short"></span></td>
+                  <td><span class="d6pp-span" name="attr_ranged_medium"></span></td>
+                  <td><span class="d6pp-span" name="attr_ranged_long"></span></td>
+                  <td><span class="d6pp-span" name="attr_ranged_extreme"></span></td>
                 </tr>
               </tbody>
             </table>
@@ -4703,12 +4302,12 @@
                     </select>
                   </td>
                   <td>
-                    <span class="wildwest-span" name="attr_melee_actual"></span><br />
-                    <button type="action" class="sheet-wildwest" name="act_melee_attack">Roll</button>
+                    <span class="d6pp-span" name="attr_melee_actual"></span><br />
+                    <button type="action" class="sheet-d6pp" name="act_melee_attack">Roll</button>
                   </td>
                   <td>
-                    <span class="wildwest-span" name="attr_melee_damage"></span><br />
-                    <button type="action" class="sheet-wildwest" name="act_melee_damage">Damage</button>
+                    <span class="d6pp-span" name="attr_melee_damage"></span><br />
+                    <button type="action" class="sheet-d6pp" name="act_melee_damage">Damage</button>
                   </td>
                 </tr>
               </tbody>
@@ -4723,32 +4322,33 @@
       <input type="checkbox" class="skill-toggle" id="toggle_wounds" name="attr_toggle_wounds" value="1" checked hidden />
       <label class="skill-toggle-label" for="toggle_wounds">Wounds</label>
       <div class="skill-group-content">
-        <table class="sheet-attributes table-equal-width">
-          <thead>
-            <tr>
-              <th>First Aid Target Number</th>
-              <th>Wound Points</th>
-              <th>Wounds Ignored</th>
-              <th># First Aid</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td <td class="target-number-cell"><span name="attr_first_aid_target">0</span></td>
-              <td><input type="number" name="attr_wounds_total" value="0" min="0" /></td>
-              <td><input type="number" name="attr_wounds_ignored" value="0" min="0" /></td>
-              <td><input type="number" name="attr_first_aid_count" value="0" min="0" /></td>
-            </tr>
-          </tbody>
-        </table>
+        <div class="sheet-grid-table four-col">
+          <div class="grid-header">First Aid Target Number</div>
+          <div class="grid-header">Wound Points</div>
+          <div class="grid-header">Wounds Ignored</div>
+          <div class="grid-header"># First Aid</div>
+
+          <div class="grid-cell target-number-cell">
+            <span name="attr_first_aid_target">0</span>
+          </div>
+          <div class="grid-cell">
+            <input type="number" name="attr_wounds_total" value="0" min="0" class="sheet-d6pp" />
+          </div>
+          <div class="grid-cell">
+            <input type="number" name="attr_wounds_ignored" value="0" min="0" class="sheet-d6pp" />
+          </div>
+          <div class="grid-cell">
+            <input type="number" name="attr_first_aid_count" value="0" min="0" class="sheet-d6pp" />
+          </div>
+        </div>
         <div class="spacer-md"></div>
         <div class="sheet-controls-row" style="justify-content: space-between;">
           <div>
-            <button type="action" class="sheet-wildwest" name="act_end_combat">End Combat</button>
+            <button type="action" class="sheet-d6pp" name="act_end_combat">End Combat</button>
           </div>
           <div style="display: flex; align-items: center; gap: 8px;">
-            <label class="sheet-wildwest-label" style="margin: 0; display: inline;">Status:</label>
-            <input type="text" class="sheet-wildwest" name="attr_status" readonly/>
+            <label class="sheet-d6pp-label" style="margin: 0; display: inline;">Status:</label>
+            <input type="text" class="sheet-d6pp" name="attr_status" readonly/>
           </div>
         </div>
       </div>
@@ -4760,10 +4360,10 @@
       <label class="skill-toggle-label" for="toggle_conditions">Conditions</label>
       <div class="skill-group-content">
         <div class="sheet-condition-grid">
-          <label class="wildwest-checkbox"><input type="checkbox" name="attr_condition_grappled" /> Grappled</label>
-          <label class="wildwest-checkbox"><input type="checkbox" name="attr_condition_knockout" /> Knockout</label>
-          <label class="wildwest-checkbox"><input type="checkbox" name="attr_condition_lassoed" /> Lassoed</label>
-          <label class="wildwest-checkbox"><input type="checkbox" name="attr_mounted_checked" /> Mounted</label>
+          <label class="d6pp-checkbox"><input type="checkbox" name="attr_condition_grappled" /> Grappled</label>
+          <label class="d6pp-checkbox"><input type="checkbox" name="attr_condition_knockout" /> Knockout</label>
+          <label class="d6pp-checkbox"><input type="checkbox" name="attr_condition_lassoed" /> Lassoed</label>
+          <label class="d6pp-checkbox"><input type="checkbox" name="attr_mounted_checked" /> Mounted</label>
         </div>
       </div>
     </div>
@@ -4773,32 +4373,21 @@
       <input type="checkbox" class="skill-toggle" id="toggle_attibutes" name="attr_toggle_attibutes" value="1" checked hidden />
       <label class="skill-toggle-label" for="toggle_attibutes">Rolls</label>
       <div class="skill-group-content">
-        <table class="sheet-attributes table-equal-width">
-          <thead>
-            <tr>
-              <th></th>
-              <th>Base</th>
-              <th>Roll</th>
-              <th></th>
-              <th>Base</th>
-              <th>Roll</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td class="number-cell">Any Attribute/Skill</td>
-              <td class="number-cell">2D</td>
-              <td>
-                <button type="action" class="sheet-wildwest" name="act_2droll">Roll</button>
-              </td>
-              <td class="number-cell">Initiative</td>
-              <td class="number-cell">2D</td>
-              <td>
-                <button type="action" class="sheet-wildwest" name="act_2dinit">Roll</button>
-              </td>
-            </tr>
-          </tbody>
-        </table>
+        <div class="sheet-grid-table six-col">
+          <div class="grid-header"></div>
+          <div class="grid-header">Base</div>
+          <div class="grid-header">Roll</div>
+          <div class="grid-header"></div>
+          <div class="grid-header">Base</div>
+          <div class="grid-header">Roll</div>
+
+          <div class="grid-cell number-cell">Any Attribute/Skill</div>
+          <div class="grid-cell number-cell">2D</div>
+          <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_2droll">Roll</button></div>
+          <div class="grid-cell number-cell">Initiative</div>
+          <div class="grid-cell number-cell">2D</div>
+          <div class="grid-cell"><button type="action" class="sheet-d6pp" name="act_2dinit">Roll</button></div>
+        </div>
       </div>
     </div>
   </div> <!-- End Quick NPC Sheet -->
@@ -4868,6 +4457,7 @@
     tracking: "PPI",
     hunting: "PPW",
     forging: "PIM",
+    scavenging: "PPW",
     cooking: "IWM",
     fletching: "PPM",
 
@@ -5000,6 +4590,7 @@
     tracking: "survival",
     hunting: "survival",
     forging: "survival",
+    scavenging: "survival",
     cooking: "survival",
     fletching: "survival",
 
@@ -5110,7 +4701,7 @@
     "None": "No reaction selected",
     "Medic": "Use First Aid skill",
     "FixIt": "Attempt to fix an item",
-    "Block": "Add pips of Brawling or Martial Arts to dodge a melee attack (one attack only).",
+    "Block": "Reduce damage of a melee attack by pips of Brawling or Martial Arts",
     "Trip": "Free push attack when a character leaves your zone-of-control, success knocks them prone.",
     "Impede": "When an character in your zone-of-control moves, make it difficult terain.",
     "Push": "Free push attack when a character enters your zone-of-control.",
diff --git a/D6pp_Wild_West/sheet.json b/D6pp_Wild_West/sheet.json
index 9e167eac1f..b1a4f25c71 100644
--- a/D6pp_Wild_West/sheet.json
+++ b/D6pp_Wild_West/sheet.json
@@ -8,23 +8,6 @@
   "instructions": "For D6++ Wild West, not yet released.",
   "version": 1,
   "description": "For D6++ Wild West, not yet released.",
-  "compendium": {
-		"default": "item",
-    "item": {
-      "template": "item",
-			"searchFields": ["item_name", "category"]
-    }
-  },
-  "compendiumDrop": {
-    "item": {
-      "destination": "repeating_inventory",
-      "fields": {
-        "name": "repeating_inventory_$0_item_name",
-        "qty": "repeating_inventory_$0_item_qty",
-        "weight": "repeating_inventory_$0_item_weight",
-        "location": "repeating_inventory_$0_item_location",
-        "description": "repeating_inventory_$0_item_description"
-      }
-    }
-  }
+  "compendium": "d6pp",
+  "preview": "d6pp.png"
 }