From 49b450daee5364fd37a06b4c0f549c8ee6322a8b Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Tue, 13 Apr 2021 21:40:52 +0200
Subject: [PATCH] Reorganize templates file structure

---
 src/module/actor/sheets/actor-sheet.ts        |  4 +-
 src/module/handlebars/handlebars-partials.ts  | 50 +++++++------
 src/module/item/item-sheet.ts                 |  4 +-
 src/module/item/item.ts                       |  2 +-
 src/module/rolls/check-factory.ts             |  2 +-
 src/scss/global/_window.scss                  |  9 ---
 .../actor/partials/character-inventory.hbs    |  4 -
 .../actor/partials/creature-inventory.hbs     |  5 --
 src/templates/actor/partials/values-tab.hbs   |  4 -
 .../{roll => dialogs}/roll-options.hbs        |  0
 .../simple-select-form.hbs                    |  0
 src/templates/{roll => dice}/roll.hbs         |  0
 src/templates/item/alphabet-sheet.hbs         |  8 --
 src/templates/item/equipment-sheet.hbs        |  7 --
 src/templates/item/language-sheet.hbs         |  8 --
 src/templates/item/loot-sheet.hbs             |  7 --
 src/templates/item/racialAbility-sheet.hbs    |  8 --
 src/templates/item/spell-sheet.hbs            | 72 ------------------
 .../{ => sheets}/actor/character-sheet.hbs    | 18 ++---
 .../components}/character-progression.hbs     |  0
 .../actor/components}/combat-values.hbs       |  0
 .../actor/components}/core-value.hbs          |  0
 .../actor/components}/core-values.hbs         |  5 +-
 .../actor/components}/currency.hbs            |  0
 .../actor/components}/item-list-entry.hbs     |  9 ++-
 .../actor/components}/item-list-header.hbs    |  0
 .../actor/components}/items-overview.hbs      | 54 ++++++-------
 .../actor/components}/overview-add-button.hbs |  0
 .../components}/overview-control-buttons.hbs  |  0
 .../actor/components}/rollable-image.hbs      |  0
 .../components}/talent-rank-equation.hbs      |  0
 .../{ => sheets}/actor/creature-sheet.hbs     | 15 ++--
 src/templates/sheets/actor/tabs/biography.hbs |  4 +
 .../sheets/actor/tabs/character-inventory.hbs |  4 +
 .../sheets/actor/tabs/creature-inventory.hbs  |  3 +
 .../sheets/actor/tabs/description.hbs         |  4 +
 .../actor/tabs}/profile.hbs                   |  0
 .../tabs/special-creature-abilities.hbs}      |  6 +-
 .../actor/tabs/spells.hbs}                    | 10 +--
 .../actor/tabs/talents-abilities.hbs}         | 30 ++++----
 src/templates/sheets/actor/tabs/values.hbs    |  4 +
 src/templates/sheets/item/alphabet-sheet.hbs  |  8 ++
 .../{ => sheets}/item/armor-sheet.hbs         |  8 +-
 .../item/components}/body.hbs                 | 16 ++--
 .../item/components}/sheet-header.hbs         |  0
 src/templates/sheets/item/equipment-sheet.hbs |  7 ++
 src/templates/sheets/item/language-sheet.hbs  |  8 ++
 src/templates/sheets/item/loot-sheet.hbs      |  7 ++
 .../sheets/item/racialAbility-sheet.hbs       |  8 ++
 .../{ => sheets}/item/shield-sheet.hbs        |  8 +-
 .../item/specialCreatureAbility-sheet.hbs     |  8 +-
 src/templates/sheets/item/spell-sheet.hbs     | 75 +++++++++++++++++++
 .../item/tabs}/description.hbs                |  0
 .../partials => sheets/item/tabs}/details.hbs |  0
 .../partials => sheets/item/tabs}/effects.hbs |  0
 .../{ => sheets}/item/talent-sheet.hbs        |  8 +-
 .../{ => sheets}/item/weapon-sheet.hbs        |  8 +-
 57 files changed, 266 insertions(+), 263 deletions(-)
 delete mode 100644 src/templates/actor/partials/character-inventory.hbs
 delete mode 100644 src/templates/actor/partials/creature-inventory.hbs
 delete mode 100644 src/templates/actor/partials/values-tab.hbs
 rename src/templates/{roll => dialogs}/roll-options.hbs (100%)
 rename src/templates/{common => dialogs}/simple-select-form.hbs (100%)
 rename src/templates/{roll => dice}/roll.hbs (100%)
 delete mode 100644 src/templates/item/alphabet-sheet.hbs
 delete mode 100644 src/templates/item/equipment-sheet.hbs
 delete mode 100644 src/templates/item/language-sheet.hbs
 delete mode 100644 src/templates/item/loot-sheet.hbs
 delete mode 100644 src/templates/item/racialAbility-sheet.hbs
 delete mode 100644 src/templates/item/spell-sheet.hbs
 rename src/templates/{ => sheets}/actor/character-sheet.hbs (90%)
 rename src/templates/{actor/partials => sheets/actor/components}/character-progression.hbs (100%)
 rename src/templates/{actor/partials => sheets/actor/components}/combat-values.hbs (100%)
 rename src/templates/{actor/partials => sheets/actor/components}/core-value.hbs (100%)
 rename src/templates/{actor/partials => sheets/actor/components}/core-values.hbs (64%)
 rename src/templates/{actor/partials => sheets/actor/components}/currency.hbs (100%)
 rename src/templates/{actor/partials => sheets/actor/components}/item-list-entry.hbs (79%)
 rename src/templates/{actor/partials => sheets/actor/components}/item-list-header.hbs (100%)
 rename src/templates/{actor/partials => sheets/actor/components}/items-overview.hbs (62%)
 rename src/templates/{actor/partials => sheets/actor/components}/overview-add-button.hbs (100%)
 rename src/templates/{actor/partials => sheets/actor/components}/overview-control-buttons.hbs (100%)
 rename src/templates/{common/partials => sheets/actor/components}/rollable-image.hbs (100%)
 rename src/templates/{actor/partials => sheets/actor/components}/talent-rank-equation.hbs (100%)
 rename src/templates/{ => sheets}/actor/creature-sheet.hbs (85%)
 create mode 100644 src/templates/sheets/actor/tabs/biography.hbs
 create mode 100644 src/templates/sheets/actor/tabs/character-inventory.hbs
 create mode 100644 src/templates/sheets/actor/tabs/creature-inventory.hbs
 create mode 100644 src/templates/sheets/actor/tabs/description.hbs
 rename src/templates/{actor/partials => sheets/actor/tabs}/profile.hbs (100%)
 rename src/templates/{actor/partials/special-creature-abilities-overview.hbs => sheets/actor/tabs/special-creature-abilities.hbs} (55%)
 rename src/templates/{actor/partials/spells-overview.hbs => sheets/actor/tabs/spells.hbs} (87%)
 rename src/templates/{actor/partials/talents-abilities-overview.hbs => sheets/actor/tabs/talents-abilities.hbs} (51%)
 create mode 100644 src/templates/sheets/actor/tabs/values.hbs
 create mode 100644 src/templates/sheets/item/alphabet-sheet.hbs
 rename src/templates/{ => sheets}/item/armor-sheet.hbs (84%)
 rename src/templates/{item/partials => sheets/item/components}/body.hbs (68%)
 rename src/templates/{item/partials => sheets/item/components}/sheet-header.hbs (100%)
 create mode 100644 src/templates/sheets/item/equipment-sheet.hbs
 create mode 100644 src/templates/sheets/item/language-sheet.hbs
 create mode 100644 src/templates/sheets/item/loot-sheet.hbs
 create mode 100644 src/templates/sheets/item/racialAbility-sheet.hbs
 rename src/templates/{ => sheets}/item/shield-sheet.hbs (60%)
 rename src/templates/{ => sheets}/item/specialCreatureAbility-sheet.hbs (61%)
 create mode 100644 src/templates/sheets/item/spell-sheet.hbs
 rename src/templates/{item/partials => sheets/item/tabs}/description.hbs (100%)
 rename src/templates/{item/partials => sheets/item/tabs}/details.hbs (100%)
 rename src/templates/{item/partials => sheets/item/tabs}/effects.hbs (100%)
 rename src/templates/{ => sheets}/item/talent-sheet.hbs (82%)
 rename src/templates/{ => sheets}/item/weapon-sheet.hbs (80%)

diff --git a/src/module/actor/sheets/actor-sheet.ts b/src/module/actor/sheets/actor-sheet.ts
index 37849acd..6dd57ec8 100644
--- a/src/module/actor/sheets/actor-sheet.ts
+++ b/src/module/actor/sheets/actor-sheet.ts
@@ -33,8 +33,8 @@ export class DS4ActorSheet extends ActorSheet<ActorSheet.Data<DS4Actor>> {
 
     /** @override */
     get template(): string {
-        const path = "systems/ds4/templates/actor";
-        return `${path}/${this.actor.data.type}-sheet.hbs`;
+        const basePath = "systems/ds4/templates/sheets/actor";
+        return `${basePath}/${this.actor.data.type}-sheet.hbs`;
     }
 
     /**
diff --git a/src/module/handlebars/handlebars-partials.ts b/src/module/handlebars/handlebars-partials.ts
index 046ce8f6..c1588b92 100644
--- a/src/module/handlebars/handlebars-partials.ts
+++ b/src/module/handlebars/handlebars-partials.ts
@@ -1,29 +1,31 @@
 export default async function registerHandlebarsPartials(): Promise<void> {
     const templatePaths = [
-        "systems/ds4/templates/item/partials/sheet-header.hbs",
-        "systems/ds4/templates/item/partials/description.hbs",
-        "systems/ds4/templates/item/partials/details.hbs",
-        "systems/ds4/templates/item/partials/effects.hbs",
-        "systems/ds4/templates/item/partials/body.hbs",
-        "systems/ds4/templates/actor/partials/items-overview.hbs",
-        "systems/ds4/templates/actor/partials/talents-abilities-overview.hbs",
-        "systems/ds4/templates/actor/partials/spells-overview.hbs",
-        "systems/ds4/templates/actor/partials/overview-add-button.hbs",
-        "systems/ds4/templates/actor/partials/overview-control-buttons.hbs",
-        "systems/ds4/templates/actor/partials/core-values.hbs",
-        "systems/ds4/templates/actor/partials/combat-values.hbs",
-        "systems/ds4/templates/actor/partials/profile.hbs",
-        "systems/ds4/templates/actor/partials/values-tab.hbs",
-        "systems/ds4/templates/actor/partials/character-progression.hbs",
-        "systems/ds4/templates/actor/partials/special-creature-abilities-overview.hbs",
-        "systems/ds4/templates/actor/partials/character-inventory.hbs",
-        "systems/ds4/templates/actor/partials/creature-inventory.hbs",
-        "systems/ds4/templates/actor/partials/talent-rank-equation.hbs",
-        "systems/ds4/templates/actor/partials/item-list-header.hbs",
-        "systems/ds4/templates/actor/partials/item-list-entry.hbs",
-        "systems/ds4/templates/actor/partials/currency.hbs",
-        "systems/ds4/templates/common/partials/rollable-image.hbs",
-        "systems/ds4/templates/actor/partials/core-value.hbs",
+        "systems/ds4/templates/sheets/actor/components/character-progression.hbs",
+        "systems/ds4/templates/sheets/actor/components/combat-values.hbs",
+        "systems/ds4/templates/sheets/actor/components/core-value.hbs",
+        "systems/ds4/templates/sheets/actor/components/core-values.hbs",
+        "systems/ds4/templates/sheets/actor/components/currency.hbs",
+        "systems/ds4/templates/sheets/actor/components/item-list-entry.hbs",
+        "systems/ds4/templates/sheets/actor/components/item-list-header.hbs",
+        "systems/ds4/templates/sheets/actor/components/items-overview.hbs",
+        "systems/ds4/templates/sheets/actor/components/overview-add-button.hbs",
+        "systems/ds4/templates/sheets/actor/components/overview-control-buttons.hbs",
+        "systems/ds4/templates/sheets/actor/components/rollable-image.hbs",
+        "systems/ds4/templates/sheets/actor/components/talent-rank-equation.hbs",
+        "systems/ds4/templates/sheets/actor/tabs/biography.hbs",
+        "systems/ds4/templates/sheets/actor/tabs/character-inventory.hbs",
+        "systems/ds4/templates/sheets/actor/tabs/creature-inventory.hbs",
+        "systems/ds4/templates/sheets/actor/tabs/description.hbs",
+        "systems/ds4/templates/sheets/actor/tabs/profile.hbs",
+        "systems/ds4/templates/sheets/actor/tabs/special-creature-abilities.hbs",
+        "systems/ds4/templates/sheets/actor/tabs/spells.hbs",
+        "systems/ds4/templates/sheets/actor/tabs/talents-abilities.hbs",
+        "systems/ds4/templates/sheets/actor/tabs/values.hbs",
+        "systems/ds4/templates/sheets/item/components/body.hbs",
+        "systems/ds4/templates/sheets/item/components/sheet-header.hbs",
+        "systems/ds4/templates/sheets/item/tabs/description.hbs",
+        "systems/ds4/templates/sheets/item/tabs/details.hbs",
+        "systems/ds4/templates/sheets/item/tabs/effects.hbs",
     ];
     await loadTemplates(templatePaths);
 }
diff --git a/src/module/item/item-sheet.ts b/src/module/item/item-sheet.ts
index 1ccbffc0..2906e9d4 100644
--- a/src/module/item/item-sheet.ts
+++ b/src/module/item/item-sheet.ts
@@ -37,8 +37,8 @@ export class DS4ItemSheet extends ItemSheet<ItemSheet.Data<DS4Item>> {
 
     /** @override */
     get template(): string {
-        const path = "systems/ds4/templates/item";
-        return `${path}/${this.item.data.type}-sheet.hbs`;
+        const basePath = "systems/ds4/templates/sheets/item";
+        return `${basePath}/${this.item.data.type}-sheet.hbs`;
     }
 
     /** @override */
diff --git a/src/module/item/item.ts b/src/module/item/item.ts
index 68a1ffb5..00816b7c 100644
--- a/src/module/item/item.ts
+++ b/src/module/item/item.ts
@@ -155,7 +155,7 @@ export class DS4Item extends Item<DS4ItemData, DS4ItemPreparedData> {
             const label = game.i18n.localize("DS4.AttackType");
             const answer = Dialog.prompt({
                 title: game.i18n.localize("DS4.AttackTypeSelection"),
-                content: await renderTemplate("systems/ds4/templates/common/simple-select-form.hbs", {
+                content: await renderTemplate("systems/ds4/templates/dialogs/simple-select-form.hbs", {
                     label,
                     identifier,
                     options: { melee, ranged },
diff --git a/src/module/rolls/check-factory.ts b/src/module/rolls/check-factory.ts
index 475c50fc..86b29776 100644
--- a/src/module/rolls/check-factory.ts
+++ b/src/module/rolls/check-factory.ts
@@ -106,7 +106,7 @@ async function askGmModifier(
     options: Partial<DS4CheckFactoryOptions> = {},
     { template, title }: { template?: string; title?: string } = {},
 ): Promise<Partial<IntermediateGmModifierData>> {
-    const usedTemplate = template ?? "systems/ds4/templates/roll/roll-options.hbs";
+    const usedTemplate = template ?? "systems/ds4/templates/dialogs/roll-options.hbs";
     const usedTitle = title ?? game.i18n.localize("DS4.RollDialogDefaultTitle");
     const templateData = {
         title: usedTitle,
diff --git a/src/scss/global/_window.scss b/src/scss/global/_window.scss
index eeeb4fbf..2d22fe58 100644
--- a/src/scss/global/_window.scss
+++ b/src/scss/global/_window.scss
@@ -10,12 +10,3 @@
         width: 100%;
     }
 }
-
-.rollable {
-    &:hover,
-    &:focus {
-        color: #000;
-        text-shadow: 0 0 10px red;
-        cursor: pointer;
-    }
-}
diff --git a/src/templates/actor/partials/character-inventory.hbs b/src/templates/actor/partials/character-inventory.hbs
deleted file mode 100644
index 07a94705..00000000
--- a/src/templates/actor/partials/character-inventory.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="tab inventory" data-group="primary" data-tab="inventory">
-    {{> systems/ds4/templates/actor/partials/currency.hbs}}
-    {{> systems/ds4/templates/actor/partials/items-overview.hbs}}
-</div>
diff --git a/src/templates/actor/partials/creature-inventory.hbs b/src/templates/actor/partials/creature-inventory.hbs
deleted file mode 100644
index b9b8acd6..00000000
--- a/src/templates/actor/partials/creature-inventory.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="tab inventory" data-group="primary" data-tab="inventory">
-
-    {{> systems/ds4/templates/actor/partials/items-overview.hbs}}
-
-</div>
\ No newline at end of file
diff --git a/src/templates/actor/partials/values-tab.hbs b/src/templates/actor/partials/values-tab.hbs
deleted file mode 100644
index b15c1bb2..00000000
--- a/src/templates/actor/partials/values-tab.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="tab values" data-group="primary" data-tab="values">
-    {{> systems/ds4/templates/actor/partials/core-values.hbs}}
-    {{> systems/ds4/templates/actor/partials/combat-values.hbs}}
-</div>
diff --git a/src/templates/roll/roll-options.hbs b/src/templates/dialogs/roll-options.hbs
similarity index 100%
rename from src/templates/roll/roll-options.hbs
rename to src/templates/dialogs/roll-options.hbs
diff --git a/src/templates/common/simple-select-form.hbs b/src/templates/dialogs/simple-select-form.hbs
similarity index 100%
rename from src/templates/common/simple-select-form.hbs
rename to src/templates/dialogs/simple-select-form.hbs
diff --git a/src/templates/roll/roll.hbs b/src/templates/dice/roll.hbs
similarity index 100%
rename from src/templates/roll/roll.hbs
rename to src/templates/dice/roll.hbs
diff --git a/src/templates/item/alphabet-sheet.hbs b/src/templates/item/alphabet-sheet.hbs
deleted file mode 100644
index 5aabb9aa..00000000
--- a/src/templates/item/alphabet-sheet.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-<form class="{{cssClass}}" autocomplete="off">
-    {{#> systems/ds4/templates/item/partials/sheet-header.hbs}}
-    {{/systems/ds4/templates/item/partials/sheet-header.hbs}}
-
-    {{!-- Common Item body --}}
-    {{#> systems/ds4/templates/item/partials/body.hbs}}{{/systems/ds4/templates/item/partials/body.hbs}}
-
-</form>
\ No newline at end of file
diff --git a/src/templates/item/equipment-sheet.hbs b/src/templates/item/equipment-sheet.hbs
deleted file mode 100644
index 47cff754..00000000
--- a/src/templates/item/equipment-sheet.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<form class="{{cssClass}}" autocomplete="off">
-    {{#> systems/ds4/templates/item/partials/sheet-header.hbs}}
-    {{/systems/ds4/templates/item/partials/sheet-header.hbs}}
-
-    {{!-- Common Item body --}}
-    {{#> systems/ds4/templates/item/partials/body.hbs}}{{/systems/ds4/templates/item/partials/body.hbs}}
-</form>
diff --git a/src/templates/item/language-sheet.hbs b/src/templates/item/language-sheet.hbs
deleted file mode 100644
index 5aabb9aa..00000000
--- a/src/templates/item/language-sheet.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-<form class="{{cssClass}}" autocomplete="off">
-    {{#> systems/ds4/templates/item/partials/sheet-header.hbs}}
-    {{/systems/ds4/templates/item/partials/sheet-header.hbs}}
-
-    {{!-- Common Item body --}}
-    {{#> systems/ds4/templates/item/partials/body.hbs}}{{/systems/ds4/templates/item/partials/body.hbs}}
-
-</form>
\ No newline at end of file
diff --git a/src/templates/item/loot-sheet.hbs b/src/templates/item/loot-sheet.hbs
deleted file mode 100644
index bbd66400..00000000
--- a/src/templates/item/loot-sheet.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<form class="{{cssClass}}" autocomplete="off">
-    {{#> systems/ds4/templates/item/partials/sheet-header.hbs}}
-    {{/systems/ds4/templates/item/partials/sheet-header.hbs}}
-
-    {{!-- Common Item body --}}
-    {{#> systems/ds4/templates/item/partials/body.hbs}}{{/systems/ds4/templates/item/partials/body.hbs}}
-</form>
\ No newline at end of file
diff --git a/src/templates/item/racialAbility-sheet.hbs b/src/templates/item/racialAbility-sheet.hbs
deleted file mode 100644
index e69b5fc5..00000000
--- a/src/templates/item/racialAbility-sheet.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-<form class="{{cssClass}}" autocomplete="off">
-    {{#> systems/ds4/templates/item/partials/sheet-header.hbs}}
-    {{/systems/ds4/templates/item/partials/sheet-header.hbs}}
-
-    {{!-- Common Item body --}}
-    {{#> systems/ds4/templates/item/partials/body.hbs}}{{/systems/ds4/templates/item/partials/body.hbs}}
-
-</form>
diff --git a/src/templates/item/spell-sheet.hbs b/src/templates/item/spell-sheet.hbs
deleted file mode 100644
index 4fdd6dc1..00000000
--- a/src/templates/item/spell-sheet.hbs
+++ /dev/null
@@ -1,72 +0,0 @@
-{{!-- ======================================================================== --}}
-{{!-- INLINE PARTIAL DEFINITIONS --}}
-{{!-- ======================================================================== --}}
-
-
-{{#*inline "unitDatum" }}
-<div class="side-property">
-    <label>{{localize localizeString}}</label>
-    <div class="unit-data-pair">
-        <input class="item-num-val" type="text" data-dtype="String"
-            name="data.{{property}}.value" value="{{lookup (lookup data property) 'value'}}" />
-        <select name="data.{{property}}.unit" data-type="String">
-            {{#select (lookup (lookup data property) 'unit')}}
-            {{#if (eq unitType 'temporal')}}
-                {{#each (lookup config.i18n 'temporalUnitsAbbr') as |value key|}}<option value="{{key}}">{{value}}</option>{{/each}}
-            {{else}}
-                {{#each (lookup config.i18n 'distanceUnitsAbbr') as |value key|}}<option value="{{key}}">{{value}}</option>{{/each}}
-            {{/if}}
-            {{/select}}
-        </select>
-    </div>
-</div>
-{{/inline}}
-
-
-{{!-- ======================================================================== --}}
-
-
-<form class="{{cssClass}}" autocomplete="off">
-    {{#> systems/ds4/templates/item/partials/sheet-header.hbs}}
-        <div class="grid basic-properties">
-            <div class="basic-property">
-                <label for="data.spellType">{{localize "DS4.SpellType"}}</label>
-                <select id="data.spellType" name="data.spellType" data-type="String">
-                    {{#select data.spellType}}
-                    {{#each config.i18n.spellTypes as |value key|}}
-                    <option value="{{key}}">{{value}}</option>
-                    {{/each}}
-                    {{/select}}
-                </select>
-            </div>
-            <div class="basic-property">
-                <label for="data.bonus">{{localize "DS4.SpellBonus"}}</label>
-                <input id="data.bonus" type="text" name="data.bonus" value="{{data.bonus}}" data-dtype="String" />
-            </div>
-        </div>
-    {{/systems/ds4/templates/item/partials/sheet-header.hbs}}
-
-    {{!-- Common Item body --}}
-    {{#> systems/ds4/templates/item/partials/body.hbs}}
-        <div class="side-property">
-            <label for="data.spellCategory">{{localize "DS4.SpellCategory"}}</label>
-            <select id="data.spellCategory" name="data.spellCategory" data-type="String">
-                {{#select data.spellCategory}}
-                {{#each config.i18n.spellCategories as |value key|}}
-                <option value="{{key}}">{{value}}</option>
-                {{/each}}
-                {{/select}}
-            </select>
-        </div>
-        {{> unitDatum data=data property='maxDistance' localizeString='DS4.SpellMaxDistance' unitType='distance' }}
-        {{> unitDatum data=data property='effectRadius' localizeString='DS4.SpellEffectRadius' unitType='distance' }}
-        {{> unitDatum data=data property='duration' localizeString='DS4.SpellDuration' unitType='temporal' }}
-        {{> unitDatum data=data property='cooldownDuration' localizeString='DS4.SpellCooldownDuration' unitType='temporal' }}
-        <div class="side-property">
-            <label for="data.scrollPrice">{{localize "DS4.SpellScrollPriceGold"}}</label>
-            <input type="number" min="0" max="9999" step="0.01" data-dtype="Number"
-                name="data.scrollPrice" id="data.scrollPrice" value="{{data.scrollPrice}}" />
-        </div>
-    {{/systems/ds4/templates/item/partials/body.hbs}}
-
-</form>
diff --git a/src/templates/actor/character-sheet.hbs b/src/templates/sheets/actor/character-sheet.hbs
similarity index 90%
rename from src/templates/actor/character-sheet.hbs
rename to src/templates/sheets/actor/character-sheet.hbs
index 303c0bbb..a88de806 100644
--- a/src/templates/actor/character-sheet.hbs
+++ b/src/templates/sheets/actor/character-sheet.hbs
@@ -8,7 +8,7 @@
                 <label for="actor.name" class="hidden">Name</label>
                 <input name="name" type="text" id="actor.name" value="{{actor.name}}" placeholder="Name" />
             </h1>
-            {{> systems/ds4/templates/actor/partials/character-progression.hbs}}
+            {{> systems/ds4/templates/sheets/actor/components/character-progression.hbs}}
 
             <div class="flexrow basic-properties">
                 <div class="basic-property">
@@ -83,25 +83,23 @@
 {{!-- Sheet Body (remove indentation to avoid annoying Handlebars auto-indent) --}}
 <section class="sheet-body">
 {{!-- Values Tab --}}
-{{> systems/ds4/templates/actor/partials/values-tab.hbs}}
+{{> systems/ds4/templates/sheets/actor/tabs/values.hbs}}
 
 {{!-- Inventory Tab --}}
-{{> systems/ds4/templates/actor/partials/character-inventory.hbs}}
+{{> systems/ds4/templates/sheets/actor/tabs/character-inventory.hbs}}
 
 {{!-- Spells Tab --}}
-{{> systems/ds4/templates/actor/partials/spells-overview.hbs}}
+{{> systems/ds4/templates/sheets/actor/tabs/spells.hbs}}
 
 {{!-- Talents Tab --}}
-{{> systems/ds4/templates/actor/partials/talents-abilities-overview.hbs}}
+{{> systems/ds4/templates/sheets/actor/tabs/talents-abilities.hbs}}
 
 {{! Profile Tab --}}
-{{> systems/ds4/templates/actor/partials/profile.hbs}}
+{{> systems/ds4/templates/sheets/actor/tabs/profile.hbs}}
 
 {{!-- Biography Tab --}}
-<div class="tab biography" data-group="primary" data-tab="biography">
-{{editor content=data.profile.biography target="data.profile.biography" button=true owner=owner
-editable=editable}}
-</div>
+{{> systems/ds4/templates/sheets/actor/tabs/biography.hbs}}
+
 </section>
     <!-- prettier-ignore-end -->
     <!-- beautify ignore:end -->
diff --git a/src/templates/actor/partials/character-progression.hbs b/src/templates/sheets/actor/components/character-progression.hbs
similarity index 100%
rename from src/templates/actor/partials/character-progression.hbs
rename to src/templates/sheets/actor/components/character-progression.hbs
diff --git a/src/templates/actor/partials/combat-values.hbs b/src/templates/sheets/actor/components/combat-values.hbs
similarity index 100%
rename from src/templates/actor/partials/combat-values.hbs
rename to src/templates/sheets/actor/components/combat-values.hbs
diff --git a/src/templates/actor/partials/core-value.hbs b/src/templates/sheets/actor/components/core-value.hbs
similarity index 100%
rename from src/templates/actor/partials/core-value.hbs
rename to src/templates/sheets/actor/components/core-value.hbs
diff --git a/src/templates/actor/partials/core-values.hbs b/src/templates/sheets/actor/components/core-values.hbs
similarity index 64%
rename from src/templates/actor/partials/core-values.hbs
rename to src/templates/sheets/actor/components/core-values.hbs
index 091b0980..b2e634e6 100644
--- a/src/templates/actor/partials/core-values.hbs
+++ b/src/templates/sheets/actor/components/core-values.hbs
@@ -1,11 +1,12 @@
 <div class="ds4-core-values">
     {{#each config.i18n.attributes as |attribute-label attribute-key|}}
-    {{> systems/ds4/templates/actor/partials/core-value.hbs core-value-label=attribute-label
+    {{> systems/ds4/templates/sheets/actor/components/core-value.hbs core-value-label=attribute-label
     core-value-key=attribute-key core-value-data=(lookup ../data.attributes
     attribute-key) core-value-variant="attribute"}}
     {{/each}}
     {{#each config.i18n.traits as |trait-label trait-key|}}
-    {{> systems/ds4/templates/actor/partials/core-value.hbs core-value-label=trait-label core-value-key=trait-key
+    {{> systems/ds4/templates/sheets/actor/components/core-value.hbs core-value-label=trait-label
+    core-value-key=trait-key
     core-value-data=(lookup ../data.traits trait-key) core-value-variant="trait"}}
     {{/each}}
 </div>
diff --git a/src/templates/actor/partials/currency.hbs b/src/templates/sheets/actor/components/currency.hbs
similarity index 100%
rename from src/templates/actor/partials/currency.hbs
rename to src/templates/sheets/actor/components/currency.hbs
diff --git a/src/templates/actor/partials/item-list-entry.hbs b/src/templates/sheets/actor/components/item-list-entry.hbs
similarity index 79%
rename from src/templates/actor/partials/item-list-entry.hbs
rename to src/templates/sheets/actor/components/item-list-entry.hbs
index ca08d0fc..1f227c9e 100644
--- a/src/templates/actor/partials/item-list-entry.hbs
+++ b/src/templates/sheets/actor/components/item-list-entry.hbs
@@ -17,9 +17,9 @@
     {{/if}}
 
     {{!-- image --}}
-    {{> systems/ds4/templates/common/partials/rollable-image.hbs rollable=itemData.data.rollable src=itemData.img
-    alt=(localize "DS4.EntityImageAltText" name=itemData.name) title=itemData.name rollableTitle=(localize
-    "DS4.RollableImageRollableTitle" name=itemData.name) rollableClass="rollable-item"}}
+    {{> systems/ds4/templates/sheets/actor/components/rollable-image.hbs rollable=itemData.data.rollable
+    src=itemData.img alt=(localize "DS4.EntityImageAltText" name=itemData.name) title=itemData.name
+    rollableTitle=(localize "DS4.RollableImageRollableTitle" name=itemData.name) rollableClass="rollable-item"}}
 
     {{!-- amount --}}
     {{#if hasQuantity}}
@@ -43,5 +43,6 @@
     {{/unless}}
 
     {{!-- control buttons --}}
-    {{> systems/ds4/templates/actor/partials/overview-control-buttons.hbs class="ds4-item-list__control-buttons" }}
+    {{> systems/ds4/templates/sheets/actor/components/overview-control-buttons.hbs
+    class="ds4-item-list__control-buttons" }}
 </li>
diff --git a/src/templates/actor/partials/item-list-header.hbs b/src/templates/sheets/actor/components/item-list-header.hbs
similarity index 100%
rename from src/templates/actor/partials/item-list-header.hbs
rename to src/templates/sheets/actor/components/item-list-header.hbs
diff --git a/src/templates/actor/partials/items-overview.hbs b/src/templates/sheets/actor/components/items-overview.hbs
similarity index 62%
rename from src/templates/actor/partials/items-overview.hbs
rename to src/templates/sheets/actor/components/items-overview.hbs
index 094109b1..9ad5cb2c 100644
--- a/src/templates/actor/partials/items-overview.hbs
+++ b/src/templates/sheets/actor/components/items-overview.hbs
@@ -2,7 +2,7 @@
 <h4 class="ds4-item-list-title">{{localize 'DS4.ItemTypeWeaponPlural'}}</h4>
 {{#unless (isEmpty itemsByType.weapon)}}
 <ol class="ds4-item-list ds4-item-list--weapon item-list">
-    {{#> systems/ds4/templates/actor/partials/item-list-header.hbs isEquipable=true hasQuantity=true}}
+    {{#> systems/ds4/templates/sheets/actor/components/item-list-header.hbs isEquipable=true hasQuantity=true}}
     {{!-- attack type --}}
     <div class="ds4-item-list__image" title="{{localize 'DS4.AttackType'}}">{{localize 'DS4.AttackTypeAbbr'}}</div>
 
@@ -15,10 +15,11 @@
     <div title="{{localize 'DS4.OpponentDefense'}}">
         {{localize 'DS4.OpponentDefenseAbbr'}}
     </div>
-    {{/systems/ds4/templates/actor/partials/item-list-header.hbs}}
+    {{/systems/ds4/templates/sheets/actor/components/item-list-header.hbs}}
 
     {{#each itemsByType.weapon as |itemData id|}}
-    {{#> systems/ds4/templates/actor/partials/item-list-entry.hbs itemData=itemData isEquipable=true hasQuantity=true}}
+    {{#> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData isEquipable=true
+    hasQuantity=true}}
     {{!-- attack type --}}
     <img class="ds4-item-list__image" src="{{lookup ../../config.icons.attackTypes itemData.data.attackType}}"
         title="{{lookup ../../config.i18n.attackTypes itemData.data.attackType}}" />
@@ -28,17 +29,17 @@
 
     {{!-- opponent defense --}}
     <div>{{ itemData.data.opponentDefense}}</div>
-    {{/systems/ds4/templates/actor/partials/item-list-entry.hbs}}
+    {{/systems/ds4/templates/sheets/actor/components/item-list-entry.hbs}}
     {{/each}}
 </ol>
 {{/unless}}
-{{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='weapon'}}
+{{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='weapon'}}
 
 {{!-- ARMOR --}}
 <h4 class="ds4-item-list-title">{{localize 'DS4.ItemTypeArmorPlural'}}</h4>
 {{#unless (isEmpty itemsByType.armor)}}
 <ol class="ds4-item-list ds4-item-list--armor item-list">
-    {{#> systems/ds4/templates/actor/partials/item-list-header.hbs isEquipable=true hasQuantity=true}}
+    {{#> systems/ds4/templates/sheets/actor/components/item-list-header.hbs isEquipable=true hasQuantity=true}}
     {{!-- armor material type --}}
     <div title="{{localize 'DS4.ArmorMaterialType'}}">{{localize 'DS4.ArmorMaterialTypeAbbr'}}</div>
 
@@ -49,10 +50,11 @@
     <div title="{{localize 'DS4.ArmorValue'}}">
         {{localize 'DS4.ArmorValueAbbr'}}
     </div>
-    {{/systems/ds4/templates/actor/partials/item-list-header.hbs}}
+    {{/systems/ds4/templates/sheets/actor/components/item-list-header.hbs}}
 
     {{#each itemsByType.armor as |itemData id|}}
-    {{#> systems/ds4/templates/actor/partials/item-list-entry.hbs itemData=itemData isEquipable=true hasQuantity=true}}
+    {{#> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData isEquipable=true
+    hasQuantity=true}}
     {{!-- armor material type --}}
     <div title="{{lookup ../../config.i18n.armorMaterialTypes  itemData.data.armorMaterialType}}">
         {{lookup ../../config.i18n.armorMaterialTypesAbbr itemData.data.armorMaterialType}}
@@ -65,66 +67,68 @@
 
     {{!-- armor value --}}
     <div>{{ itemData.data.armorValue}}</div>
-    {{/systems/ds4/templates/actor/partials/item-list-entry.hbs}}
+    {{/systems/ds4/templates/sheets/actor/components/item-list-entry.hbs}}
     {{/each}}
 </ol>
 {{/unless}}
-{{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='armor'}}
+{{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='armor'}}
 
 {{!-- SHIELD --}}
 <h4 class="ds4-item-list-title">{{localize 'DS4.ItemTypeShieldPlural'}}</h4>
 {{#unless (isEmpty itemsByType.shield)}}
 <ol class="ds4-item-list ds4-item-list--shield item-list">
-    {{#> systems/ds4/templates/actor/partials/item-list-header.hbs isEquipable=true hasQuantity=true}}
+    {{#> systems/ds4/templates/sheets/actor/components/item-list-header.hbs isEquipable=true hasQuantity=true}}
     {{!-- armor value --}}
     <div title="{{localize 'DS4.ArmorValue'}}">
         {{localize 'DS4.ArmorValueAbbr'}}
     </div>
-    {{/systems/ds4/templates/actor/partials/item-list-header.hbs}}
+    {{/systems/ds4/templates/sheets/actor/components/item-list-header.hbs}}
     {{#each itemsByType.shield as |itemData id|}}
-    {{#> systems/ds4/templates/actor/partials/item-list-entry.hbs itemData=itemData isEquipable=true hasQuantity=true}}
+    {{#> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData isEquipable=true
+    hasQuantity=true}}
     {{!-- armor value --}}
     <div>{{itemData.data.armorValue}}</div>
-    {{/systems/ds4/templates/actor/partials/item-list-entry.hbs}}
+    {{/systems/ds4/templates/sheets/actor/components/item-list-entry.hbs}}
     {{/each}}
 </ol>
 {{/unless}}
-{{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='shield'}}
+{{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='shield'}}
 
 {{!-- EQUIPMENT --}}
 <h4 class="ds4-item-list-title">{{localize 'DS4.ItemTypeEquipmentPlural'}}</h4>
 {{#unless (isEmpty itemsByType.equipment)}}
 <ol class="ds4-item-list ds4-item-list--equipment item-list">
-    {{#> systems/ds4/templates/actor/partials/item-list-header.hbs isEquipable=true hasQuantity=true}}
+    {{#> systems/ds4/templates/sheets/actor/components/item-list-header.hbs isEquipable=true hasQuantity=true}}
     {{!-- storage location --}}
     <div>{{localize 'DS4.StorageLocation'}}</div>
-    {{/systems/ds4/templates/actor/partials/item-list-header.hbs}}
+    {{/systems/ds4/templates/sheets/actor/components/item-list-header.hbs}}
     {{#each itemsByType.equipment as |itemData id|}}
-    {{#> systems/ds4/templates/actor/partials/item-list-entry.hbs itemData=itemData isEquipable=true hasQuantity=true}}
+    {{#> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData isEquipable=true
+    hasQuantity=true}}
     {{!-- storage location --}}
     <input class="ds4-item-list__editable item-change" type="text" value="{{itemData.data.storageLocation}}"
         data-dtype="String" data-property="data.storageLocation" title="{{localize 'DS4.StorageLocation'}}">
-    {{/systems/ds4/templates/actor/partials/item-list-entry.hbs}}
+    {{/systems/ds4/templates/sheets/actor/components/item-list-entry.hbs}}
     {{/each}}
 </ol>
 {{/unless}}
-{{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='equipment'}}
+{{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='equipment'}}
 
 {{!-- LOOT --}}
 <h4 class="ds4-item-list-title">{{localize 'DS4.ItemTypeLootPlural'}}</h4>
 {{#unless (isEmpty itemsByType.loot)}}
 <ol class="ds4-item-list ds4-item-list--loot item-list">
-    {{#> systems/ds4/templates/actor/partials/item-list-header.hbs hasQuantity=true}}
+    {{#> systems/ds4/templates/sheets/actor/components/item-list-header.hbs hasQuantity=true}}
     {{!-- storage location --}}
     <div>{{localize 'DS4.StorageLocation'}}</div>
-    {{/systems/ds4/templates/actor/partials/item-list-header.hbs}}
+    {{/systems/ds4/templates/sheets/actor/components/item-list-header.hbs}}
     {{#each itemsByType.loot as |itemData id|}}
-    {{#> systems/ds4/templates/actor/partials/item-list-entry.hbs itemData=itemData hasQuantity=true}}
+    {{#> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData hasQuantity=true}}
     {{!-- storage location --}}
     <input class="ds4-item-list__editable item-change" type="text" value="{{itemData.data.storageLocation}}"
         data-dtype="String" data-property="data.storageLocation" title="{{localize 'DS4.StorageLocation'}}">
-    {{/systems/ds4/templates/actor/partials/item-list-entry.hbs}}
+    {{/systems/ds4/templates/sheets/actor/components/item-list-entry.hbs}}
     {{/each}}
 </ol>
 {{/unless}}
-{{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='loot'}}
+{{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='loot'}}
diff --git a/src/templates/actor/partials/overview-add-button.hbs b/src/templates/sheets/actor/components/overview-add-button.hbs
similarity index 100%
rename from src/templates/actor/partials/overview-add-button.hbs
rename to src/templates/sheets/actor/components/overview-add-button.hbs
diff --git a/src/templates/actor/partials/overview-control-buttons.hbs b/src/templates/sheets/actor/components/overview-control-buttons.hbs
similarity index 100%
rename from src/templates/actor/partials/overview-control-buttons.hbs
rename to src/templates/sheets/actor/components/overview-control-buttons.hbs
diff --git a/src/templates/common/partials/rollable-image.hbs b/src/templates/sheets/actor/components/rollable-image.hbs
similarity index 100%
rename from src/templates/common/partials/rollable-image.hbs
rename to src/templates/sheets/actor/components/rollable-image.hbs
diff --git a/src/templates/actor/partials/talent-rank-equation.hbs b/src/templates/sheets/actor/components/talent-rank-equation.hbs
similarity index 100%
rename from src/templates/actor/partials/talent-rank-equation.hbs
rename to src/templates/sheets/actor/components/talent-rank-equation.hbs
diff --git a/src/templates/actor/creature-sheet.hbs b/src/templates/sheets/actor/creature-sheet.hbs
similarity index 85%
rename from src/templates/actor/creature-sheet.hbs
rename to src/templates/sheets/actor/creature-sheet.hbs
index 47e1b588..51b33c88 100644
--- a/src/templates/actor/creature-sheet.hbs
+++ b/src/templates/sheets/actor/creature-sheet.hbs
@@ -7,7 +7,7 @@
                 <label for="actor.name" class="hidden">Name</label>
                 <input name="name" type="text" id="actor.name" value="{{actor.name}}" placeholder="Name" />
             </h1>
-            {{> systems/ds4/templates/actor/partials/character-progression.hbs}}
+            {{> systems/ds4/templates/sheets/actor/components/character-progression.hbs}}
 
             <div class="flexrow basic-properties">
                 <div class="basic-property">
@@ -63,21 +63,18 @@
     {{!-- Sheet Body --}}
     <section class="sheet-body">
         {{!-- Values Tab --}}
-        {{> systems/ds4/templates/actor/partials/values-tab.hbs}}
+        {{> systems/ds4/templates/sheets/actor/tabs/values.hbs}}
 
         {{!-- Inventory Tab --}}
-        {{> systems/ds4/templates/actor/partials/creature-inventory.hbs}}
+        {{> systems/ds4/templates/sheets/actor/tabs/creature-inventory.hbs}}
 
         {{!-- Special Creature Abilities Tab --}}
-        {{> systems/ds4/templates/actor/partials/special-creature-abilities-overview.hbs}}
+        {{> systems/ds4/templates/sheets/actor/tabs/special-creature-abilities.hbs}}
 
         {{!-- Spells Tab --}}
-        {{> systems/ds4/templates/actor/partials/spells-overview.hbs}}
+        {{> systems/ds4/templates/sheets/actor/tabs/spells.hbs}}
 
         {{!-- Description Tab --}}
-        <div class="tab description" data-group="primary" data-tab="description">
-            {{editor content=data.baseInfo.description target="data.baseInfo.description" button=true owner=owner
-            editable=editable}}
-        </div>
+        {{> systems/ds4/templates/sheets/actor/tabs/description.hbs}}
     </section>
 </form>
diff --git a/src/templates/sheets/actor/tabs/biography.hbs b/src/templates/sheets/actor/tabs/biography.hbs
new file mode 100644
index 00000000..461bdc11
--- /dev/null
+++ b/src/templates/sheets/actor/tabs/biography.hbs
@@ -0,0 +1,4 @@
+<div class="tab biography" data-group="primary" data-tab="biography">
+    {{editor content=data.profile.biography target="data.profile.biography" button=true owner=owner
+    editable=editable}}
+</div>
diff --git a/src/templates/sheets/actor/tabs/character-inventory.hbs b/src/templates/sheets/actor/tabs/character-inventory.hbs
new file mode 100644
index 00000000..e763a21f
--- /dev/null
+++ b/src/templates/sheets/actor/tabs/character-inventory.hbs
@@ -0,0 +1,4 @@
+<div class="tab inventory" data-group="primary" data-tab="inventory">
+    {{> systems/ds4/templates/sheets/actor/components/currency.hbs}}
+    {{> systems/ds4/templates/sheets/actor/components/items-overview.hbs}}
+</div>
diff --git a/src/templates/sheets/actor/tabs/creature-inventory.hbs b/src/templates/sheets/actor/tabs/creature-inventory.hbs
new file mode 100644
index 00000000..7512829e
--- /dev/null
+++ b/src/templates/sheets/actor/tabs/creature-inventory.hbs
@@ -0,0 +1,3 @@
+<div class="tab inventory" data-group="primary" data-tab="inventory">
+    {{> systems/ds4/templates/sheets/actor/components/items-overview.hbs}}
+</div>
diff --git a/src/templates/sheets/actor/tabs/description.hbs b/src/templates/sheets/actor/tabs/description.hbs
new file mode 100644
index 00000000..6dc48ffb
--- /dev/null
+++ b/src/templates/sheets/actor/tabs/description.hbs
@@ -0,0 +1,4 @@
+<div class="tab description" data-group="primary" data-tab="description">
+    {{editor content=data.baseInfo.description target="data.baseInfo.description" button=true owner=owner
+    editable=editable}}
+</div>
diff --git a/src/templates/actor/partials/profile.hbs b/src/templates/sheets/actor/tabs/profile.hbs
similarity index 100%
rename from src/templates/actor/partials/profile.hbs
rename to src/templates/sheets/actor/tabs/profile.hbs
diff --git a/src/templates/actor/partials/special-creature-abilities-overview.hbs b/src/templates/sheets/actor/tabs/special-creature-abilities.hbs
similarity index 55%
rename from src/templates/actor/partials/special-creature-abilities-overview.hbs
rename to src/templates/sheets/actor/tabs/special-creature-abilities.hbs
index cf6a4a55..602b73b1 100644
--- a/src/templates/actor/partials/special-creature-abilities-overview.hbs
+++ b/src/templates/sheets/actor/tabs/special-creature-abilities.hbs
@@ -1,11 +1,11 @@
 <div class="tab special-creature-abilities" data-group="primary" data-tab="special-creature-abilities">
     {{#unless (isEmpty itemsByType.specialCreatureAbility)}}
     <ol class="ds4-item-list ds4-item-list--special-creature-ability item-list">
-        {{> systems/ds4/templates/actor/partials/item-list-header.hbs}}
+        {{> systems/ds4/templates/sheets/actor/components/item-list-header.hbs}}
         {{#each itemsByType.specialCreatureAbility as |itemData id|}}
-        {{> systems/ds4/templates/actor/partials/item-list-entry.hbs itemData=itemData}}
+        {{> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData}}
         {{/each}}
     </ol>
     {{/unless}}
-    {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='specialCreatureAbility'}}
+    {{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='specialCreatureAbility'}}
 </div>
diff --git a/src/templates/actor/partials/spells-overview.hbs b/src/templates/sheets/actor/tabs/spells.hbs
similarity index 87%
rename from src/templates/actor/partials/spells-overview.hbs
rename to src/templates/sheets/actor/tabs/spells.hbs
index e5f9b008..58e78735 100644
--- a/src/templates/actor/partials/spells-overview.hbs
+++ b/src/templates/sheets/actor/tabs/spells.hbs
@@ -40,7 +40,7 @@ titleKey=titleKey}}
 <div class="tab spells" data-group="primary" data-tab="spells">
     {{#unless (isEmpty itemsByType.spell)}}
     <ol class="ds4-item-list ds4-item-list--spell item-list">
-        {{#> systems/ds4/templates/actor/partials/item-list-header.hbs isEquipable=true hideDescription=true}}
+        {{#> systems/ds4/templates/sheets/actor/components/item-list-header.hbs isEquipable=true hideDescription=true}}
         {{!-- spell type --}}
         <div title="{{localize 'DS4.SpellType'}}">{{localize 'DS4.SpellTypeAbbr'}}</div>
 
@@ -55,9 +55,9 @@ titleKey=titleKey}}
 
         {{!-- cooldown duration --}}
         <div title="{{localize 'DS4.SpellCooldownDuration'}}"><i class="fas fa-hourglass-half"></i></div>
-        {{/systems/ds4/templates/actor/partials/item-list-header.hbs}}
+        {{/systems/ds4/templates/sheets/actor/components/item-list-header.hbs}}
         {{#each itemsByType.spell as |itemData id|}}
-        {{#> systems/ds4/templates/actor/partials/item-list-entry.hbs itemData=itemData isEquipable=true
+        {{#> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData isEquipable=true
         hideDescription=true}}
         {{!-- spell type --}}
         <img class="ds4-item-list__image" src="{{lookup ../../config.icons.spellTypes itemData.data.spellType}}"
@@ -77,9 +77,9 @@ titleKey=titleKey}}
         {{!-- cooldown duration --}}
         {{> temporalUnit titleKey='DS4.SpellCooldownDuration' unitDatum=itemData.data.cooldownDuration
         config=../../config}}
-        {{/systems/ds4/templates/actor/partials/item-list-entry.hbs}}
+        {{/systems/ds4/templates/sheets/actor/components/item-list-entry.hbs}}
         {{/each}}
     </ol>
     {{/unless}}
-    {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='spell' }}
+    {{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='spell' }}
 </div>
diff --git a/src/templates/actor/partials/talents-abilities-overview.hbs b/src/templates/sheets/actor/tabs/talents-abilities.hbs
similarity index 51%
rename from src/templates/actor/partials/talents-abilities-overview.hbs
rename to src/templates/sheets/actor/tabs/talents-abilities.hbs
index 9ec53331..9793a6eb 100644
--- a/src/templates/actor/partials/talents-abilities-overview.hbs
+++ b/src/templates/sheets/actor/tabs/talents-abilities.hbs
@@ -3,53 +3,53 @@
     <h4 class="ds4-item-list-title">{{localize 'DS4.ItemTypeTalentPlural'}}</h4>
     {{#unless (isEmpty itemsByType.talent)}}
     <ol class="ds4-item-list ds4-item-list--talent item-list">
-        {{#> systems/ds4/templates/actor/partials/item-list-header.hbs}}
+        {{#> systems/ds4/templates/sheets/actor/components/item-list-header.hbs}}
         {{!-- rank --}}
         <div>{{localize 'DS4.TalentRank'}}</div>
-        {{/systems/ds4/templates/actor/partials/item-list-header.hbs}}
+        {{/systems/ds4/templates/sheets/actor/components/item-list-header.hbs}}
         {{#each itemsByType.talent as |itemData id|}}
-        {{#> systems/ds4/templates/actor/partials/item-list-entry.hbs itemData=itemData}}
+        {{#> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData}}
         {{!-- rank --}}
-        {{> systems/ds4/templates/actor/partials/talent-rank-equation.hbs talentRank=itemData.data.rank}}
-        {{/systems/ds4/templates/actor/partials/item-list-entry.hbs}}
+        {{> systems/ds4/templates/sheets/actor/components/talent-rank-equation.hbs talentRank=itemData.data.rank}}
+        {{/systems/ds4/templates/sheets/actor/components/item-list-entry.hbs}}
         {{/each}}
     </ol>
     {{/unless}}
-    {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='talent'}}
+    {{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='talent'}}
 
     {{!-- RACIAL ABILITY --}}
     <h4 class="ds4-item-list-title">{{localize 'DS4.ItemTypeRacialAbilityPlural'}}</h4>
     {{#unless (isEmpty itemsByType.racialAbility)}}
     <ol class="ds4-item-list ds4-item-list--racial-ability item-list">
-        {{> systems/ds4/templates/actor/partials/item-list-header.hbs}}
+        {{> systems/ds4/templates/sheets/actor/components/item-list-header.hbs}}
         {{#each itemsByType.racialAbility as |itemData id|}}
-        {{> systems/ds4/templates/actor/partials/item-list-entry.hbs itemData=itemData}}
+        {{> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData}}
         {{/each}}
     </ol>
     {{/unless}}
-    {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='racialAbility'}}
+    {{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='racialAbility'}}
 
     {{!-- LANGUAGE --}}
     <h4 class="ds4-item-list-title">{{localize 'DS4.ItemTypeLanguagePlural'}}</h4>
     {{#unless (isEmpty itemsByType.language)}}
     <ol class="ds4-item-list ds4-item-list--language item-list">
-        {{> systems/ds4/templates/actor/partials/item-list-header.hbs}}
+        {{> systems/ds4/templates/sheets/actor/components/item-list-header.hbs}}
         {{#each itemsByType.language as |itemData id|}}
-        {{> systems/ds4/templates/actor/partials/item-list-entry.hbs itemData=itemData}}
+        {{> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData}}
         {{/each}}
     </ol>
     {{/unless}}
-    {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='language'}}
+    {{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='language'}}
 
     {{!-- ALPHABET --}}
     <h4 class="ds4-item-list-title">{{localize 'DS4.ItemTypeAlphabetPlural'}}</h4>
     {{#unless (isEmpty itemsByType.alphabet)}}
     <ol class="ds4-item-list ds4-item-list--alphabet item-list">
-        {{> systems/ds4/templates/actor/partials/item-list-header.hbs}}
+        {{> systems/ds4/templates/sheets/actor/components/item-list-header.hbs}}
         {{#each itemsByType.alphabet as |itemData id|}}
-        {{> systems/ds4/templates/actor/partials/item-list-entry.hbs itemData=itemData}}
+        {{> systems/ds4/templates/sheets/actor/components/item-list-entry.hbs itemData=itemData}}
         {{/each}}
     </ol>
     {{/unless}}
-    {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='alphabet'}}
+    {{> systems/ds4/templates/sheets/actor/components/overview-add-button.hbs dataType='alphabet'}}
 </div>
diff --git a/src/templates/sheets/actor/tabs/values.hbs b/src/templates/sheets/actor/tabs/values.hbs
new file mode 100644
index 00000000..493d9973
--- /dev/null
+++ b/src/templates/sheets/actor/tabs/values.hbs
@@ -0,0 +1,4 @@
+<div class="tab values" data-group="primary" data-tab="values">
+    {{> systems/ds4/templates/sheets/actor/components/core-values.hbs}}
+    {{> systems/ds4/templates/sheets/actor/components/combat-values.hbs}}
+</div>
diff --git a/src/templates/sheets/item/alphabet-sheet.hbs b/src/templates/sheets/item/alphabet-sheet.hbs
new file mode 100644
index 00000000..1211adac
--- /dev/null
+++ b/src/templates/sheets/item/alphabet-sheet.hbs
@@ -0,0 +1,8 @@
+<form class="{{cssClass}}" autocomplete="off">
+    {{#> systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
+    {{/systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
+
+    {{!-- Common Item body --}}
+    {{#> systems/ds4/templates/sheets/item/components/body.hbs}}{{/systems/ds4/templates/sheets/item/components/body.hbs}}
+
+</form>
diff --git a/src/templates/item/armor-sheet.hbs b/src/templates/sheets/item/armor-sheet.hbs
similarity index 84%
rename from src/templates/item/armor-sheet.hbs
rename to src/templates/sheets/item/armor-sheet.hbs
index 6c8e9540..402f4f03 100644
--- a/src/templates/item/armor-sheet.hbs
+++ b/src/templates/sheets/item/armor-sheet.hbs
@@ -1,5 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    {{#> systems/ds4/templates/item/partials/sheet-header.hbs}}
+    {{#> systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
             <div class="grid grid-3col basic-properties">
                 <div class="basic-property">
                     <label>{{localize "DS4.ArmorType"}}</label>
@@ -27,8 +27,8 @@
                         placeholder="0" data-dtype="Number" />
                 </div>
             </div>
-    {{/systems/ds4/templates/item/partials/sheet-header.hbs}}
+    {{/systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
 
     {{!-- Common Item body --}}
-    {{#> systems/ds4/templates/item/partials/body.hbs}}{{/systems/ds4/templates/item/partials/body.hbs}}
-</form>
\ No newline at end of file
+    {{#> systems/ds4/templates/sheets/item/components/body.hbs}}{{/systems/ds4/templates/sheets/item/components/body.hbs}}
+</form>
diff --git a/src/templates/item/partials/body.hbs b/src/templates/sheets/item/components/body.hbs
similarity index 68%
rename from src/templates/item/partials/body.hbs
rename to src/templates/sheets/item/components/body.hbs
index 2a9eaecd..2bfe9ca0 100644
--- a/src/templates/item/partials/body.hbs
+++ b/src/templates/sheets/item/components/body.hbs
@@ -13,16 +13,16 @@
 <section class="sheet-body">
 
     {{!-- Description Tab --}}
-    {{#> systems/ds4/templates/item/partials/description.hbs}}
-        {{> @partial-block}}
-    {{/systems/ds4/templates/item/partials/description.hbs}}
+    {{#> systems/ds4/templates/sheets/item/tabs/description.hbs}}
+    {{> @partial-block}}
+    {{/systems/ds4/templates/sheets/item/tabs/description.hbs}}
 
     {{!-- Effects Tab --}}
-    {{> systems/ds4/templates/item/partials/effects.hbs}}
-    
+    {{> systems/ds4/templates/sheets/item/tabs/effects.hbs}}
+
     {{#if isPhysical}}
     {{!-- Details Tab --}}
-    {{> systems/ds4/templates/item/partials/details.hbs}}
+    {{> systems/ds4/templates/sheets/item/tabs/details.hbs}}
     {{/if}}
-    
-</section>
\ No newline at end of file
+
+</section>
diff --git a/src/templates/item/partials/sheet-header.hbs b/src/templates/sheets/item/components/sheet-header.hbs
similarity index 100%
rename from src/templates/item/partials/sheet-header.hbs
rename to src/templates/sheets/item/components/sheet-header.hbs
diff --git a/src/templates/sheets/item/equipment-sheet.hbs b/src/templates/sheets/item/equipment-sheet.hbs
new file mode 100644
index 00000000..723636c9
--- /dev/null
+++ b/src/templates/sheets/item/equipment-sheet.hbs
@@ -0,0 +1,7 @@
+<form class="{{cssClass}}" autocomplete="off">
+    {{#> systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
+    {{/systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
+
+    {{!-- Common Item body --}}
+    {{#> systems/ds4/templates/sheets/item/components/body.hbs}}{{/systems/ds4/templates/sheets/item/components/body.hbs}}
+</form>
diff --git a/src/templates/sheets/item/language-sheet.hbs b/src/templates/sheets/item/language-sheet.hbs
new file mode 100644
index 00000000..1211adac
--- /dev/null
+++ b/src/templates/sheets/item/language-sheet.hbs
@@ -0,0 +1,8 @@
+<form class="{{cssClass}}" autocomplete="off">
+    {{#> systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
+    {{/systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
+
+    {{!-- Common Item body --}}
+    {{#> systems/ds4/templates/sheets/item/components/body.hbs}}{{/systems/ds4/templates/sheets/item/components/body.hbs}}
+
+</form>
diff --git a/src/templates/sheets/item/loot-sheet.hbs b/src/templates/sheets/item/loot-sheet.hbs
new file mode 100644
index 00000000..723636c9
--- /dev/null
+++ b/src/templates/sheets/item/loot-sheet.hbs
@@ -0,0 +1,7 @@
+<form class="{{cssClass}}" autocomplete="off">
+    {{#> systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
+    {{/systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
+
+    {{!-- Common Item body --}}
+    {{#> systems/ds4/templates/sheets/item/components/body.hbs}}{{/systems/ds4/templates/sheets/item/components/body.hbs}}
+</form>
diff --git a/src/templates/sheets/item/racialAbility-sheet.hbs b/src/templates/sheets/item/racialAbility-sheet.hbs
new file mode 100644
index 00000000..1211adac
--- /dev/null
+++ b/src/templates/sheets/item/racialAbility-sheet.hbs
@@ -0,0 +1,8 @@
+<form class="{{cssClass}}" autocomplete="off">
+    {{#> systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
+    {{/systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
+
+    {{!-- Common Item body --}}
+    {{#> systems/ds4/templates/sheets/item/components/body.hbs}}{{/systems/ds4/templates/sheets/item/components/body.hbs}}
+
+</form>
diff --git a/src/templates/item/shield-sheet.hbs b/src/templates/sheets/item/shield-sheet.hbs
similarity index 60%
rename from src/templates/item/shield-sheet.hbs
rename to src/templates/sheets/item/shield-sheet.hbs
index 4ef9c9f9..160e7923 100644
--- a/src/templates/item/shield-sheet.hbs
+++ b/src/templates/sheets/item/shield-sheet.hbs
@@ -1,5 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    {{#> systems/ds4/templates/item/partials/sheet-header.hbs}}
+    {{#> systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
         <div class="grid grid-1col basic-properties">
             <div class="basic-property">
                 <label>{{localize "DS4.ArmorValue"}}</label>
@@ -7,8 +7,8 @@
                     placeholder="0" data-dtype="Number" />
             </div>
         </div>
-    {{/systems/ds4/templates/item/partials/sheet-header.hbs}}
+    {{/systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
 
     {{!-- Common Item body --}}
-    {{#> systems/ds4/templates/item/partials/body.hbs}}{{/systems/ds4/templates/item/partials/body.hbs}}
-</form>
\ No newline at end of file
+    {{#> systems/ds4/templates/sheets/item/components/body.hbs}}{{/systems/ds4/templates/sheets/item/components/body.hbs}}
+</form>
diff --git a/src/templates/item/specialCreatureAbility-sheet.hbs b/src/templates/sheets/item/specialCreatureAbility-sheet.hbs
similarity index 61%
rename from src/templates/item/specialCreatureAbility-sheet.hbs
rename to src/templates/sheets/item/specialCreatureAbility-sheet.hbs
index 086ba9a5..8808afa9 100644
--- a/src/templates/item/specialCreatureAbility-sheet.hbs
+++ b/src/templates/sheets/item/specialCreatureAbility-sheet.hbs
@@ -1,5 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    {{#> systems/ds4/templates/item/partials/sheet-header.hbs}}
+    {{#> systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
     <div class="grid grid-3col basic-properties">
         <div class="basic-property">
             <label>{{localize "DS4.SpecialCreatureAbilityExperiencePoints"}}</label>
@@ -7,9 +7,9 @@
                 placeholder="0" data-dtype="Number" />
         </div>
     </div>
-    {{/systems/ds4/templates/item/partials/sheet-header.hbs}}
+    {{/systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
 
     {{!-- Common Item body --}}
-    {{#> systems/ds4/templates/item/partials/body.hbs}}{{/systems/ds4/templates/item/partials/body.hbs}}
+    {{#> systems/ds4/templates/sheets/item/components/body.hbs}}{{/systems/ds4/templates/sheets/item/components/body.hbs}}
 
-</form>
\ No newline at end of file
+</form>
diff --git a/src/templates/sheets/item/spell-sheet.hbs b/src/templates/sheets/item/spell-sheet.hbs
new file mode 100644
index 00000000..2c3a0db3
--- /dev/null
+++ b/src/templates/sheets/item/spell-sheet.hbs
@@ -0,0 +1,75 @@
+{{!-- ======================================================================== --}}
+{{!-- INLINE PARTIAL DEFINITIONS --}}
+{{!-- ======================================================================== --}}
+
+
+{{#*inline "unitDatum" }}
+<div class="side-property">
+    <label>{{localize localizeString}}</label>
+    <div class="unit-data-pair">
+        <input class="item-num-val" type="text" data-dtype="String" name="data.{{property}}.value"
+            value="{{lookup (lookup data property) 'value'}}" />
+        <select name="data.{{property}}.unit" data-type="String">
+            {{#select (lookup (lookup data property) 'unit')}}
+            {{#if (eq unitType 'temporal')}}
+            {{#each (lookup config.i18n 'temporalUnitsAbbr') as |value key|}}<option value="{{key}}">{{value}}</option>
+            {{/each}}
+            {{else}}
+            {{#each (lookup config.i18n 'distanceUnitsAbbr') as |value key|}}<option value="{{key}}">{{value}}</option>
+            {{/each}}
+            {{/if}}
+            {{/select}}
+        </select>
+    </div>
+</div>
+{{/inline}}
+
+
+{{!-- ======================================================================== --}}
+
+
+<form class="{{cssClass}}" autocomplete="off">
+    {{#> systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
+    <div class="grid basic-properties">
+        <div class="basic-property">
+            <label for="data.spellType">{{localize "DS4.SpellType"}}</label>
+            <select id="data.spellType" name="data.spellType" data-type="String">
+                {{#select data.spellType}}
+                {{#each config.i18n.spellTypes as |value key|}}
+                <option value="{{key}}">{{value}}</option>
+                {{/each}}
+                {{/select}}
+            </select>
+        </div>
+        <div class="basic-property">
+            <label for="data.bonus">{{localize "DS4.SpellBonus"}}</label>
+            <input id="data.bonus" type="text" name="data.bonus" value="{{data.bonus}}" data-dtype="String" />
+        </div>
+    </div>
+    {{/systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
+
+    {{!-- Common Item body --}}
+    {{#> systems/ds4/templates/sheets/item/components/body.hbs}}
+    <div class="side-property">
+        <label for="data.spellCategory">{{localize "DS4.SpellCategory"}}</label>
+        <select id="data.spellCategory" name="data.spellCategory" data-type="String">
+            {{#select data.spellCategory}}
+            {{#each config.i18n.spellCategories as |value key|}}
+            <option value="{{key}}">{{value}}</option>
+            {{/each}}
+            {{/select}}
+        </select>
+    </div>
+    {{> unitDatum data=data property='maxDistance' localizeString='DS4.SpellMaxDistance' unitType='distance' }}
+    {{> unitDatum data=data property='effectRadius' localizeString='DS4.SpellEffectRadius' unitType='distance' }}
+    {{> unitDatum data=data property='duration' localizeString='DS4.SpellDuration' unitType='temporal' }}
+    {{> unitDatum data=data property='cooldownDuration' localizeString='DS4.SpellCooldownDuration' unitType='temporal'
+    }}
+    <div class="side-property">
+        <label for="data.scrollPrice">{{localize "DS4.SpellScrollPriceGold"}}</label>
+        <input type="number" min="0" max="9999" step="0.01" data-dtype="Number" name="data.scrollPrice"
+            id="data.scrollPrice" value="{{data.scrollPrice}}" />
+    </div>
+    {{/systems/ds4/templates/sheets/item/components/body.hbs}}
+
+</form>
diff --git a/src/templates/item/partials/description.hbs b/src/templates/sheets/item/tabs/description.hbs
similarity index 100%
rename from src/templates/item/partials/description.hbs
rename to src/templates/sheets/item/tabs/description.hbs
diff --git a/src/templates/item/partials/details.hbs b/src/templates/sheets/item/tabs/details.hbs
similarity index 100%
rename from src/templates/item/partials/details.hbs
rename to src/templates/sheets/item/tabs/details.hbs
diff --git a/src/templates/item/partials/effects.hbs b/src/templates/sheets/item/tabs/effects.hbs
similarity index 100%
rename from src/templates/item/partials/effects.hbs
rename to src/templates/sheets/item/tabs/effects.hbs
diff --git a/src/templates/item/talent-sheet.hbs b/src/templates/sheets/item/talent-sheet.hbs
similarity index 82%
rename from src/templates/item/talent-sheet.hbs
rename to src/templates/sheets/item/talent-sheet.hbs
index 22257d81..cd151f67 100644
--- a/src/templates/item/talent-sheet.hbs
+++ b/src/templates/sheets/item/talent-sheet.hbs
@@ -17,16 +17,16 @@
 
 
 <form class="{{cssClass}}" autocomplete="off">
-    {{#> systems/ds4/templates/item/partials/sheet-header.hbs}}
+    {{#> systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
         <div class="grid grid-4col basic-properties">
             {{> talentRankBasicProperty data=data property='base' localizeString='DS4.TalentRankBase' }}
             {{> talentRankBasicProperty data=data property='max' localizeString='DS4.TalentRankMax'}}
             {{> talentRankBasicProperty data=data property='mod' localizeString='DS4.TalentRankMod'}}
             {{> talentRankBasicProperty data=data property='total' localizeString='DS4.TalentRankTotal' disabled='disabled'}}
         </div>
-    {{/systems/ds4/templates/item/partials/sheet-header.hbs}}
-    
+    {{/systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
+
     {{!-- Common Item body --}}
-    {{#> systems/ds4/templates/item/partials/body.hbs}}{{/systems/ds4/templates/item/partials/body.hbs}}
+    {{#> systems/ds4/templates/sheets/item/components/body.hbs}}{{/systems/ds4/templates/sheets/item/components/body.hbs}}
 
 </form>
diff --git a/src/templates/item/weapon-sheet.hbs b/src/templates/sheets/item/weapon-sheet.hbs
similarity index 80%
rename from src/templates/item/weapon-sheet.hbs
rename to src/templates/sheets/item/weapon-sheet.hbs
index 65005984..ead8fa91 100644
--- a/src/templates/item/weapon-sheet.hbs
+++ b/src/templates/sheets/item/weapon-sheet.hbs
@@ -1,5 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    {{#> systems/ds4/templates/item/partials/sheet-header.hbs}}
+    {{#> systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
         <div class="grid grid-3col basic-properties">
             <div class="basic-property">
                 <label>{{localize "DS4.AttackType"}}</label>
@@ -22,8 +22,8 @@
                     value="{{data.opponentDefense}}" placeholder="0" data-dtype="Number" />
             </div>
         </div>
-    {{/systems/ds4/templates/item/partials/sheet-header.hbs}}
+    {{/systems/ds4/templates/sheets/item/components/sheet-header.hbs}}
 
     {{!-- Common Item body --}}
-    {{#> systems/ds4/templates/item/partials/body.hbs}}{{/systems/ds4/templates/item/partials/body.hbs}}
-</form>
\ No newline at end of file
+    {{#> systems/ds4/templates/sheets/item/components/body.hbs}}{{/systems/ds4/templates/sheets/item/components/body.hbs}}
+</form>