diff --git a/Demon Gate/DemonGate.css b/Demon Gate/DemonGate.css
index fce59b4851..26ae308af0 100644
--- a/Demon Gate/DemonGate.css	
+++ b/Demon Gate/DemonGate.css	
@@ -68,6 +68,36 @@
     --dg-mental-4: rgba(110, 20, 185, 0.62);
     --dg-mental-5: rgba(110, 20, 185, 0.78);
     --dg-mental-6: rgba(110, 20, 185, 0.94);
+
+    /* Toggle button / pill tokens — shared by tab buttons and max-uses pills */
+    --dg-toggle-bg: var(--dg-surface); /* unselected bg — header background */
+    --dg-toggle-bg-dark: var(--dg-surface-dark); /* unselected bg — header background (dark) */
+
+    /* selected bg — h1 radial gradient (light: amber→dark-red; dark: dark-red→near-black) */
+    --dg-toggle-bg-selected: radial-gradient(ellipse at center, #c85e21 0%, #a53c18 42%, #732012 72%, #4f140b 100%);
+    --dg-toggle-bg-selected-dark: radial-gradient(ellipse at center, #5f1d14 0%, #441711 22%, #301411 100%);
+
+    --dg-toggle-fg: var(--dg-primary); /* general toggle fg — unselected button text */
+    --dg-toggle-fg-dark: var(--dg-primary-dark); /* general toggle fg (dark) */
+
+    --dg-toggle-fg-selected: var(--dg-surface); /* selected toggle fg — text on gradient bg */
+    --dg-toggle-fg-selected-dark: var(--dg-primary-dark); /* selected toggle fg (dark) */
+
+    --dg-toggle-border: var(--dg-border); /* unselected border */
+    --dg-toggle-border-dark: var(--dg-border-dark); /* unselected border (dark) */
+
+    --dg-toggle-border-selected: var(--dg-border); /* selected border — same as unselected in light */
+    --dg-toggle-border-selected-dark: #b03828; /* selected border — brighter red for dark mode */
+}
+
+/* Override toggle selected-state tokens in dark mode so the enable-selector matrix
+   (which references the plain --dg-toggle-* names) automatically resolves the dark values
+   without duplicating the full 15-rule selector matrix. */
+.sheet-darkmode {
+    --dg-toggle-bg-selected: radial-gradient(ellipse at center, #5f1d14 0%, #441711 22%, #301411 100%);
+    --dg-toggle-border-selected: #b03828;
+    --dg-toggle-fg: var(--dg-primary-dark);
+    --dg-toggle-fg-selected: var(--dg-primary-dark);
 }
 
 /* ************************************************************************************************************************************************ */
@@ -75,12 +105,12 @@
 /* ************************************************************************************************************************************************ */
 
 .charsheet {
-    background: url("https://raw.githubusercontent.com/phaldenby72/roll20-character-sheets/refs/heads/demon-gate-attributes-and-defences/Demon%20Gate/map_watermark.jpg");
+    background: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Demon%20Gate/map_watermark.jpg");
     font-family: "Atkinson Hyperlegible", sans-serif;
 }
 
 .sheet-darkmode .charsheet {
-    background: url("https://raw.githubusercontent.com/phaldenby72/roll20-character-sheets/refs/heads/demon-gate-attributes-and-defences/Demon%20Gate/map_watermark_dark.jpg");
+    background: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Demon%20Gate/map_watermark_dark.jpg");
 }
 
 .sheet-demon-gate-charsheet {
@@ -142,10 +172,10 @@ span.sheet-tab {
     display: inline-block;
     font-size: 14px;
     line-height: 28px;
-    color: var(--dg-text-muted);
-    border: 1px solid var(--dg-primary);
+    color: var(--dg-toggle-fg);
+    border: 1px solid var(--dg-toggle-border);
     border-radius: 4px;
-    background: var(--dg-table-header-bg);
+    background: var(--dg-toggle-bg);
     width: 90px;
     height: 28px;
     cursor: pointer;
@@ -170,9 +200,9 @@ input.sheet-tab8:checked ~ div.sheet-section-notes {
 }
 
 input.sheet-tab:checked + span {
-    background: var(--dg-surface);
-    color: var(--dg-primary);
-    border: 2px solid var(--dg-primary);
+    background: var(--dg-toggle-bg-selected);
+    border: 2px solid var(--dg-toggle-border-selected);
+    color: var(--dg-toggle-fg-selected);
 }
 
 /* ************************************************************************************************************************************************ */
@@ -180,15 +210,15 @@ input.sheet-tab:checked + span {
 /* ************************************************************************************************************************************************ */
 
 .sheet-darkmode span.sheet-tab {
-    color: var(--dg-text-muted-dark);
-    border-color: var(--dg-border-dark);
-    background: var(--dg-table-header-bg-dark);
+    color: var(--dg-toggle-fg-dark);
+    border-color: var(--dg-toggle-border-dark);
+    background: var(--dg-toggle-bg-dark);
 }
 
 .sheet-darkmode input.sheet-tab:checked + span {
-    background: var(--dg-surface-dark);
-    color: var(--dg-primary-dark);
-    border-color: var(--dg-primary-dark);
+    background: var(--dg-toggle-bg-selected-dark);
+    border-color: var(--dg-toggle-border-selected-dark);
+    color: var(--dg-toggle-fg-selected-dark);
 }
 
 /* ************************************************************************************************************************************************ */
@@ -534,7 +564,7 @@ td.sheet-cell-numeric {
 /* Entry controls */
 /* ************************************************************************************************************************************************ */
 
-input,
+input:not([type="radio"]):not([type="checkbox"]),
 select,
 textarea,
 .sheet-input-like {
@@ -655,7 +685,7 @@ textarea::placeholder {
 /* Dark mode overrides */
 /* ************************************************************************************************************************************************ */
 
-.sheet-darkmode input,
+.sheet-darkmode input:not([type="radio"]):not([type="checkbox"]),
 .sheet-darkmode select,
 .sheet-darkmode textarea,
 .sheet-darkmode .sheet-input-like {
@@ -915,6 +945,170 @@ textarea.sheet-textarea-equipment {
     margin-bottom: -10px;
 }
 
+/* ************************************************************************************************************************************************ */
+/* Class ability usage tracking */
+/* ************************************************************************************************************************************************ */
+
+/* Row containing the pill radio group and use circles */
+.sheet-uses-row {
+    display: flex;
+    flex-wrap: nowrap;
+    align-items: center;
+    padding: 4px 8px;
+    border-top: 1px solid var(--dg-border);
+    background-color: var(--dg-surface);
+}
+
+/* "Max" / "Used" section labels */
+.sheet-uses-label {
+    font-size: 0.8em;
+    font-weight: bold;
+    white-space: nowrap;
+    color: var(--dg-text-muted);
+    margin-right: 6px;
+    flex-shrink: 0;
+}
+
+/* Radio pill: invisible but clickable (opacity: 0 pattern, same as .sheet-expand-collapse-checkbox).
+   The LABEL span is the visual element; the radio just captures clicks.
+   No gap on the flex container — spacing comes from .sheet-max-label margin-right. */
+input.sheet-max-radio {
+    opacity: 0;
+    display: inline-block;
+    width: 28px;
+    height: 20px;
+    flex-shrink: 0;
+    cursor: pointer;
+    box-sizing: border-box;
+}
+
+/* Pill label: the visual pill. Overlays the preceding radio via negative margin.
+   pointer-events: none lets clicks fall through to the radio behind it.
+   margin-left: -28px pulls it back over the radio.
+   margin-right: 4px provides the gap before the next pill.
+   Net flex contribution = -28 + 28 + 4 = 4px (gap only). */
+.sheet-max-pill {
+    display: inline-block;
+    width: 28px;
+    height: 20px;
+    line-height: 18px;
+    margin-left: -28px;
+    margin-right: 4px;
+    text-align: center;
+    font-size: 0.7em;
+    font-weight: bold;
+    pointer-events: none;
+    color: var(--dg-toggle-fg);
+    flex-shrink: 0;
+    border-radius: 10px;
+    border: 1px solid var(--dg-toggle-border);
+    background: var(--dg-toggle-bg);
+    box-sizing: border-box;
+}
+
+/* Selected pill — toggle gradient background; fg from toggle-fg token */
+input.sheet-max-radio:checked + .sheet-max-pill {
+    background: var(--dg-toggle-bg-selected);
+    border: 1px solid var(--dg-toggle-border-selected);
+    color: var(--dg-toggle-fg-selected);
+}
+
+/* Thin vertical divider between pill group and use circles */
+.sheet-uses-sep {
+    width: 1px;
+    height: 20px;
+    background: var(--dg-border);
+    margin: 0 8px;
+    flex-shrink: 0;
+}
+
+/* Use circle checkboxes — disabled by default.
+   appearance: none + explicit size. element.class selector (0,1,1) beats any
+   Roll20-injected input rules. background: transparent is required — without it
+   the dark-mode forms rule would fill the circle with the control background colour. */
+.sheet-demon-gate-charsheet input.sheet-use-cb {
+    /** Use higher specificity to override Roll20's injected rules */
+    appearance: none;
+    -webkit-appearance: none;
+    width: 16px;
+    height: 16px;
+    min-width: 16px;
+    flex-shrink: 0;
+    border-radius: 50%;
+    border: 2px solid var(--dg-border);
+    background: transparent;
+    cursor: not-allowed;
+    opacity: 0.3;
+    pointer-events: none;
+    margin-left: 4px;
+    box-sizing: border-box;
+}
+
+/* Checked — same look as a selected pill; the × is provided by the adjacent .sheet-use-icon span */
+.sheet-demon-gate-charsheet input.sheet-use-cb:checked {
+    background: var(--dg-toggle-bg-selected);
+    border: 2px solid var(--dg-toggle-border-selected);
+}
+
+/* Icon span: overlays the preceding checkbox via negative margin.
+   The × is always in the DOM but transparent until the checkbox is checked or focused+checked. */
+.sheet-use-icon {
+    display: inline-block;
+    width: 16px;
+    height: 18px;
+    line-height: 16px;
+    margin-left: -16px;
+    text-align: center;
+    font-size: 16px;
+    font-weight: bold;
+    color: transparent;
+    pointer-events: none;
+    flex-shrink: 0;
+    box-sizing: border-box;
+    user-select: none;
+}
+
+/* Show × when the checkbox is checked (covers plain :checked and :focus:checked) */
+input.sheet-use-cb:checked + .sheet-use-icon {
+    color: var(--dg-toggle-fg-selected);
+}
+
+/* Hide the separator, "Used" label, circles, icons, and reset button when max is N/A (value 0).
+   The "Max" label precedes the radio so ~ won't reach it — only siblings after value="0" are hidden. */
+input.sheet-max-radio[value="0"]:checked ~ .sheet-uses-sep,
+input.sheet-max-radio[value="0"]:checked ~ .sheet-uses-label,
+input.sheet-max-radio[value="0"]:checked ~ input.sheet-use-cb,
+input.sheet-max-radio[value="0"]:checked ~ .sheet-use-icon {
+    display: none;
+}
+
+/* Progressively enable circles based on the selected max pill.
+   ~ general sibling selector skips the separator and "Used" label spans between
+   the radio pills and the use circles. */
+input.sheet-max-radio[value="1"]:checked ~ input.sheet-use-cb-1,
+input.sheet-max-radio[value="2"]:checked ~ input.sheet-use-cb-1,
+input.sheet-max-radio[value="2"]:checked ~ input.sheet-use-cb-2,
+input.sheet-max-radio[value="3"]:checked ~ input.sheet-use-cb-1,
+input.sheet-max-radio[value="3"]:checked ~ input.sheet-use-cb-2,
+input.sheet-max-radio[value="3"]:checked ~ input.sheet-use-cb-3,
+input.sheet-max-radio[value="4"]:checked ~ input.sheet-use-cb-1,
+input.sheet-max-radio[value="4"]:checked ~ input.sheet-use-cb-2,
+input.sheet-max-radio[value="4"]:checked ~ input.sheet-use-cb-3,
+input.sheet-max-radio[value="4"]:checked ~ input.sheet-use-cb-4,
+input.sheet-max-radio[value="5"]:checked ~ input.sheet-use-cb-1,
+input.sheet-max-radio[value="5"]:checked ~ input.sheet-use-cb-2,
+input.sheet-max-radio[value="5"]:checked ~ input.sheet-use-cb-3,
+input.sheet-max-radio[value="5"]:checked ~ input.sheet-use-cb-4,
+input.sheet-max-radio[value="5"]:checked ~ input.sheet-use-cb-5 {
+    opacity: 1;
+    pointer-events: auto;
+    cursor: pointer;
+    background: var(--dg-toggle-bg-selected);
+    border: 1px solid var(--dg-toggle-border-selected);
+    /* Dark mode: .sheet-darkmode overrides --dg-toggle-bg-selected and --dg-toggle-border-selected
+       in variables.css, so this rule resolves correctly in both modes without a separate matrix. */
+}
+
 /* ************************************************************************************************************************************************ */
 /* Dark mode overrides */
 /* ************************************************************************************************************************************************ */
@@ -929,6 +1123,43 @@ textarea.sheet-textarea-equipment {
     border-color: var(--dg-border-dark);
 }
 
+.sheet-darkmode .sheet-uses-row {
+    border-color: var(--dg-border-dark);
+    background-color: var(--dg-surface-dark);
+}
+
+.sheet-darkmode .sheet-uses-label {
+    color: var(--dg-text-muted-dark);
+}
+
+.sheet-darkmode .sheet-max-pill {
+    color: var(--dg-toggle-fg-dark);
+    border-color: var(--dg-toggle-border-dark);
+    background: var(--dg-toggle-bg-dark);
+}
+
+.sheet-darkmode input.sheet-max-radio:checked + .sheet-max-pill {
+    background: var(--dg-toggle-bg-selected-dark);
+    border: 1px solid var(--dg-toggle-border-selected-dark);
+    color: var(--dg-toggle-fg-selected-dark);
+}
+
+.sheet-darkmode .sheet-uses-sep {
+    background: var(--dg-border-dark);
+}
+
+.sheet-darkmode input.sheet-use-cb {
+    background: transparent;
+    border-color: var(--dg-border-dark);
+}
+
+.sheet-darkmode input.sheet-use-cb:checked + .sheet-use-icon {
+    color: var(--dg-toggle-fg-selected-dark);
+}
+
+/* Checked circles and enable selectors use the same red in dark mode —
+   base-rule specificity (0,4,2) already beats dark mode overrides (0,2,1), so no dark overrides needed */
+
 /* ************************************************************************************************************************************************ */
 /* Mysic tab
 /* ************************************************************************************************************************************************ */
@@ -946,7 +1177,7 @@ textarea.sheet-textarea-equipment {
 }
 
 .sheet-spiritual-influence-image {
-    background: url("https://raw.githubusercontent.com/phaldenby72/roll20-character-sheets/refs/heads/demon-gate-attributes-and-defences/Demon%20Gate/circle_v2.png");
+    background: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Demon%20Gate/circle_v2.png");
     background-repeat: no-repeat;
     background-size: contain;
     background-position: center;
@@ -1026,6 +1257,7 @@ tr.sheet-spell-spacer-row td {
 /* Roll template CSS variables - Roll20 requires these to be defined separately */
 .sheet-rolltemplate-text,
 .sheet-rolltemplate-class-ability-text,
+.sheet-rolltemplate-chi-power,
 .sheet-rolltemplate-percentile,
 .sheet-rolltemplate-attack,
 .sheet-rolltemplate-damage,
@@ -1072,6 +1304,7 @@ tr.sheet-spell-spacer-row td {
 
 .sheet-rolltemplate-text .sheet-template-box,
 .sheet-rolltemplate-class-ability-text .sheet-template-box,
+.sheet-rolltemplate-chi-power .sheet-template-box,
 .sheet-rolltemplate-percentile .sheet-template-box,
 .sheet-rolltemplate-attack .sheet-template-box,
 .sheet-rolltemplate-damage .sheet-template-box,
@@ -1089,6 +1322,7 @@ tr.sheet-spell-spacer-row td {
 
 .sheet-rolltemplate-text .sheet-template-text,
 .sheet-rolltemplate-class-ability-text .sheet-template-text,
+.sheet-rolltemplate-chi-power .sheet-template-text,
 .sheet-rolltemplate-percentile .sheet-template-text,
 .sheet-rolltemplate-spell-description .sheet-template-text {
     font-size: 13px;
@@ -1100,6 +1334,7 @@ tr.sheet-spell-spacer-row td {
 
 .sheet-rolltemplate-text .sheet-template-title,
 .sheet-rolltemplate-class-ability-text .sheet-template-title,
+.sheet-rolltemplate-chi-power .sheet-template-title,
 .sheet-rolltemplate-percentile .sheet-template-title,
 .sheet-rolltemplate-attack .sheet-template-title,
 .sheet-rolltemplate-damage .sheet-template-title,
@@ -1126,6 +1361,7 @@ tr.sheet-spell-spacer-row td {
 
 .sheet-rolltemplate-text .sheet-template-title::before,
 .sheet-rolltemplate-class-ability-text .sheet-template-title::before,
+.sheet-rolltemplate-chi-power .sheet-template-title::before,
 .sheet-rolltemplate-percentile .sheet-template-title::before,
 .sheet-rolltemplate-attack .sheet-template-title::before,
 .sheet-rolltemplate-damage .sheet-template-title::before,
@@ -1149,6 +1385,7 @@ tr.sheet-spell-spacer-row td {
 
 .sheet-rolltemplate-text .sheet-template-subtitle,
 .sheet-rolltemplate-class-ability-text .sheet-template-subtitle,
+.sheet-rolltemplate-chi-power .sheet-template-subtitle,
 .sheet-rolltemplate-percentile .sheet-template-subtitle,
 .sheet-rolltemplate-attack .sheet-template-subtitle,
 .sheet-rolltemplate-damage .sheet-template-subtitle,
@@ -1170,6 +1407,7 @@ tr.sheet-spell-spacer-row td {
 
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-text .sheet-template-title,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-class-ability-text .sheet-template-title,
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-chi-power .sheet-template-title,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-percentile .sheet-template-title,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-attack .sheet-template-title,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-damage .sheet-template-title,
@@ -1186,6 +1424,7 @@ tr.sheet-spell-spacer-row td {
 
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-text .sheet-template-subtitle,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-class-ability-text .sheet-template-subtitle,
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-chi-power .sheet-template-subtitle,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-percentile .sheet-template-subtitle,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-attack .sheet-template-subtitle,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-damage .sheet-template-subtitle,
@@ -1202,6 +1441,7 @@ tr.sheet-spell-spacer-row td {
 /* Divider styling for roll templates that use them */
 
 .sheet-rolltemplate-class-ability-text .sheet-template-hr,
+.sheet-rolltemplate-chi-power .sheet-template-hr,
 .sheet-rolltemplate-percentile .sheet-template-hr,
 .sheet-rolltemplate-attack .sheet-template-hr,
 .sheet-rolltemplate-spell-description .sheet-template-hr,
@@ -1221,6 +1461,7 @@ tr.sheet-spell-spacer-row td {
 /** Table styling for roll templates that use them */
 
 .sheet-rolltemplate-class-ability-text th,
+.sheet-rolltemplate-chi-power th,
 .sheet-rolltemplate-percentile th,
 .sheet-rolltemplate-spell-description th,
 .sheet-rolltemplate-spell-cast th,
@@ -1241,6 +1482,7 @@ tr.sheet-spell-spacer-row td {
 }
 
 .sheet-rolltemplate-class-ability-text th span,
+.sheet-rolltemplate-chi-power th span,
 .sheet-rolltemplate-percentile th span,
 .sheet-rolltemplate-attack th span,
 .sheet-rolltemplate-damage th span,
@@ -1252,6 +1494,7 @@ tr.sheet-spell-spacer-row td {
 }
 
 .sheet-rolltemplate-class-ability-text td,
+.sheet-rolltemplate-chi-power td,
 .sheet-rolltemplate-percentile td,
 .sheet-rolltemplate-spell-description td,
 .sheet-rolltemplate-spell-cast td,
@@ -1292,6 +1535,7 @@ tr.sheet-spell-spacer-row td {
 
 /* Dark mode text colour — th span overrides Roll20's html.dark th !important; td/text elements get full amber */
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-class-ability-text th span,
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-chi-power th span,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-percentile th span,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-attack th span,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-damage th span,
@@ -1304,6 +1548,7 @@ tr.sheet-spell-spacer-row td {
 
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-text td,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-class-ability-text td,
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-chi-power td,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-percentile td,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-attack td,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-damage td,
@@ -1318,6 +1563,7 @@ tr.sheet-spell-spacer-row td {
 
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-text .sheet-template-text,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-class-ability-text .sheet-template-text,
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-chi-power .sheet-template-text,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-percentile .sheet-template-text,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-spell-description .sheet-template-text,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-simple .sheet-template-text-prominent,
@@ -1329,6 +1575,7 @@ tr.sheet-spell-spacer-row td {
 /* Dark mode support */
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-text .sheet-template-box,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-class-ability-text .sheet-template-box,
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-chi-power .sheet-template-box,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-percentile .sheet-template-box,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-attack .sheet-template-box,
 .sheet-rolltemplate-darkmode.sheet-rolltemplate-damage .sheet-template-box,
diff --git a/Demon Gate/DemonGate.html b/Demon Gate/DemonGate.html
index 3c61ce58d5..a7b1d4170c 100644
--- a/Demon Gate/DemonGate.html	
+++ b/Demon Gate/DemonGate.html	
@@ -4,6 +4,7 @@
 
         updateAllAttributes();
         updateAllSkills();
+        updateUnarmed();
     });
 
     // Latest sheet version - used for migration purposes
@@ -1037,6 +1038,13 @@
         });
     });
 
+    on(
+        "change:helmetar change:amuletar change:cloakar change:pauldronsar change:clothingar change:torsoar change:bracersar change:glovesar change:beltar change:greavesar change:bootar change:ringar change:ring2ar change:otherar change:other2ar",
+        function () {
+            updateTotalArmorRating();
+        }
+    );
+
     function updateBody() {
         getAttrs(["BdyBase", "BdyBonus", "BdyRace", "HPAdj", "MaxHP", "ToughBonus"], function (values) {
             let total = Number(values.BdyBase) + Number(values.BdyBonus) + Number(values.BdyRace);
@@ -1993,25 +2001,55 @@
             let racialUnarmedAttackName = "";
             let racialUnarmedAttackDamage = getDice(rank);
 
+            let racialUnarmedAttackDesc = "";
+
             if (values.Race == "mungreel") {
                 racialUnarmedAttackName = "Blade Teeth";
                 racialUnarmedAttackDamage = "d12!";
-            } else if (values.Race == "mhentep") {
+                racialUnarmedAttackDesc =
+                    "A natural bite attack using the Mungreel's razor-edged serrated teeth. Deals d12 damage independently of unarmed combat rank. Can be combined with other unarmed attacks using additional actions.";
+            } else if (values.Race == "mhentep" || values.Race == "sharpheen" || values.Race == "mulpheen") {
                 racialUnarmedAttackName = "Claws";
                 racialUnarmedAttackDamage = unarmedDamage + "+3";
+                racialUnarmedAttackDesc =
+                    "Powerful natural claws that add +3 damage to all unarmed attacks. Stacks with unarmed combat specialization.";
+            } else if (values.Race == "kuthalan") {
+                racialUnarmedAttackName = "Chitin";
+                racialUnarmedAttackDamage = unarmedDamage + "+1";
+                racialUnarmedAttackDesc =
+                    "Hardened chitin plating on the fists and forearms adds +1 damage to all unarmed attacks.";
+            } else if (values.Race == "tarkanys") {
+                racialUnarmedAttackName = "Bite";
+                racialUnarmedAttackDamage = "d8!";
+                racialUnarmedAttackDesc =
+                    "A natural bite attack dealing d8 damage independently of unarmed combat rank. Can be combined with other unarmed attacks using additional actions.";
+            } else if (values.Race == "minotaur") {
+                racialUnarmedAttackName = "Therian Charge";
+                racialUnarmedAttackDamage = "";
+                racialUnarmedAttackDesc = "Damage bonus depends on distance charged.";
+            } else if (values.Race == "mutant") {
+                racialUnarmedAttackName = "Vatagi Natural Weapon";
+                racialUnarmedAttackDamage = "";
+                racialUnarmedAttackDesc =
+                    "Varies. Use the 'alternate unarmed' field to detail this character's specific mutation.";
             } else {
                 // Most races don't have special unarmed abilities
-                racialUnarmedAttackName = "None";
+                racialUnarmedAttackName = "Racial Unarmed";
+                racialUnarmedAttackDesc =
+                    "No racial unarmed attack specified. Use the 'alternate unarmed' field if needed.";
             }
 
             // Update all attributes in a single call
             setAttrs({
                 UnarmedHit: Number(values.Unarmed),
+                AltUnarmedHit: Number(values.Unarmed),
+                RacialUnarmedHit: Number(values.Unarmed),
                 UnarmedRank: baseRank,
                 UnarmedDmg: unarmedDamage,
                 UnarmedDisplayName: unarmedDisplayName,
                 RacialUnarmedName: racialUnarmedAttackName,
-                RacialUnarmedDmg: racialUnarmedAttackDamage
+                RacialUnarmedDmg: racialUnarmedAttackDamage,
+                RacialUnarmedAccessory: racialUnarmedAttackDesc
             });
         });
     }
@@ -2033,6 +2071,45 @@
         return unarmedNames[unarmedValue] || "Unarmed: Basic";
     }
 
+    /* CLASS ABILITY USAGE TRACKING */
+
+    // Reset All Uses button: clears every row's use checkboxes at once.
+    // Placed outside the repeating section so type="action" + clicked fires reliably.
+    on("clicked:ClassAbilResetAll", function () {
+        getSectionIDs("classabilities", function (ids) {
+            const updates = {};
+            ids.forEach(function (id) {
+                const prefix = "repeating_classabilities_" + id + "_";
+                for (let i = 1; i <= 5; i++) {
+                    updates[prefix + "ClassAbilUse" + i] = "0";
+                }
+            });
+            if (Object.keys(updates).length > 0) {
+                setAttrs(updates);
+            }
+        });
+    });
+
+    // When Max. Uses changes: clear any checkboxes that are now beyond the new maximum.
+    // The pill radio buttons are the CSS driver directly, so no hidden radio sync is needed.
+    on("change:repeating_classabilities:ClassAbilMaxUses", function (eventInfo) {
+        const src = eventInfo.sourceAttribute;
+        const prefix = src.substring(0, src.lastIndexOf("_") + 1);
+
+        getAttrs([src], function (values) {
+            const max = Number(values[src]) || 0;
+            const updates = {};
+
+            for (let i = max + 1; i <= 5; i++) {
+                updates[prefix + "ClassAbilUse" + i] = "0";
+            }
+
+            if (Object.keys(updates).length > 0) {
+                setAttrs(updates);
+            }
+        });
+    });
+
     on("change:honorrep change:corruptrep", function () {
         getAttrs(["HonorRep", "CorruptRep"], function (values) {
             const goodRepDetails = getReputationDetails(values.HonorRep);
@@ -3366,6 +3443,8 @@
                                 <th class="sheet-small-table-header">Base</th>
                                 <th class="sheet-small-table-header">Bonus</th>
                                 <th class="sheet-small-table-header">Total</th>
+                                <th class="sheet-small-table-header">Rank</th>
+                                <th class="sheet-small-table-header">Dice</th>
                                 <th class="sheet-small-table-header"></th>
                             </tr>
                             <tr>
@@ -5921,7 +6000,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" name="attr_AltUnarmedName" value="Alternate Unarmed" readonly />
+                                    <input type="text" name="attr_RacialUnarmedName" value="Racial Unarmed" readonly />
                                 </td>
                                 <td class="sheet-button-cell">
                                     <button
@@ -5932,7 +6011,7 @@
                                 <td class="sheet-button-cell">
                                     <button
                                         type="roll"
-                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{AltUnarmedName}}} {{damage=[[(@{AltUnarmedDmg}+@{AltUnarmedDmgBonus}+@{DmgModTotal}+?{Modifier|0})*?{Multiplier|1}]]}}"
+                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{RacialUnarmedName}}} {{roll=[[d20+@{RacialUnarmedHit}@{PhysMod}+@{RacialUnarmedHitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
                                     ></button>
                                 </td>
                             </tr>
@@ -5958,7 +6037,7 @@
                                 <td class="sheet-button-cell">
                                     <button
                                         type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell1Name}}} {{character=@{character_name}}} {{area=@{Spell1Area}}} {{duration=@{Spell1Dur}}} {{actions=@{Spell1Act}}} {{drain=@{Spell1Drain}}} {{roll=[[d20+@{Spell1HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                        value="&{template:spell-cast} {{name=@{Spell1Name}}} {{character=@{character_name}}} {{area=@{Spell1Area}}} {{duration=@{Spell1Dur}}} {{actions=@{Spell1Act}}} {{drain=@{Spell1Drain}}} {{roll=[[d20+@{Spell1HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                     ></button>
                                 </td>
                                 <td class="sheet-button-cell">
@@ -5975,7 +6054,7 @@
                                 <td class="sheet-button-cell">
                                     <button
                                         type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell2Name}}} {{character=@{character_name}}} {{area=@{Spell2Area}}} {{duration=@{Spell2Dur}}} {{actions=@{Spell2Act}}} {{drain=@{Spell2Drain}}} {{roll=[[d20+@{Spell2HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                        value="&{template:spell-cast} {{name=@{Spell2Name}}} {{character=@{character_name}}} {{area=@{Spell2Area}}} {{duration=@{Spell2Dur}}} {{actions=@{Spell2Act}}} {{drain=@{Spell2Drain}}} {{roll=[[d20+@{Spell2HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                     ></button>
                                 </td>
                                 <td class="sheet-button-cell">
@@ -5992,7 +6071,7 @@
                                 <td class="sheet-button-cell">
                                     <button
                                         type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell3Name}}} {{character=@{character_name}}} {{area=@{Spell3Area}}} {{duration=@{Spell3Dur}}} {{actions=@{Spell3Act}}} {{drain=@{Spell3Drain}}} {{roll=[[d20+@{Spell3HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                        value="&{template:spell-cast} {{name=@{Spell3Name}}} {{character=@{character_name}}} {{area=@{Spell3Area}}} {{duration=@{Spell3Dur}}} {{actions=@{Spell3Act}}} {{drain=@{Spell3Drain}}} {{roll=[[d20+@{Spell3HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                     ></button>
                                 </td>
                                 <td class="sheet-button-cell">
@@ -6009,7 +6088,7 @@
                                 <td class="sheet-button-cell">
                                     <button
                                         type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell4Name}}} {{character=@{character_name}}} {{area=@{Spell4Area}}} {{duration=@{Spell4Dur}}} {{actions=@{Spell4Act}}} {{drain=@{Spell4Drain}}} {{roll=[[d20+@{Spell4HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                        value="&{template:spell-cast} {{name=@{Spell4Name}}} {{character=@{character_name}}} {{area=@{Spell4Area}}} {{duration=@{Spell4Dur}}} {{actions=@{Spell4Act}}} {{drain=@{Spell4Drain}}} {{roll=[[d20+@{Spell4HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                     ></button>
                                 </td>
                                 <td class="sheet-button-cell">
@@ -6026,7 +6105,7 @@
                                 <td class="sheet-button-cell">
                                     <button
                                         type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell5Name}}} {{character=@{character_name}}} {{area=@{Spell5Area}}} {{duration=@{Spell5Dur}}} {{actions=@{Spell5Act}}} {{drain=@{Spell5Drain}}} {{roll=[[d20+@{Spell5HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                        value="&{template:spell-cast} {{name=@{Spell5Name}}} {{character=@{character_name}}} {{area=@{Spell5Area}}} {{duration=@{Spell5Dur}}} {{actions=@{Spell5Act}}} {{drain=@{Spell5Drain}}} {{roll=[[d20+@{Spell5HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                     ></button>
                                 </td>
                                 <td class="sheet-button-cell">
@@ -6043,7 +6122,7 @@
                                 <td class="sheet-button-cell">
                                     <button
                                         type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell6Name}}} {{character=@{character_name}}} {{area=@{Spell6Area}}} {{duration=@{Spell6Dur}}} {{actions=@{Spell6Act}}} {{drain=@{Spell6Drain}}} {{roll=[[d20+@{Spell6HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                        value="&{template:spell-cast} {{name=@{Spell6Name}}} {{character=@{character_name}}} {{area=@{Spell6Area}}} {{duration=@{Spell6Dur}}} {{actions=@{Spell6Act}}} {{drain=@{Spell6Drain}}} {{roll=[[d20+@{Spell6HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                     ></button>
                                 </td>
                                 <td class="sheet-button-cell">
@@ -6060,7 +6139,7 @@
                                 <td class="sheet-button-cell">
                                     <button
                                         type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell7Name}}} {{character=@{character_name}}} {{area=@{Spell7Area}}} {{duration=@{Spell7Dur}}} {{actions=@{Spell7Act}}} {{drain=@{Spell7Drain}}} {{roll=[[d20+@{Spell7HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                        value="&{template:spell-cast} {{name=@{Spell7Name}}} {{character=@{character_name}}} {{area=@{Spell7Area}}} {{duration=@{Spell7Dur}}} {{actions=@{Spell7Act}}} {{drain=@{Spell7Drain}}} {{roll=[[d20+@{Spell7HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                     ></button>
                                 </td>
                                 <td class="sheet-button-cell">
@@ -6077,7 +6156,7 @@
                                 <td class="sheet-button-cell">
                                     <button
                                         type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell8Name}}} {{character=@{character_name}}} {{area=@{Spell8Area}}} {{duration=@{Spell8Dur}}} {{actions=@{Spell8Act}}} {{drain=@{Spell8Drain}}} {{roll=[[d20+@{Spell8HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                        value="&{template:spell-cast} {{name=@{Spell8Name}}} {{character=@{character_name}}} {{area=@{Spell8Area}}} {{duration=@{Spell8Dur}}} {{actions=@{Spell8Act}}} {{drain=@{Spell8Drain}}} {{roll=[[d20+@{Spell8HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                     ></button>
                                 </td>
                                 <td class="sheet-button-cell">
@@ -6094,7 +6173,7 @@
                                 <td class="sheet-button-cell">
                                     <button
                                         type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell9Name}}} {{character=@{character_name}}} {{area=@{Spell9Area}}} {{duration=@{Spell9Dur}}} {{actions=@{Spell9Act}}} {{drain=@{Spell9Drain}}} {{roll=[[d20+@{Spell9HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                        value="&{template:spell-cast} {{name=@{Spell9Name}}} {{character=@{character_name}}} {{area=@{Spell9Area}}} {{duration=@{Spell9Dur}}} {{actions=@{Spell9Act}}} {{drain=@{Spell9Drain}}} {{roll=[[d20+@{Spell9HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                     ></button>
                                 </td>
                                 <td class="sheet-button-cell">
@@ -6111,7 +6190,7 @@
                                 <td class="sheet-button-cell">
                                     <button
                                         type="roll"
-                                        value="&{template:spell-cast} {{name=@{Spell10Name}}} {{character=@{character_name}}} {{area=@{Spell10Area}}} {{duration=@{Spell10Dur}}} {{actions=@{Spell10Act}}} {{drain=@{Spell10Drain}}} {{roll=[[d20+@{Spell10HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                        value="&{template:spell-cast} {{name=@{Spell10Name}}} {{character=@{character_name}}} {{area=@{Spell10Area}}} {{duration=@{Spell10Dur}}} {{actions=@{Spell10Act}}} {{drain=@{Spell10Drain}}} {{roll=[[d20+@{Spell10HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                     ></button>
                                 </td>
                                 <td class="sheet-button-cell">
@@ -6409,846 +6488,1136 @@
             <div class="sheet-section-gear">
                 <div class="sheet-flex-section">
                     <div class="sheet-column-grow">
-                        <h1>Weapons</h1>
+                        <h1>Unarmed</h1>
 
-                        <table class="sheet-spacer-top-margin">
-                            <tr>
-                                <th colspan="4">
-                                    <h2>Unarmed</h2>
-                                </th>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header">Name</th>
-                                <th class="sheet-small-table-header">Hit Bonus</th>
-                                <th class="sheet-small-table-header">Specialization</th>
-                                <th class="sheet-small-table-header">Hit</th>
-                            </tr>
-                            <tr>
-                                <td class="sheet-read-only-field">
-                                    <input type="text" name="attr_UnarmedDisplayName" value="Unarmed: Basic" readonly />
-                                </td>
-                                <td>
-                                    <input
-                                        type="number"
-                                        name="attr_UnarmedHitBonus"
-                                        value="0"
-                                        class="sheet-numeric-wide"
-                                    />
-                                </td>
-                                <td>
-                                    <input
-                                        type="number"
-                                        name="attr_UnarmedHit"
-                                        value="0"
-                                        readonly
-                                        class="sheet-numeric-wide"
-                                    />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=Unarmed}} {{roll=[[d20+@{UnarmedHit}@{PhysMod}+@{UnarmedHitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header">Accessory</th>
-                                <th class="sheet-small-table-header">Bonus Dmg</th>
-                                <th class="sheet-small-table-header">Damage</th>
-                                <th class="sheet-small-table-header">Dmg</th>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" name="attr_UnarmedAccessory" value="" />
-                                </td>
-                                <td>
-                                    <input
-                                        type="text"
-                                        name="attr_UnarmedDmgBonus"
-                                        value="0"
-                                        class="sheet-text-centred"
-                                    />
-                                </td>
-                                <td class="sheet-read-only-field">
-                                    <input type="hidden" name="attr_UnarmedRank" value="0" />
-                                    <input type="hidden" name="attr_RaceUnarmedRank" value="3" />
-                                    <input
-                                        type="text"
-                                        name="attr_UnarmedDmg"
-                                        value="d6!"
-                                        readonly
-                                        class="sheet-dice-field"
-                                    />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=Unarmed}} {{damage=[[(@{UnarmedDmg}+@{UnarmedDmgBonus}+@{DmgModTotal}+?{Modifier|0})*?{Multiplier|1}]]}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header">Name</th>
-                                <th class="sheet-small-table-header">Hit Bonus</th>
-                                <th class="sheet-small-table-header">Specialization</th>
-                                <th class="sheet-small-table-header">Hit</th>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" name="attr_AltUnarmedName" value="Alternate Unarmed" />
-                                </td>
-                                <td>
-                                    <input
-                                        type="number"
-                                        name="attr_AltUnarmedHitBonus"
-                                        value="0"
-                                        class="sheet-numeric-wide"
-                                    />
-                                </td>
-                                <td>
-                                    <input
-                                        type="number"
-                                        name="attr_AltUnarmedHit"
-                                        value="0"
-                                        readonly
-                                        class="sheet-numeric-wide"
-                                    />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{AltUnarmedName}}} {{roll=[[d20+@{AltUnarmedHit}@{PhysMod}+@{AltUnarmedHitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header">Accessory</th>
-                                <th class="sheet-small-table-header">Bonus Dmg</th>
-                                <th class="sheet-small-table-header">Damage</th>
-                                <th class="sheet-small-table-header">Dmg</th>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" name="attr_AltUnarmedAccessory" value="" />
-                                </td>
-                                <td>
-                                    <input
-                                        type="text"
-                                        name="attr_AltUnarmedDmgBonus"
-                                        value="0"
-                                        class="sheet-text-centred"
-                                    />
-                                </td>
-                                <td>
-                                    <input type="text" name="attr_AltUnarmedDmg" value="d6!" class="sheet-dice-field" />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{AltUnarmedName}}} {{damage=[[(@{AltUnarmedDmg}+@{AltUnarmedDmgBonus}+@{DmgModTotal}+?{Modifier|0})*?{Multiplier|1}]]}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header">Name</th>
-                                <th class="sheet-small-table-header">Hit Bonus</th>
-                                <th class="sheet-small-table-header">Specialization</th>
-                                <th class="sheet-small-table-header">Hit</th>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" name="attr_RacialUnarmedName" value="Racial Unarmed" readonly />
-                                </td>
-                                <td>
-                                    <input
-                                        type="number"
-                                        name="attr_RacialUnarmedHitBonus"
-                                        value="0"
-                                        class="sheet-numeric-wide"
-                                    />
-                                </td>
-                                <td>
-                                    <input
-                                        type="number"
-                                        name="attr_RacialUnarmedHit"
-                                        value="0"
-                                        readonly
-                                        class="sheet-numeric-wide"
-                                    />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{RacialUnarmedName}}} {{roll=[[d20+@{RacialUnarmedHit}@{PhysMod}+@{RacialUnarmedHitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header">Accessory</th>
-                                <th class="sheet-small-table-header">Bonus Dmg</th>
-                                <th class="sheet-small-table-header">Damage</th>
-                                <th class="sheet-small-table-header">Dmg</th>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" name="attr_RacialUnarmedAccessory" value="" />
-                                </td>
-                                <td>
-                                    <input
-                                        type="text"
-                                        name="attr_RacialUnarmedDmgBonus"
-                                        value="0"
-                                        class="sheet-text-centred"
-                                    />
-                                </td>
-                                <td>
-                                    <input
-                                        type="text"
-                                        name="attr_RacialUnarmedDmg"
-                                        value="d6!"
-                                        class="sheet-dice-field"
-                                        readonly
-                                    />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{RacialUnarmedName}}} {{damage=[[(@{RacialUnarmedDmg}+@{RacialUnarmedDmgBonus}+@{DmgModTotal}+?{Modifier|0})*?{Multiplier|1}]]}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                        </table>
+                        <div class="sheet-collapse-wrapper">
+                            <h2 class="sheet-table-header-collapse">Primary Unarmed</h2>
+                            <div class="sheet-collapse-section">
+                                <input
+                                    type="checkbox"
+                                    name="attr_ExpandedPrimUnarmed"
+                                    checked="true"
+                                    class="sheet-expand-collapse-checkbox"
+                                />
+                                <span class="sheet-expand-collapse-symbol"></span>
+                                <div class="sheet-collapsible">
+                                    <table>
+                                        <tr>
+                                            <th class="sheet-small-table-header">Name</th>
+                                            <th class="sheet-small-table-header">Hit Bonus</th>
+                                            <th class="sheet-small-table-header">Specialization</th>
+                                            <th class="sheet-small-table-header">Hit</th>
+                                        </tr>
+                                        <tr>
+                                            <td class="sheet-read-only-field">
+                                                <input
+                                                    type="text"
+                                                    name="attr_UnarmedDisplayName"
+                                                    value="Unarmed: Basic"
+                                                    readonly
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_UnarmedHitBonus"
+                                                    value="0"
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_UnarmedHit"
+                                                    value="0"
+                                                    readonly
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:attack} {{character=@{character_name}}} {{attackType=Unarmed}} {{roll=[[d20+@{UnarmedHit}@{PhysMod}+@{UnarmedHitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-small-table-header"></th>
+                                            <th class="sheet-small-table-header">Bonus Dmg</th>
+                                            <th class="sheet-small-table-header">Damage</th>
+                                            <th class="sheet-small-table-header">Dmg</th>
+                                        </tr>
+                                        <tr>
+                                            <th>Damage:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_UnarmedDmgBonus"
+                                                    value="0"
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td class="sheet-read-only-field">
+                                                <input type="hidden" name="attr_UnarmedRank" value="0" />
+                                                <input type="hidden" name="attr_RaceUnarmedRank" value="3" />
+                                                <input
+                                                    type="text"
+                                                    name="attr_UnarmedDmg"
+                                                    value="d6!"
+                                                    readonly
+                                                    class="sheet-dice-field"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:damage} {{character=@{character_name}}} {{damageType=Unarmed}} {{damage=[[(@{UnarmedDmg}+@{UnarmedDmgBonus}+@{DmgModTotal}+?{Modifier|0})*?{Multiplier|1}]]}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th colspan="4" class="sheet-small-table-header">Notes</th>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="4">
+                                                <input type="text" name="attr_UnarmedAccessory" value="" />
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
 
-                        <!--WEAPONS-->
-                        <table class="sheet-spacer-top-margin">
-                            <tr>
-                                <th colspan="4">
-                                    <h2>Primary Weapon</h2>
-                                </th>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header">Name</th>
-                                <th class="sheet-small-table-header">Hit Bonus</th>
-                                <th class="sheet-small-table-header">Specialization</th>
-                                <th class="sheet-small-table-header">Hit</th>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" name="attr_Weapon1Name" value="" />
-                                </td>
-                                <td>
-                                    <input
-                                        type="number"
-                                        name="attr_Weapon1HitBonus"
-                                        value="0"
-                                        class="sheet-numeric-wide"
-                                    />
-                                </td>
-                                <td>
-                                    <input type="number" name="attr_Weapon1Hit" value="0" class="sheet-numeric-wide" />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon1Name}}} {{roll=[[d20+@{Weapon1Hit}@{PhysMod}+@{Weapon1HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header"></th>
-                                <th class="sheet-small-table-header">Bonus Dmg</th>
-                                <th class="sheet-small-table-header">Damage</th>
-                                <th class="sheet-small-table-header">Dmg</th>
-                            </tr>
-                            <tr>
-                                <th>Damage:</th>
-                                <td>
-                                    <input
-                                        type="text"
-                                        name="attr_Weapon1DmgBonus"
-                                        value="0"
-                                        class="sheet-text-centred"
-                                    />
-                                </td>
-                                <td>
-                                    <input type="text" name="attr_Weapon1Dmg" value="0" class="sheet-dice-field" />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon1Name}}} {{damage=[[(@{Weapon1Dmg}+@{Weapon1DmgBonus}+@{W1DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th>Accessory:</th>
-                                <td colspan="2">
-                                    <input type="text" name="attr_Weapon1Acc" value="" />
-                                </td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Type:</th>
-                                <td>
-                                    <select name="attr_W1Type">
-                                        <option value="m">Melee</option>
-                                        <option value="r">Shooting</option>
-                                        <option value="o">Other</option>
-                                    </select>
-                                </td>
-                                <td><input type="hidden" name="attr_W1DmgMod" value="0" /></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Durability:</th>
-                                <td>
-                                    <input type="text" name="attr_Weapon1Dur" value="" class="sheet-text-centred" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Weight:</th>
-                                <td>
-                                    <input type="text" name="attr_Weapon1Wgt" value="" class="sheet-text-centred" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Ammo:</th>
-                                <td>
-                                    <input type="number" name="attr_Weapon1Ammo" value="" class="sheet-numeric-wide" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                        </table>
+                        <div class="sheet-collapse-wrapper">
+                            <h2 class="sheet-table-header-collapse">Alternate Unarmed</h2>
+                            <div class="sheet-collapse-section">
+                                <input
+                                    type="checkbox"
+                                    name="attr_ExpandedAltUnarmed"
+                                    checked="true"
+                                    class="sheet-expand-collapse-checkbox"
+                                />
+                                <span class="sheet-expand-collapse-symbol"></span>
+                                <div class="sheet-collapsible">
+                                    <table>
+                                        <tr>
+                                            <th class="sheet-small-table-header">Name</th>
+                                            <th class="sheet-small-table-header">Hit Bonus</th>
+                                            <th class="sheet-small-table-header">Specialization</th>
+                                            <th class="sheet-small-table-header">Hit</th>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_AltUnarmedName"
+                                                    value="Alternate Unarmed"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_AltUnarmedHitBonus"
+                                                    value="0"
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_AltUnarmedHit"
+                                                    value="0"
+                                                    readonly
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:attack} {{character=@{character_name}}} {{attackType=@{AltUnarmedName}}} {{roll=[[d20+@{AltUnarmedHit}@{PhysMod}+@{AltUnarmedHitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-small-table-header"></th>
+                                            <th class="sheet-small-table-header">Bonus Dmg</th>
+                                            <th class="sheet-small-table-header">Damage</th>
+                                            <th class="sheet-small-table-header">Dmg</th>
+                                        </tr>
+                                        <tr>
+                                            <th>Damage:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_AltUnarmedDmgBonus"
+                                                    value="0"
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_AltUnarmedDmg"
+                                                    value="d6!"
+                                                    class="sheet-dice-field"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:damage} {{character=@{character_name}}} {{damageType=@{AltUnarmedName}}} {{damage=[[(@{AltUnarmedDmg}+@{AltUnarmedDmgBonus}+@{DmgModTotal}+?{Modifier|0})*?{Multiplier|1}]]}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th colspan="4" class="sheet-small-table-header">Notes</th>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="4">
+                                                <input type="text" name="attr_AltUnarmedAccessory" value="" />
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
 
-                        <table class="sheet-spacer-top-margin">
-                            <tr>
-                                <th colspan="4">
-                                    <h2>Secondary Weapon</h2>
-                                </th>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header">Name</th>
-                                <th class="sheet-small-table-header">Hit Bonus</th>
-                                <th class="sheet-small-table-header">Specialization</th>
-                                <th class="sheet-small-table-header">Hit</th>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" name="attr_Weapon2Name" value="" />
-                                </td>
-                                <td>
-                                    <input
-                                        type="number"
-                                        name="attr_Weapon2HitBonus"
-                                        value="0"
-                                        class="sheet-numeric-wide"
-                                    />
-                                </td>
-                                <td>
-                                    <input type="number" name="attr_Weapon2Hit" value="0" class="sheet-numeric-wide" />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon2Name}}} {{roll=[[d20+@{Weapon2Hit}@{PhysMod}+@{Weapon2HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header"></th>
-                                <th class="sheet-small-table-header">Bonus Dmg</th>
-                                <th class="sheet-small-table-header">Damage</th>
-                                <th class="sheet-small-table-header">Dmg</th>
-                            </tr>
-                            <tr>
-                                <th>Damage:</th>
-                                <td>
-                                    <input
-                                        type="text"
-                                        name="attr_Weapon2DmgBonus"
-                                        value="0"
-                                        class="sheet-text-centred"
-                                    />
-                                </td>
-                                <td>
-                                    <input type="text" name="attr_Weapon2Dmg" value="0" class="sheet-dice-field" />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon2Name}}} {{damage=[[(@{Weapon2Dmg}+@{Weapon2DmgBonus}+@{W2DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th>Accessory:</th>
-                                <td colspan="2">
-                                    <input type="text" name="attr_Weapon2Acc" value="" />
-                                </td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Type:</th>
-                                <td>
-                                    <select name="attr_W2Type">
-                                        <option value="m">Melee</option>
-                                        <option value="r">Shooting</option>
-                                        <option value="o">Other</option>
-                                    </select>
-                                </td>
-                                <td><input type="hidden" name="attr_W2DmgMod" value="0" /></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Durability:</th>
-                                <td>
-                                    <input type="text" name="attr_Weapon2Dur" value="" class="sheet-text-centred" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Weight:</th>
-                                <td>
-                                    <input type="text" name="attr_Weapon2Wgt" value="" class="sheet-text-centred" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Ammo:</th>
-                                <td>
-                                    <input type="number" name="attr_Weapon2Ammo" value="" class="sheet-numeric-wide" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                        </table>
+                        <div class="sheet-collapse-wrapper">
+                            <h2 class="sheet-table-header-collapse">Racial Unarmed</h2>
+                            <div class="sheet-collapse-section">
+                                <input
+                                    type="checkbox"
+                                    name="attr_ExpandedRaceUnarmed"
+                                    checked="true"
+                                    class="sheet-expand-collapse-checkbox"
+                                />
+                                <span class="sheet-expand-collapse-symbol"></span>
+                                <div class="sheet-collapsible">
+                                    <table>
+                                        <tr>
+                                            <th class="sheet-small-table-header">Name</th>
+                                            <th class="sheet-small-table-header">Hit Bonus</th>
+                                            <th class="sheet-small-table-header">Specialization</th>
+                                            <th class="sheet-small-table-header">Hit</th>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_RacialUnarmedName"
+                                                    value="Racial Unarmed"
+                                                    readonly
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_RacialUnarmedHitBonus"
+                                                    value="0"
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_RacialUnarmedHit"
+                                                    value="0"
+                                                    readonly
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:attack} {{character=@{character_name}}} {{attackType=@{RacialUnarmedName}}} {{roll=[[d20+@{RacialUnarmedHit}@{PhysMod}+@{RacialUnarmedHitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-small-table-header"></th>
+                                            <th class="sheet-small-table-header">Bonus Dmg</th>
+                                            <th class="sheet-small-table-header">Damage</th>
+                                            <th class="sheet-small-table-header">Dmg</th>
+                                        </tr>
+                                        <tr>
+                                            <th>Damage:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_RacialUnarmedDmgBonus"
+                                                    value="0"
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_RacialUnarmedDmg"
+                                                    value="d6!"
+                                                    class="sheet-dice-field"
+                                                    readonly
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:damage} {{character=@{character_name}}} {{damageType=@{RacialUnarmedName}}} {{damage=[[(@{RacialUnarmedDmg}+@{RacialUnarmedDmgBonus}+@{DmgModTotal}+?{Modifier|0})*?{Multiplier|1}]]}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th colspan="4" class="sheet-small-table-header">Notes</th>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="4" class="sheet-read-only-field">
+                                                <input
+                                                    type="text"
+                                                    name="attr_RacialUnarmedAccessory"
+                                                    value=""
+                                                    readonly
+                                                />
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
 
-                        <table class="sheet-spacer-top-margin">
-                            <tr>
-                                <th colspan="4">
-                                    <h2>Third Weapon</h2>
-                                </th>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header">Name</th>
-                                <th class="sheet-small-table-header">Hit Bonus</th>
-                                <th class="sheet-small-table-header">Specialization</th>
-                                <th class="sheet-small-table-header">Hit</th>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" name="attr_Weapon3Name" value="" />
-                                </td>
-                                <td>
-                                    <input
-                                        type="number"
-                                        name="attr_Weapon3HitBonus"
-                                        value="0"
-                                        class="sheet-numeric-wide"
-                                    />
-                                </td>
-                                <td>
-                                    <input type="number" name="attr_Weapon3Hit" value="0" class="sheet-numeric-wide" />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon3Name}}} {{roll=[[d20+@{Weapon3Hit}@{PhysMod}+@{Weapon3HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header"></th>
-                                <th class="sheet-small-table-header">Bonus Dmg</th>
-                                <th class="sheet-small-table-header">Damage</th>
-                                <th class="sheet-small-table-header">Dmg</th>
-                            </tr>
-                            <tr>
-                                <th>Damage:</th>
-                                <td>
-                                    <input
-                                        type="text"
-                                        name="attr_Weapon3DmgBonus"
-                                        value="0"
-                                        class="sheet-text-centred"
-                                    />
-                                </td>
-                                <td>
-                                    <input type="text" name="attr_Weapon3Dmg" value="0" class="sheet-dice-field" />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon3Name}}} {{damage=[[(@{Weapon3Dmg}+@{Weapon3DmgBonus}+@{W3DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th>Accessory:</th>
-                                <td colspan="2">
-                                    <input type="text" name="attr_Weapon3Acc" value="" />
-                                </td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Type:</th>
-                                <td>
-                                    <select name="attr_W3Type">
-                                        <option value="m">Melee</option>
-                                        <option value="r">Shooting</option>
-                                        <option value="o">Other</option>
-                                    </select>
-                                </td>
-                                <td><input type="hidden" name="attr_W3DmgMod" value="0" /></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Durability:</th>
-                                <td>
-                                    <input type="text" name="attr_Weapon3Dur" value="" class="sheet-text-centred" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Weight:</th>
-                                <td>
-                                    <input type="text" name="attr_Weapon3Wgt" value="" class="sheet-text-centred" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Ammo:</th>
-                                <td>
-                                    <input type="number" name="attr_Weapon3Ammo" value="" class="sheet-numeric-wide" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                        </table>
+                        <h1 class="sheet-spacer-top-margin">Weapons</h1>
 
-                        <table class="sheet-spacer-top-margin">
-                            <tr>
-                                <th colspan="4">
-                                    <h2>Fourth Weapon</h2>
-                                </th>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header">Name</th>
-                                <th class="sheet-small-table-header">Hit Bonus</th>
-                                <th class="sheet-small-table-header">Specialization</th>
-                                <th class="sheet-small-table-header">Hit</th>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" name="attr_Weapon4Name" value="" />
-                                </td>
-                                <td>
-                                    <input
-                                        type="number"
-                                        name="attr_Weapon4HitBonus"
-                                        value="0"
-                                        class="sheet-numeric-wide"
-                                    />
-                                </td>
-                                <td>
-                                    <input type="number" name="attr_Weapon4Hit" value="0" class="sheet-numeric-wide" />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon4Name}}} {{roll=[[d20+@{Weapon4Hit}@{PhysMod}+@{Weapon4HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header"></th>
-                                <th class="sheet-small-table-header">Bonus Dmg</th>
-                                <th class="sheet-small-table-header">Damage</th>
-                                <th class="sheet-small-table-header">Dmg</th>
-                            </tr>
-                            <tr>
-                                <th>Damage:</th>
-                                <td>
-                                    <input
-                                        type="text"
-                                        name="attr_Weapon4DmgBonus"
-                                        value="0"
-                                        class="sheet-text-centred"
-                                    />
-                                </td>
-                                <td>
-                                    <input type="text" name="attr_Weapon4Dmg" value="0" class="sheet-dice-field" />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon4Name}}} {{damage=[[(@{Weapon4Dmg}+@{Weapon4DmgBonus}+@{W4DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th>Accessory:</th>
-                                <td colspan="2">
-                                    <input type="text" name="attr_Weapon4Acc" value="" />
-                                </td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Type:</th>
-                                <td>
-                                    <select name="attr_W4Type">
-                                        <option value="m">Melee</option>
-                                        <option value="r">Shooting</option>
-                                        <option value="o">Other</option>
-                                    </select>
-                                </td>
-                                <td><input type="hidden" name="attr_W4DmgMod" value="0" /></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Durability:</th>
-                                <td>
-                                    <input type="text" name="attr_Weapon4Dur" value="" class="sheet-text-centred" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Weight:</th>
-                                <td>
-                                    <input type="text" name="attr_Weapon4Wgt" value="" class="sheet-text-centred" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Ammo:</th>
-                                <td>
-                                    <input type="number" name="attr_Weapon4Ammo" value="" class="sheet-numeric-wide" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                        </table>
+                        <div class="sheet-collapse-wrapper">
+                            <h2 class="sheet-table-header-collapse">Primary Weapon</h2>
+                            <div class="sheet-collapse-section">
+                                <input
+                                    type="checkbox"
+                                    name="attr_ExpandedWeapon1"
+                                    checked="true"
+                                    class="sheet-expand-collapse-checkbox"
+                                />
+                                <span class="sheet-expand-collapse-symbol"></span>
+                                <div class="sheet-collapsible">
+                                    <table>
+                                        <tr>
+                                            <th class="sheet-small-table-header">Name</th>
+                                            <th class="sheet-small-table-header">Hit Bonus</th>
+                                            <th class="sheet-small-table-header">Specialization</th>
+                                            <th class="sheet-small-table-header">Hit</th>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" name="attr_Weapon1Name" value="" />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon1HitBonus"
+                                                    value="0"
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon1Hit"
+                                                    value="0"
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon1Name}}} {{roll=[[d20+@{Weapon1Hit}@{PhysMod}+@{Weapon1HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-small-table-header"></th>
+                                            <th class="sheet-small-table-header">Bonus Dmg</th>
+                                            <th class="sheet-small-table-header">Damage</th>
+                                            <th class="sheet-small-table-header">Dmg</th>
+                                        </tr>
+                                        <tr>
+                                            <th>Damage:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon1DmgBonus"
+                                                    value="0"
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon1Dmg"
+                                                    value="0"
+                                                    class="sheet-dice-field"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon1Name}}} {{damage=[[(@{Weapon1Dmg}+@{Weapon1DmgBonus}+@{W1DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>Notes:</th>
+                                            <td colspan="2">
+                                                <input type="text" name="attr_Weapon1Acc" value="" />
+                                            </td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Type:</th>
+                                            <td>
+                                                <select name="attr_W1Type">
+                                                    <option value="m">Melee</option>
+                                                    <option value="r">Shooting</option>
+                                                    <option value="o">Other</option>
+                                                </select>
+                                            </td>
+                                            <td><input type="hidden" name="attr_W1DmgMod" value="0" /></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Durability:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon1Dur"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Weight:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon1Wgt"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Ammo:</th>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon1Ammo"
+                                                    value=""
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
 
-                        <table class="sheet-spacer-top-margin">
-                            <tr>
-                                <th colspan="4">
-                                    <h2>Fifth Weapon</h2>
-                                </th>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header">Name</th>
-                                <th class="sheet-small-table-header">Hit Bonus</th>
-                                <th class="sheet-small-table-header">Specialization</th>
-                                <th class="sheet-small-table-header">Hit</th>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" name="attr_Weapon5Name" value="" />
-                                </td>
-                                <td>
-                                    <input
-                                        type="number"
-                                        name="attr_Weapon5HitBonus"
-                                        value="0"
-                                        class="sheet-numeric-wide"
-                                    />
-                                </td>
-                                <td>
-                                    <input type="number" name="attr_Weapon5Hit" value="0" class="sheet-numeric-wide" />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon5Name}}} {{roll=[[d20+@{Weapon5Hit}@{PhysMod}+@{Weapon5HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header"></th>
-                                <th class="sheet-small-table-header">Bonus Dmg</th>
-                                <th class="sheet-small-table-header">Damage</th>
-                                <th class="sheet-small-table-header">Dmg</th>
-                            </tr>
-                            <tr>
-                                <th>Damage:</th>
-                                <td>
-                                    <input
-                                        type="text"
-                                        name="attr_Weapon5DmgBonus"
-                                        value="0"
-                                        class="sheet-text-centred"
-                                    />
-                                </td>
-                                <td>
-                                    <input type="text" name="attr_Weapon5Dmg" value="0" class="sheet-dice-field" />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon5Name}}} {{damage=[[(@{Weapon5Dmg}+@{Weapon5DmgBonus}+@{W5DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th>Accessory:</th>
-                                <td colspan="2">
-                                    <input type="text" name="attr_Weapon5Acc" value="" />
-                                </td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Type:</th>
-                                <td>
-                                    <select name="attr_W5Type">
-                                        <option value="m">Melee</option>
-                                        <option value="r">Shooting</option>
-                                        <option value="o">Other</option>
-                                    </select>
-                                </td>
-                                <td><input type="hidden" name="attr_W5DmgMod" value="0" /></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Durability:</th>
-                                <td>
-                                    <input type="text" name="attr_Weapon5Dur" value="" class="sheet-text-centred" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Weight:</th>
-                                <td>
-                                    <input type="text" name="attr_Weapon5Wgt" value="" class="sheet-text-centred" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Ammo:</th>
-                                <td>
-                                    <input type="number" name="attr_Weapon5Ammo" value="" class="sheet-numeric-wide" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                        </table>
+                        <div class="sheet-collapse-wrapper">
+                            <h2 class="sheet-table-header-collapse">Secondary Weapon</h2>
+                            <div class="sheet-collapse-section">
+                                <input
+                                    type="checkbox"
+                                    name="attr_ExpandedWeapon2"
+                                    checked="true"
+                                    class="sheet-expand-collapse-checkbox"
+                                />
+                                <span class="sheet-expand-collapse-symbol"></span>
+                                <div class="sheet-collapsible">
+                                    <table>
+                                        <tr>
+                                            <th class="sheet-small-table-header">Name</th>
+                                            <th class="sheet-small-table-header">Hit Bonus</th>
+                                            <th class="sheet-small-table-header">Specialization</th>
+                                            <th class="sheet-small-table-header">Hit</th>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" name="attr_Weapon2Name" value="" />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon2HitBonus"
+                                                    value="0"
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon2Hit"
+                                                    value="0"
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon2Name}}} {{roll=[[d20+@{Weapon2Hit}@{PhysMod}+@{Weapon2HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-small-table-header"></th>
+                                            <th class="sheet-small-table-header">Bonus Dmg</th>
+                                            <th class="sheet-small-table-header">Damage</th>
+                                            <th class="sheet-small-table-header">Dmg</th>
+                                        </tr>
+                                        <tr>
+                                            <th>Damage:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon2DmgBonus"
+                                                    value="0"
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon2Dmg"
+                                                    value="0"
+                                                    class="sheet-dice-field"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon2Name}}} {{damage=[[(@{Weapon2Dmg}+@{Weapon2DmgBonus}+@{W2DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>Notes:</th>
+                                            <td colspan="2">
+                                                <input type="text" name="attr_Weapon2Acc" value="" />
+                                            </td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Type:</th>
+                                            <td>
+                                                <select name="attr_W2Type">
+                                                    <option value="m">Melee</option>
+                                                    <option value="r">Shooting</option>
+                                                    <option value="o">Other</option>
+                                                </select>
+                                            </td>
+                                            <td><input type="hidden" name="attr_W2DmgMod" value="0" /></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Durability:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon2Dur"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Weight:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon2Wgt"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Ammo:</th>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon2Ammo"
+                                                    value=""
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
 
-                        <table class="sheet-spacer-top-margin">
-                            <tr>
-                                <th colspan="4">
-                                    <h2>Sixth Weapon</h2>
-                                </th>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header">Name</th>
-                                <th class="sheet-small-table-header">Hit Bonus</th>
-                                <th class="sheet-small-table-header">Specialization</th>
-                                <th class="sheet-small-table-header">Hit</th>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" name="attr_Weapon6Name" value="" />
-                                </td>
-                                <td>
-                                    <input
-                                        type="number"
-                                        name="attr_Weapon6HitBonus"
-                                        value="0"
-                                        class="sheet-numeric-wide"
-                                    />
-                                </td>
-                                <td>
-                                    <input type="number" name="attr_Weapon6Hit" value="0" class="sheet-numeric-wide" />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon6Name}}} {{roll=[[d20+@{Weapon6Hit}@{PhysMod}+@{Weapon6HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header"></th>
-                                <th class="sheet-small-table-header">Bonus Dmg</th>
-                                <th class="sheet-small-table-header">Damage</th>
-                                <th class="sheet-small-table-header">Dmg</th>
-                            </tr>
-                            <tr>
-                                <th>Damage:</th>
-                                <td>
-                                    <input
-                                        type="text"
-                                        name="attr_Weapon6DmgBonus"
-                                        value="0"
-                                        class="sheet-text-centred"
-                                    />
-                                </td>
-                                <td>
-                                    <input type="text" name="attr_Weapon6Dmg" value="0" class="sheet-dice-field" />
-                                </td>
-                                <td class="sheet-button-cell">
-                                    <button
-                                        type="roll"
-                                        value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon6Name}}} {{damage=[[(@{Weapon6Dmg}+@{Weapon6DmgBonus}+@{W6DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}"
-                                    ></button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th>Accessory:</th>
-                                <td colspan="2">
-                                    <input type="text" name="attr_Weapon6Acc" value="" />
-                                </td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Type:</th>
-                                <td>
-                                    <select name="attr_W6Type">
-                                        <option value="m">Melee</option>
-                                        <option value="r">Shooting</option>
-                                        <option value="o">Other</option>
-                                    </select>
-                                </td>
-                                <td><input type="hidden" name="attr_W6DmgMod" value="0" /></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Durability:</th>
-                                <td>
-                                    <input type="text" name="attr_Weapon6Dur" value="" class="sheet-text-centred" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Weight:</th>
-                                <td>
-                                    <input type="text" name="attr_Weapon6Wgt" value="" class="sheet-text-centred" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <th>Ammo:</th>
-                                <td>
-                                    <input type="number" name="attr_Weapon6Ammo" value="" class="sheet-numeric-wide" />
-                                </td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                        </table>
+                        <div class="sheet-collapse-wrapper">
+                            <h2 class="sheet-table-header-collapse">Third Weapon</h2>
+                            <div class="sheet-collapse-section">
+                                <input
+                                    type="checkbox"
+                                    name="attr_ExpandedWeapon3"
+                                    checked="true"
+                                    class="sheet-expand-collapse-checkbox"
+                                />
+                                <span class="sheet-expand-collapse-symbol"></span>
+                                <div class="sheet-collapsible">
+                                    <table>
+                                        <tr>
+                                            <th class="sheet-small-table-header">Name</th>
+                                            <th class="sheet-small-table-header">Hit Bonus</th>
+                                            <th class="sheet-small-table-header">Specialization</th>
+                                            <th class="sheet-small-table-header">Hit</th>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" name="attr_Weapon3Name" value="" />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon3HitBonus"
+                                                    value="0"
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon3Hit"
+                                                    value="0"
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon3Name}}} {{roll=[[d20+@{Weapon3Hit}@{PhysMod}+@{Weapon3HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-small-table-header"></th>
+                                            <th class="sheet-small-table-header">Bonus Dmg</th>
+                                            <th class="sheet-small-table-header">Damage</th>
+                                            <th class="sheet-small-table-header">Dmg</th>
+                                        </tr>
+                                        <tr>
+                                            <th>Damage:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon3DmgBonus"
+                                                    value="0"
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon3Dmg"
+                                                    value="0"
+                                                    class="sheet-dice-field"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon3Name}}} {{damage=[[(@{Weapon3Dmg}+@{Weapon3DmgBonus}+@{W3DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>Notes:</th>
+                                            <td colspan="2">
+                                                <input type="text" name="attr_Weapon3Acc" value="" />
+                                            </td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Type:</th>
+                                            <td>
+                                                <select name="attr_W3Type">
+                                                    <option value="m">Melee</option>
+                                                    <option value="r">Shooting</option>
+                                                    <option value="o">Other</option>
+                                                </select>
+                                            </td>
+                                            <td><input type="hidden" name="attr_W3DmgMod" value="0" /></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Durability:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon3Dur"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Weight:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon3Wgt"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Ammo:</th>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon3Ammo"
+                                                    value=""
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="sheet-collapse-wrapper">
+                            <h2 class="sheet-table-header-collapse">Fourth Weapon</h2>
+                            <div class="sheet-collapse-section">
+                                <input
+                                    type="checkbox"
+                                    name="attr_ExpandedWeapon4"
+                                    checked="true"
+                                    class="sheet-expand-collapse-checkbox"
+                                />
+                                <span class="sheet-expand-collapse-symbol"></span>
+                                <div class="sheet-collapsible">
+                                    <table>
+                                        <tr>
+                                            <th class="sheet-small-table-header">Name</th>
+                                            <th class="sheet-small-table-header">Hit Bonus</th>
+                                            <th class="sheet-small-table-header">Specialization</th>
+                                            <th class="sheet-small-table-header">Hit</th>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" name="attr_Weapon4Name" value="" />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon4HitBonus"
+                                                    value="0"
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon4Hit"
+                                                    value="0"
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon4Name}}} {{roll=[[d20+@{Weapon4Hit}@{PhysMod}+@{Weapon4HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-small-table-header"></th>
+                                            <th class="sheet-small-table-header">Bonus Dmg</th>
+                                            <th class="sheet-small-table-header">Damage</th>
+                                            <th class="sheet-small-table-header">Dmg</th>
+                                        </tr>
+                                        <tr>
+                                            <th>Damage:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon4DmgBonus"
+                                                    value="0"
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon4Dmg"
+                                                    value="0"
+                                                    class="sheet-dice-field"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon4Name}}} {{damage=[[(@{Weapon4Dmg}+@{Weapon4DmgBonus}+@{W4DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>Notes:</th>
+                                            <td colspan="2">
+                                                <input type="text" name="attr_Weapon4Acc" value="" />
+                                            </td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Type:</th>
+                                            <td>
+                                                <select name="attr_W4Type">
+                                                    <option value="m">Melee</option>
+                                                    <option value="r">Shooting</option>
+                                                    <option value="o">Other</option>
+                                                </select>
+                                            </td>
+                                            <td><input type="hidden" name="attr_W4DmgMod" value="0" /></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Durability:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon4Dur"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Weight:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon4Wgt"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Ammo:</th>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon4Ammo"
+                                                    value=""
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="sheet-collapse-wrapper">
+                            <h2 class="sheet-table-header-collapse">Fifth Weapon</h2>
+                            <div class="sheet-collapse-section">
+                                <input
+                                    type="checkbox"
+                                    name="attr_ExpandedWeapon5"
+                                    checked="true"
+                                    class="sheet-expand-collapse-checkbox"
+                                />
+                                <span class="sheet-expand-collapse-symbol"></span>
+                                <div class="sheet-collapsible">
+                                    <table>
+                                        <tr>
+                                            <th class="sheet-small-table-header">Name</th>
+                                            <th class="sheet-small-table-header">Hit Bonus</th>
+                                            <th class="sheet-small-table-header">Specialization</th>
+                                            <th class="sheet-small-table-header">Hit</th>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" name="attr_Weapon5Name" value="" />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon5HitBonus"
+                                                    value="0"
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon5Hit"
+                                                    value="0"
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon5Name}}} {{roll=[[d20+@{Weapon5Hit}@{PhysMod}+@{Weapon5HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-small-table-header"></th>
+                                            <th class="sheet-small-table-header">Bonus Dmg</th>
+                                            <th class="sheet-small-table-header">Damage</th>
+                                            <th class="sheet-small-table-header">Dmg</th>
+                                        </tr>
+                                        <tr>
+                                            <th>Damage:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon5DmgBonus"
+                                                    value="0"
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon5Dmg"
+                                                    value="0"
+                                                    class="sheet-dice-field"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon5Name}}} {{damage=[[(@{Weapon5Dmg}+@{Weapon5DmgBonus}+@{W5DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>Notes:</th>
+                                            <td colspan="2">
+                                                <input type="text" name="attr_Weapon5Acc" value="" />
+                                            </td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Type:</th>
+                                            <td>
+                                                <select name="attr_W5Type">
+                                                    <option value="m">Melee</option>
+                                                    <option value="r">Shooting</option>
+                                                    <option value="o">Other</option>
+                                                </select>
+                                            </td>
+                                            <td><input type="hidden" name="attr_W5DmgMod" value="0" /></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Durability:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon5Dur"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Weight:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon5Wgt"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Ammo:</th>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon5Ammo"
+                                                    value=""
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="sheet-collapse-wrapper">
+                            <h2 class="sheet-table-header-collapse">Sixth Weapon</h2>
+                            <div class="sheet-collapse-section">
+                                <input
+                                    type="checkbox"
+                                    name="attr_ExpandedWeapon6"
+                                    checked="true"
+                                    class="sheet-expand-collapse-checkbox"
+                                />
+                                <span class="sheet-expand-collapse-symbol"></span>
+                                <div class="sheet-collapsible">
+                                    <table>
+                                        <tr>
+                                            <th class="sheet-small-table-header">Name</th>
+                                            <th class="sheet-small-table-header">Hit Bonus</th>
+                                            <th class="sheet-small-table-header">Specialization</th>
+                                            <th class="sheet-small-table-header">Hit</th>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" name="attr_Weapon6Name" value="" />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon6HitBonus"
+                                                    value="0"
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon6Hit"
+                                                    value="0"
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:attack} {{character=@{character_name}}} {{attackType=@{Weapon6Name}}} {{roll=[[d20+@{Weapon6Hit}@{PhysMod}+@{Weapon6HitBonus}+?{Modifier|0}]]}} {{actions=?{Actions|1}}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-small-table-header"></th>
+                                            <th class="sheet-small-table-header">Bonus Dmg</th>
+                                            <th class="sheet-small-table-header">Damage</th>
+                                            <th class="sheet-small-table-header">Dmg</th>
+                                        </tr>
+                                        <tr>
+                                            <th>Damage:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon6DmgBonus"
+                                                    value="0"
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon6Dmg"
+                                                    value="0"
+                                                    class="sheet-dice-field"
+                                                />
+                                            </td>
+                                            <td class="sheet-button-cell">
+                                                <button
+                                                    type="roll"
+                                                    value="&{template:damage} {{character=@{character_name}}} {{damageType=@{Weapon6Name}}} {{damage=[[(@{Weapon6Dmg}+@{Weapon6DmgBonus}+@{W6DmgMod}+?{Modifier|0})*?{Multiplier|1}]]}}"
+                                                ></button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>Notes:</th>
+                                            <td colspan="2">
+                                                <input type="text" name="attr_Weapon6Acc" value="" />
+                                            </td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Type:</th>
+                                            <td>
+                                                <select name="attr_W6Type">
+                                                    <option value="m">Melee</option>
+                                                    <option value="r">Shooting</option>
+                                                    <option value="o">Other</option>
+                                                </select>
+                                            </td>
+                                            <td><input type="hidden" name="attr_W6DmgMod" value="0" /></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Durability:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon6Dur"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Weight:</th>
+                                            <td>
+                                                <input
+                                                    type="text"
+                                                    name="attr_Weapon6Wgt"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>Ammo:</th>
+                                            <td>
+                                                <input
+                                                    type="number"
+                                                    name="attr_Weapon6Ammo"
+                                                    value=""
+                                                    class="sheet-numeric-wide"
+                                                />
+                                            </td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
                     </div>
 
                     <div class="sheet-column-grow">
@@ -7314,250 +7683,342 @@
                             </tr>
                         </table>
 
-                        <table class="sheet-spacer-top-margin">
-                            <tr>
-                                <th colspan="5">
-                                    <h2>Armor</h2>
-                                </th>
-                            </tr>
-                            <tr>
-                                <th class="sheet-small-table-header">Slot</th>
-                                <th class="sheet-small-table-header">Name</th>
-                                <th class="sheet-small-table-header">Weight</th>
-                                <th class="sheet-small-table-header">Durability</th>
-                                <th class="sheet-small-table-header">Armor Rating</th>
-                            </tr>
-                            <tr>
-                                <th class="sheet-skillname">Helmet</th>
-                                <td>
-                                    <input type="text" name="attr_HelmetName" value="" />
-                                </td>
-                                <td class="sheet-cell-centred">
-                                    <input type="text" name="attr_HelmetWeight" value="" class="sheet-text-centred" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="text" name="attr_HelmetDur" value="" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="number" name="attr_HelmetAR" value="0" />
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-skillname">Amulet</th>
-                                <td>
-                                    <input type="text" name="attr_AmuletName" value="" />
-                                </td>
-                                <td class="sheet-cell-centred">
-                                    <input type="text" name="attr_AmuletWeight" value="" class="sheet-text-centred" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="text" name="attr_AmuletDur" value="" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="number" name="attr_AmuletAR" value="0" />
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-skillname">Cloak</th>
-                                <td>
-                                    <input type="text" name="attr_CloakName" value="" />
-                                </td>
-                                <td class="sheet-cell-centred">
-                                    <input type="text" name="attr_CloakWeight" value="" class="sheet-text-centred" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="text" name="attr_CloakDur" value="" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="number" name="attr_CloakAR" value="0" />
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-skillname">Pauldrons</th>
-                                <td>
-                                    <input type="text" name="attr_PauldronsName" value="" />
-                                </td>
-                                <td class="sheet-cell-centred">
-                                    <input
-                                        type="text"
-                                        name="attr_PauldronsWeight"
-                                        value=""
-                                        class="sheet-text-centred"
-                                    />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="text" name="attr_PauldronsDur" value="" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="number" name="attr_PauldronsAR" value="0" />
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-skillname">Clothing</th>
-                                <td>
-                                    <input type="text" name="attr_ClothingName" value="" />
-                                </td>
-                                <td class="sheet-cell-centred">
-                                    <input type="text" name="attr_ClothingWeight" value="" class="sheet-text-centred" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="text" name="attr_ClothingDur" value="" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="number" name="attr_ClothingAR" value="0" />
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-skillname">Torso</th>
-                                <td>
-                                    <input type="text" name="attr_TorsoName" value="" />
-                                </td>
-                                <td class="sheet-cell-centred">
-                                    <input type="text" name="attr_TorsoWeight" value="" class="sheet-text-centred" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="text" name="attr_TorsoDur" value="" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="number" name="attr_TorsoAR" value="0" />
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-skillname">Bracers</th>
-                                <td>
-                                    <input type="text" name="attr_BracersName" value="" />
-                                </td>
-                                <td class="sheet-cell-centred">
-                                    <input type="text" name="attr_BracersWeight" value="" class="sheet-text-centred" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="text" name="attr_BracersDur" value="" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="number" name="attr_BracersAR" value="0" />
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-skillname">Gloves</th>
-                                <td>
-                                    <input type="text" name="attr_GlovesName" value="" />
-                                </td>
-                                <td class="sheet-cell-centred">
-                                    <input type="text" name="attr_GlovesWeight" value="" class="sheet-text-centred" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="text" name="attr_GlovesDur" value="" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="number" name="attr_GlovesAR" value="0" />
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-skillname">Belt</th>
-                                <td>
-                                    <input type="text" name="attr_BeltName" value="" />
-                                </td>
-                                <td class="sheet-cell-centred">
-                                    <input type="text" name="attr_BeltWeight" value="" class="sheet-text-centred" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="text" name="attr_BeltDur" value="" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="number" name="attr_BeltAR" value="0" />
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-skillname">Greaves</th>
-                                <td>
-                                    <input type="text" name="attr_GreavesName" value="" />
-                                </td>
-                                <td class="sheet-cell-centred">
-                                    <input type="text" name="attr_GreavesWeight" value="" class="sheet-text-centred" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="text" name="attr_GreavesDur" value="" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="number" name="attr_GreavesAR" value="0" />
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-skillname">Boots</th>
-                                <td>
-                                    <input type="text" name="attr_BootsName" value="" />
-                                </td>
-                                <td class="sheet-cell-centred">
-                                    <input type="text" name="attr_BootsWeight" value="" class="sheet-text-centred" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="text" name="attr_BootsDur" value="" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="number" name="attr_BootsAR" value="0" />
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-skillname">Ring</th>
-                                <td>
-                                    <input type="text" name="attr_RingName" value="" />
-                                </td>
-                                <td class="sheet-cell-centred">
-                                    <input type="text" name="attr_RingWeight" value="" class="sheet-text-centred" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="text" name="attr_RingDur" value="" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="number" name="attr_RingAR" value="0" />
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-skillname">Ring</th>
-                                <td>
-                                    <input type="text" name="attr_Ring2Name" value="" />
-                                </td>
-                                <td class="sheet-cell-centred">
-                                    <input type="text" name="attr_Ring2Weight" value="" class="sheet-text-centred" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="text" name="attr_Ring2Dur" value="" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="number" name="attr_Ring2AR" value="0" />
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-skillname">Other</th>
-                                <td>
-                                    <input type="text" name="attr_OtherName" value="" />
-                                </td>
-                                <td class="sheet-cell-centred">
-                                    <input type="text" name="attr_OtherWeight" value="" class="sheet-text-centred" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="text" name="attr_OtherDur" value="" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="number" name="attr_OtherAR" value="0" />
-                                </td>
-                            </tr>
-                            <tr>
-                                <th class="sheet-skillname">Other</th>
-                                <td>
-                                    <input type="text" name="attr_Other2Name" value="" />
-                                </td>
-                                <td class="sheet-cell-centred">
-                                    <input type="text" name="attr_Other2Weight" value="" class="sheet-text-centred" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="text" name="attr_Other2Dur" value="" />
-                                </td>
-                                <td class="sheet-cell-numeric">
-                                    <input type="number" name="attr_Other2AR" value="0" />
-                                </td>
-                            </tr>
-                        </table>
+                        <div class="sheet-collapse-wrapper">
+                            <h2 class="sheet-table-header-collapse">Armor</h2>
+                            <div class="sheet-collapse-section">
+                                <input
+                                    type="checkbox"
+                                    name="attr_ExpandedArmor"
+                                    checked="true"
+                                    class="sheet-expand-collapse-checkbox"
+                                />
+                                <span class="sheet-expand-collapse-symbol"></span>
+                                <div class="sheet-collapsible">
+                                    <table>
+                                        <tr>
+                                            <th class="sheet-small-table-header">Slot</th>
+                                            <th class="sheet-small-table-header">Name</th>
+                                            <th class="sheet-small-table-header">Weight</th>
+                                            <th class="sheet-small-table-header">Durability</th>
+                                            <th class="sheet-small-table-header">Armor Rating</th>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-skillname">Helmet</th>
+                                            <td>
+                                                <input type="text" name="attr_HelmetName" value="" />
+                                            </td>
+                                            <td class="sheet-cell-centred">
+                                                <input
+                                                    type="text"
+                                                    name="attr_HelmetWeight"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="text" name="attr_HelmetDur" value="" />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="number" name="attr_HelmetAR" value="0" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-skillname">Amulet</th>
+                                            <td>
+                                                <input type="text" name="attr_AmuletName" value="" />
+                                            </td>
+                                            <td class="sheet-cell-centred">
+                                                <input
+                                                    type="text"
+                                                    name="attr_AmuletWeight"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="text" name="attr_AmuletDur" value="" />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="number" name="attr_AmuletAR" value="0" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-skillname">Cloak</th>
+                                            <td>
+                                                <input type="text" name="attr_CloakName" value="" />
+                                            </td>
+                                            <td class="sheet-cell-centred">
+                                                <input
+                                                    type="text"
+                                                    name="attr_CloakWeight"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="text" name="attr_CloakDur" value="" />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="number" name="attr_CloakAR" value="0" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-skillname">Pauldrons</th>
+                                            <td>
+                                                <input type="text" name="attr_PauldronsName" value="" />
+                                            </td>
+                                            <td class="sheet-cell-centred">
+                                                <input
+                                                    type="text"
+                                                    name="attr_PauldronsWeight"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="text" name="attr_PauldronsDur" value="" />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="number" name="attr_PauldronsAR" value="0" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-skillname">Clothing</th>
+                                            <td>
+                                                <input type="text" name="attr_ClothingName" value="" />
+                                            </td>
+                                            <td class="sheet-cell-centred">
+                                                <input
+                                                    type="text"
+                                                    name="attr_ClothingWeight"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="text" name="attr_ClothingDur" value="" />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="number" name="attr_ClothingAR" value="0" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-skillname">Torso</th>
+                                            <td>
+                                                <input type="text" name="attr_TorsoName" value="" />
+                                            </td>
+                                            <td class="sheet-cell-centred">
+                                                <input
+                                                    type="text"
+                                                    name="attr_TorsoWeight"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="text" name="attr_TorsoDur" value="" />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="number" name="attr_TorsoAR" value="0" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-skillname">Bracers</th>
+                                            <td>
+                                                <input type="text" name="attr_BracersName" value="" />
+                                            </td>
+                                            <td class="sheet-cell-centred">
+                                                <input
+                                                    type="text"
+                                                    name="attr_BracersWeight"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="text" name="attr_BracersDur" value="" />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="number" name="attr_BracersAR" value="0" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-skillname">Gloves</th>
+                                            <td>
+                                                <input type="text" name="attr_GlovesName" value="" />
+                                            </td>
+                                            <td class="sheet-cell-centred">
+                                                <input
+                                                    type="text"
+                                                    name="attr_GlovesWeight"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="text" name="attr_GlovesDur" value="" />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="number" name="attr_GlovesAR" value="0" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-skillname">Belt</th>
+                                            <td>
+                                                <input type="text" name="attr_BeltName" value="" />
+                                            </td>
+                                            <td class="sheet-cell-centred">
+                                                <input
+                                                    type="text"
+                                                    name="attr_BeltWeight"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="text" name="attr_BeltDur" value="" />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="number" name="attr_BeltAR" value="0" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-skillname">Greaves</th>
+                                            <td>
+                                                <input type="text" name="attr_GreavesName" value="" />
+                                            </td>
+                                            <td class="sheet-cell-centred">
+                                                <input
+                                                    type="text"
+                                                    name="attr_GreavesWeight"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="text" name="attr_GreavesDur" value="" />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="number" name="attr_GreavesAR" value="0" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-skillname">Boots</th>
+                                            <td>
+                                                <input type="text" name="attr_BootsName" value="" />
+                                            </td>
+                                            <td class="sheet-cell-centred">
+                                                <input
+                                                    type="text"
+                                                    name="attr_BootsWeight"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="text" name="attr_BootsDur" value="" />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="number" name="attr_BootsAR" value="0" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-skillname">Ring</th>
+                                            <td>
+                                                <input type="text" name="attr_RingName" value="" />
+                                            </td>
+                                            <td class="sheet-cell-centred">
+                                                <input
+                                                    type="text"
+                                                    name="attr_RingWeight"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="text" name="attr_RingDur" value="" />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="number" name="attr_RingAR" value="0" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-skillname">Ring</th>
+                                            <td>
+                                                <input type="text" name="attr_Ring2Name" value="" />
+                                            </td>
+                                            <td class="sheet-cell-centred">
+                                                <input
+                                                    type="text"
+                                                    name="attr_Ring2Weight"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="text" name="attr_Ring2Dur" value="" />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="number" name="attr_Ring2AR" value="0" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-skillname">Other</th>
+                                            <td>
+                                                <input type="text" name="attr_OtherName" value="" />
+                                            </td>
+                                            <td class="sheet-cell-centred">
+                                                <input
+                                                    type="text"
+                                                    name="attr_OtherWeight"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="text" name="attr_OtherDur" value="" />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="number" name="attr_OtherAR" value="0" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th class="sheet-skillname">Other</th>
+                                            <td>
+                                                <input type="text" name="attr_Other2Name" value="" />
+                                            </td>
+                                            <td class="sheet-cell-centred">
+                                                <input
+                                                    type="text"
+                                                    name="attr_Other2Weight"
+                                                    value=""
+                                                    class="sheet-text-centred"
+                                                />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="text" name="attr_Other2Dur" value="" />
+                                            </td>
+                                            <td class="sheet-cell-numeric">
+                                                <input type="number" name="attr_Other2AR" value="0" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>Total Armor Value</th>
+                                            <td colspan="3"></td>
+                                            <td class="sheet-cell-numeric-readonly">
+                                                <input
+                                                    type="number"
+                                                    name="attr_TotalAR"
+                                                    value="0"
+                                                    readonly
+                                                    class="sheet-desctotalfield"
+                                                />
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
 
                         <h1 class="sheet-spacer-top-margin">Valuables</h1>
 
@@ -7776,7 +8237,7 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <th class="sheet-small-table-header" colspan="3">Accessories</th>
+                                    <th class="sheet-small-table-header" colspan="3">Notes</th>
                                 </tr>
                                 <tr>
                                     <td valign="center" colspan="3">
@@ -7992,7 +8453,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell1Name}}} {{character=@{character_name}}} {{area=@{Spell1Area}}} {{duration=@{Spell1Dur}}} {{actions=@{Spell1Act}}} {{drain=@{Spell1Drain}}} {{roll=[[d20+@{Spell1HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{Spell1Name}}} {{character=@{character_name}}} {{area=@{Spell1Area}}} {{duration=@{Spell1Dur}}} {{actions=@{Spell1Act}}} {{drain=@{Spell1Drain}}} {{roll=[[d20+@{Spell1HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -8067,7 +8528,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell2Name}}} {{character=@{character_name}}} {{area=@{Spell2Area}}} {{duration=@{Spell2Dur}}} {{actions=@{Spell2Act}}} {{drain=@{Spell2Drain}}} {{roll=[[d20+@{Spell2HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{Spell2Name}}} {{character=@{character_name}}} {{area=@{Spell2Area}}} {{duration=@{Spell2Dur}}} {{actions=@{Spell2Act}}} {{drain=@{Spell2Drain}}} {{roll=[[d20+@{Spell2HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -8142,7 +8603,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell3Name}}} {{character=@{character_name}}} {{area=@{Spell3Area}}} {{duration=@{Spell3Dur}}} {{actions=@{Spell3Act}}} {{drain=@{Spell3Drain}}} {{roll=[[d20+@{Spell3HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{Spell3Name}}} {{character=@{character_name}}} {{area=@{Spell3Area}}} {{duration=@{Spell3Dur}}} {{actions=@{Spell3Act}}} {{drain=@{Spell3Drain}}} {{roll=[[d20+@{Spell3HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -8217,7 +8678,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell4Name}}} {{character=@{character_name}}} {{area=@{Spell4Area}}} {{duration=@{Spell4Dur}}} {{actions=@{Spell4Act}}} {{drain=@{Spell4Drain}}} {{roll=[[d20+@{Spell4HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{Spell4Name}}} {{character=@{character_name}}} {{area=@{Spell4Area}}} {{duration=@{Spell4Dur}}} {{actions=@{Spell4Act}}} {{drain=@{Spell4Drain}}} {{roll=[[d20+@{Spell4HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -8292,7 +8753,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell5Name}}} {{character=@{character_name}}} {{area=@{Spell5Area}}} {{duration=@{Spell5Dur}}} {{actions=@{Spell5Act}}} {{drain=@{Spell5Drain}}} {{roll=[[d20+@{Spell5HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{Spell5Name}}} {{character=@{character_name}}} {{area=@{Spell5Area}}} {{duration=@{Spell5Dur}}} {{actions=@{Spell5Act}}} {{drain=@{Spell5Drain}}} {{roll=[[d20+@{Spell5HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -8367,7 +8828,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell6Name}}} {{character=@{character_name}}} {{area=@{Spell6Area}}} {{duration=@{Spell6Dur}}} {{actions=@{Spell6Act}}} {{drain=@{Spell6Drain}}} {{roll=[[d20+@{Spell6HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{Spell6Name}}} {{character=@{character_name}}} {{area=@{Spell6Area}}} {{duration=@{Spell6Dur}}} {{actions=@{Spell6Act}}} {{drain=@{Spell6Drain}}} {{roll=[[d20+@{Spell6HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -8442,7 +8903,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell7Name}}} {{character=@{character_name}}} {{area=@{Spell7Area}}} {{duration=@{Spell7Dur}}} {{actions=@{Spell7Act}}} {{drain=@{Spell7Drain}}} {{roll=[[d20+@{Spell7HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{Spell7Name}}} {{character=@{character_name}}} {{area=@{Spell7Area}}} {{duration=@{Spell7Dur}}} {{actions=@{Spell7Act}}} {{drain=@{Spell7Drain}}} {{roll=[[d20+@{Spell7HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -8517,7 +8978,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell8Name}}} {{character=@{character_name}}} {{area=@{Spell8Area}}} {{duration=@{Spell8Dur}}} {{actions=@{Spell8Act}}} {{drain=@{Spell8Drain}}} {{roll=[[d20+@{Spell8HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{Spell8Name}}} {{character=@{character_name}}} {{area=@{Spell8Area}}} {{duration=@{Spell8Dur}}} {{actions=@{Spell8Act}}} {{drain=@{Spell8Drain}}} {{roll=[[d20+@{Spell8HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -8592,7 +9053,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell9Name}}} {{character=@{character_name}}} {{area=@{Spell9Area}}} {{duration=@{Spell9Dur}}} {{actions=@{Spell9Act}}} {{drain=@{Spell9Drain}}} {{roll=[[d20+@{Spell9HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{Spell9Name}}} {{character=@{character_name}}} {{area=@{Spell9Area}}} {{duration=@{Spell9Dur}}} {{actions=@{Spell9Act}}} {{drain=@{Spell9Drain}}} {{roll=[[d20+@{Spell9HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -8667,7 +9128,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{Spell10Name}}} {{character=@{character_name}}} {{area=@{Spell10Area}}} {{duration=@{Spell10Dur}}} {{actions=@{Spell10Act}}} {{drain=@{Spell10Drain}}} {{roll=[[d20+@{Spell10HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{Spell10Name}}} {{character=@{character_name}}} {{area=@{Spell10Area}}} {{duration=@{Spell10Dur}}} {{actions=@{Spell10Act}}} {{drain=@{Spell10Drain}}} {{roll=[[d20+@{Spell10HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -8756,7 +9217,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell1Name}}} {{character=@{character_name}}} {{area=@{NCSpell1Area}}} {{duration=@{NCSpell1Dur}}} {{actions=@{NCSpell1Act}}} {{drain=@{NCSpell1Drain}}} {{roll=[[d20+@{NCSpell1HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{NCSpell1Name}}} {{character=@{character_name}}} {{area=@{NCSpell1Area}}} {{duration=@{NCSpell1Dur}}} {{actions=@{NCSpell1Act}}} {{drain=@{NCSpell1Drain}}} {{roll=[[d20+@{NCSpell1HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -8831,7 +9292,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell2Name}}} {{character=@{character_name}}} {{area=@{NCSpell2Area}}} {{duration=@{NCSpell2Dur}}} {{actions=@{NCSpell2Act}}} {{drain=@{NCSpell2Drain}}} {{roll=[[d20+@{NCSpell2HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{NCSpell2Name}}} {{character=@{character_name}}} {{area=@{NCSpell2Area}}} {{duration=@{NCSpell2Dur}}} {{actions=@{NCSpell2Act}}} {{drain=@{NCSpell2Drain}}} {{roll=[[d20+@{NCSpell2HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -8906,7 +9367,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell3Name}}} {{character=@{character_name}}} {{area=@{NCSpell3Area}}} {{duration=@{NCSpell3Dur}}} {{actions=@{NCSpell3Act}}} {{drain=@{NCSpell3Drain}}} {{roll=[[d20+@{NCSpell3HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{NCSpell3Name}}} {{character=@{character_name}}} {{area=@{NCSpell3Area}}} {{duration=@{NCSpell3Dur}}} {{actions=@{NCSpell3Act}}} {{drain=@{NCSpell3Drain}}} {{roll=[[d20+@{NCSpell3HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -8981,7 +9442,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell4Name}}} {{character=@{character_name}}} {{area=@{NCSpell4Area}}} {{duration=@{NCSpell4Dur}}} {{actions=@{NCSpell4Act}}} {{drain=@{NCSpell4Drain}}} {{roll=[[d20+@{NCSpell4HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{NCSpell4Name}}} {{character=@{character_name}}} {{area=@{NCSpell4Area}}} {{duration=@{NCSpell4Dur}}} {{actions=@{NCSpell4Act}}} {{drain=@{NCSpell4Drain}}} {{roll=[[d20+@{NCSpell4HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -9056,7 +9517,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell5Name}}} {{character=@{character_name}}} {{area=@{NCSpell5Area}}} {{duration=@{NCSpell5Dur}}} {{actions=@{NCSpell5Act}}} {{drain=@{NCSpell5Drain}}} {{roll=[[d20+@{NCSpell5HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{NCSpell5Name}}} {{character=@{character_name}}} {{area=@{NCSpell5Area}}} {{duration=@{NCSpell5Dur}}} {{actions=@{NCSpell5Act}}} {{drain=@{NCSpell5Drain}}} {{roll=[[d20+@{NCSpell5HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -9131,7 +9592,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell6Name}}} {{character=@{character_name}}} {{area=@{NCSpell6Area}}} {{duration=@{NCSpell6Dur}}} {{actions=@{NCSpell6Act}}} {{drain=@{NCSpell6Drain}}} {{roll=[[d20+@{NCSpell6HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{NCSpell6Name}}} {{character=@{character_name}}} {{area=@{NCSpell6Area}}} {{duration=@{NCSpell6Dur}}} {{actions=@{NCSpell6Act}}} {{drain=@{NCSpell6Drain}}} {{roll=[[d20+@{NCSpell6HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -9206,7 +9667,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell7Name}}} {{character=@{character_name}}} {{area=@{NCSpell7Area}}} {{duration=@{NCSpell7Dur}}} {{actions=@{NCSpell7Act}}} {{drain=@{NCSpell7Drain}}} {{roll=[[d20+@{NCSpell7HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{NCSpell7Name}}} {{character=@{character_name}}} {{area=@{NCSpell7Area}}} {{duration=@{NCSpell7Dur}}} {{actions=@{NCSpell7Act}}} {{drain=@{NCSpell7Drain}}} {{roll=[[d20+@{NCSpell7HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -9281,7 +9742,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell8Name}}} {{character=@{character_name}}} {{area=@{NCSpell8Area}}} {{duration=@{NCSpell8Dur}}} {{actions=@{NCSpell8Act}}} {{drain=@{NCSpell8Drain}}} {{roll=[[d20+@{NCSpell8HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{NCSpell8Name}}} {{character=@{character_name}}} {{area=@{NCSpell8Area}}} {{duration=@{NCSpell8Dur}}} {{actions=@{NCSpell8Act}}} {{drain=@{NCSpell8Drain}}} {{roll=[[d20+@{NCSpell8HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -9356,7 +9817,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell9Name}}} {{character=@{character_name}}} {{area=@{NCSpell9Area}}} {{duration=@{NCSpell9Dur}}} {{actions=@{NCSpell9Act}}} {{drain=@{NCSpell9Drain}}} {{roll=[[d20+@{NCSpell9HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{NCSpell9Name}}} {{character=@{character_name}}} {{area=@{NCSpell9Area}}} {{duration=@{NCSpell9Dur}}} {{actions=@{NCSpell9Act}}} {{drain=@{NCSpell9Drain}}} {{roll=[[d20+@{NCSpell9HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -9431,7 +9892,7 @@
                                     <td rowspan="2" class="sheet-button-cell">
                                         <button
                                             type="roll"
-                                            value="&{template:spell-cast} {{name=@{NCSpell10Name}}} {{character=@{character_name}}} {{area=@{NCSpell10Area}}} {{duration=@{NCSpell10Dur}}} {{actions=@{NCSpell10Act}}} {{drain=@{NCSpell10Drain}}} {{roll=[[d20+@{NCSpell10HitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                            value="&{template:spell-cast} {{name=@{NCSpell10Name}}} {{character=@{character_name}}} {{area=@{NCSpell10Area}}} {{duration=@{NCSpell10Dur}}} {{actions=@{NCSpell10Act}}} {{drain=@{NCSpell10Drain}}} {{roll=[[d20+@{NCSpell10HitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                         ></button>
                                     </td>
                                     <td>
@@ -9521,7 +9982,7 @@
                                         <td rowspan="2" class="sheet-button-cell">
                                             <button
                                                 type="roll"
-                                                value="&{template:spell-cast} {{name=@{SpellName}}} {{character=@{character_name}}} {{area=@{SpellArea}}} {{duration=@{SpellDur}}} {{actions=@{SpellAct}}} {{drain=@{SpellDrain}}} {{roll=[[d20+@{SpellHitMod}@{MenMod}+?{Modifier|0}]]}}"
+                                                value="&{template:spell-cast} {{name=@{SpellName}}} {{character=@{character_name}}} {{area=@{SpellArea}}} {{duration=@{SpellDur}}} {{actions=@{SpellAct}}} {{drain=@{SpellDrain}}} {{roll=[[d20+@{SpellHitMod}+@{IntCastModTotal}@{MenMod}+?{Modifier|0}]]}}"
                                             ></button>
                                         </td>
                                         <td>
@@ -9544,10 +10005,10 @@
                     </div>
                 </div>
 
-                <h1 class="sheet-spacer-top-margin">Chi Abilities</h1>
+                <h1 class="sheet-spacer-top-margin">Chi Powers</h1>
 
                 <div class="sheet-collapse-wrapper">
-                    <h2 class="sheet-table-header-collapse">Abilities</h2>
+                    <h2 class="sheet-table-header-collapse">Powers</h2>
                     <div class="sheet-collapse-section">
                         <input
                             type="checkbox"
@@ -9583,7 +10044,17 @@
                                             ></textarea>
                                         </td>
                                     </tr>
-                                    <tr class="sheet-spell-padding-row"></tr>
+                                    <tr>
+                                        <td rowspan="3" class="sheet-button-cell">
+                                            <button
+                                                type="roll"
+                                                class="sheet-display-text-button"
+                                                value="&{template:chi-power} {{name=@{ChiAbilityName}}} {{character=@{character_name}}} {{rating=@{ChiAbilityRating}}} {{drain=@{ChiAbilityDrain}}} {{description=@{ChiAbilityDesc}}}"
+                                            >
+                                                Display Info
+                                            </button>
+                                        </td>
+                                    </tr>
                                     <tr class="sheet-spell-padding-row"></tr>
                                     <tr class="sheet-spell-spacer-row">
                                         <td colspan="4"></td>
@@ -9683,7 +10154,7 @@
                     </div>
 
                     <div class="sheet-column-grow">
-                        <h1>Racial Abilities</h1>
+                        <h1>Racial Powers</h1>
 
                         <div class="sheet-repeating-section">
                             <div class="sheet-flex-form-container">
@@ -9803,6 +10274,9 @@
 
                     <div class="sheet-column-grow">
                         <h1>Class Abilities</h1>
+                        <button type="action" name="act_ClassAbilResetAll" class="btn sheet-display-text-button-small">
+                            Reset All Uses
+                        </button>
 
                         <fieldset class="repeating_classabilities">
                             <div class="sheet-repeating-section">
@@ -9826,6 +10300,83 @@
                                         </button>
                                     </div>
                                 </div>
+                                <div class="sheet-uses-row">
+                                    <span class="sheet-uses-label">Max</span>
+                                    <input
+                                        type="radio"
+                                        name="attr_ClassAbilMaxUses"
+                                        value="0"
+                                        class="sheet-max-radio"
+                                    />
+                                    <span class="sheet-max-pill">N/A</span>
+                                    <input
+                                        type="radio"
+                                        name="attr_ClassAbilMaxUses"
+                                        value="1"
+                                        class="sheet-max-radio"
+                                    />
+                                    <span class="sheet-max-pill">1</span>
+                                    <input
+                                        type="radio"
+                                        name="attr_ClassAbilMaxUses"
+                                        value="2"
+                                        class="sheet-max-radio"
+                                    />
+                                    <span class="sheet-max-pill">2</span>
+                                    <input
+                                        type="radio"
+                                        name="attr_ClassAbilMaxUses"
+                                        value="3"
+                                        class="sheet-max-radio"
+                                    />
+                                    <span class="sheet-max-pill">3</span>
+                                    <input
+                                        type="radio"
+                                        name="attr_ClassAbilMaxUses"
+                                        value="4"
+                                        class="sheet-max-radio"
+                                    />
+                                    <span class="sheet-max-pill">4</span>
+                                    <input
+                                        type="radio"
+                                        name="attr_ClassAbilMaxUses"
+                                        value="5"
+                                        class="sheet-max-radio"
+                                    />
+                                    <span class="sheet-max-pill">5</span>
+                                    <span class="sheet-uses-sep"></span>
+                                    <span class="sheet-uses-label">Used</span>
+                                    <input
+                                        type="checkbox"
+                                        name="attr_ClassAbilUse1"
+                                        value="1"
+                                        class="sheet-use-cb sheet-use-cb-1"
+                                    /><span class="sheet-use-icon">×</span>
+                                    <input
+                                        type="checkbox"
+                                        name="attr_ClassAbilUse2"
+                                        value="1"
+                                        class="sheet-use-cb sheet-use-cb-2"
+                                    /><span class="sheet-use-icon">×</span>
+                                    <input
+                                        type="checkbox"
+                                        name="attr_ClassAbilUse3"
+                                        value="1"
+                                        class="sheet-use-cb sheet-use-cb-3"
+                                    /><span class="sheet-use-icon">×</span>
+                                    <input
+                                        type="checkbox"
+                                        name="attr_ClassAbilUse4"
+                                        value="1"
+                                        class="sheet-use-cb sheet-use-cb-4"
+                                    /><span class="sheet-use-icon">×</span>
+                                    <input
+                                        type="checkbox"
+                                        name="attr_ClassAbilUse5"
+                                        value="1"
+                                        class="sheet-use-cb sheet-use-cb-5"
+                                    /><span class="sheet-use-icon">×</span>
+                                </div>
                                 <div>
                                     <input
                                         type="checkbox"
@@ -10311,6 +10862,30 @@
         </div>
     </rolltemplate>
 
+    <rolltemplate class="sheet-rolltemplate-chi-power">
+        <div class="sheet-template-container">
+            <div class="sheet-template-box">
+                <div class="sheet-template-title">{{name}}</div>
+                <div class="sheet-template-subtitle">{{character}}</div>
+
+                <table>
+                    <tr>
+                        <th><span>Rating</span></th>
+                        <td>{{rating}}</td>
+                    </tr>
+                    <tr>
+                        <th><span>Drain</span></th>
+                        <td>{{drain}}</td>
+                    </tr>
+                </table>
+
+                <div class="sheet-template-hr"></div>
+
+                <div class="sheet-template-text">{{description}}</div>
+            </div>
+        </div>
+    </rolltemplate>
+
     <rolltemplate class="sheet-rolltemplate-spell-description">
         <div class="sheet-template-container">
             <div class="sheet-template-box">