diff --git a/templates/partials/item-header.html b/templates/partials/item-header.html
index b0b7dfd3..d3163052 100644
--- a/templates/partials/item-header.html
+++ b/templates/partials/item-header.html
@@ -3,7 +3,7 @@
     <div class="item-header-first-collum">
         <h1 class="itemname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
         <div class="item-header-row">
-            {{#unless data.isSpell}}
+            {{#unless (eq item.type "spell")}}
                 <div class="item-header-second-collum">
                     <label>{{localize "WITCHER.Item.Quantity"}}</label>
                     <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number" />
@@ -13,7 +13,7 @@ <h1 class="itemname"><input name="name" type="text" value="{{item.name}}" placeh
                     <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number" />
                 </div>
                 <div class="item-header-second-collum">
-                    {{#if data.isMutagen}}
+                    {{#if (eq item.type "mutagen")}}
                             <label>{{localize "WITCHER.Type"}}</label>
                             <select name="data.type" id="type-select">
                             {{#select data.type}}
@@ -23,13 +23,13 @@ <h1 class="itemname"><input name="name" type="text" value="{{item.name}}" placeh
                             {{/select}}
                             </select>
                     {{/if}}
-                    {{#unless data.isMutagen}}
+                    {{#unless (eq item.type "mutagen")}}
                             <label>{{localize "WITCHER.Item.Cost"}}</label>
                             <input type="text" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
                     {{/unless}}
                 </div>
             {{/unless}}
-            {{#if data.isSpell}}
+            {{#if (eq item.type "spell")}}
                 <div class="item-header-second-collum item-header-spell">
                     <label>{{localize "WITCHER.Spell.type"}}</label>
                     <select name="data.class" id="profession-select">
diff --git a/templates/sheets/alchemical-sheet.html b/templates/sheets/alchemical-sheet.html
index 3d226721..353677c5 100644
--- a/templates/sheets/alchemical-sheet.html
+++ b/templates/sheets/alchemical-sheet.html
@@ -1,5 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
 
     {{!-- Attributes Tab --}}
     <table>
diff --git a/templates/sheets/armor-sheet.html b/templates/sheets/armor-sheet.html
index b3b8e8d5..eb38a17b 100644
--- a/templates/sheets/armor-sheet.html
+++ b/templates/sheets/armor-sheet.html
@@ -1,5 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
     <div class="item-options">
         <div class="item-collum">
             <div class="item-option-tickbox">
diff --git a/templates/sheets/component-sheet.html b/templates/sheets/component-sheet.html
index fb6cc339..9e8b50f5 100644
--- a/templates/sheets/component-sheet.html
+++ b/templates/sheets/component-sheet.html
@@ -1,5 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
     <div class="item-options">
         <div class="item-collum">
             <label>{{localize "WITCHER.Type"}}</label>
diff --git a/templates/sheets/diagrams-sheet.html b/templates/sheets/diagrams-sheet.html
index 1af7cd63..958a120f 100644
--- a/templates/sheets/diagrams-sheet.html
+++ b/templates/sheets/diagrams-sheet.html
@@ -1,5 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
     <div class="item-options">
         <div class="item-collum">
             <div class="item-option-tickbox">
diff --git a/templates/sheets/enhancement-sheet.html b/templates/sheets/enhancement-sheet.html
index e0a4dec5..91a449c9 100644
--- a/templates/sheets/enhancement-sheet.html
+++ b/templates/sheets/enhancement-sheet.html
@@ -1,5 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
     <div class="item-options">
         <div class="item-collum">
             <label>{{localize "WITCHER.Type"}}:</label>
diff --git a/templates/sheets/mount-sheet.html b/templates/sheets/mount-sheet.html
index 049e8544..e14b093e 100644
--- a/templates/sheets/mount-sheet.html
+++ b/templates/sheets/mount-sheet.html
@@ -1,5 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
     {{!-- Sheet Tab Navigation --}}
     <nav class="sheet-tabs tabs" data-group="primary">
         <a class="item" data-tab="description">{{localize "WITCHER.Item.Description"}}</a>
diff --git a/templates/sheets/mutagen-sheet.html b/templates/sheets/mutagen-sheet.html
index 7622592a..eb51774f 100644
--- a/templates/sheets/mutagen-sheet.html
+++ b/templates/sheets/mutagen-sheet.html
@@ -1,6 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <input type="hidden" name="data.isMutagen" value="data.isMutagen"/>
-    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
     <table>
         <tr>
             <th>{{localize "WITCHER.Mutagen.MutSource"}}</th>
diff --git a/templates/sheets/spell-sheet.html b/templates/sheets/spell-sheet.html
index e593713d..41be028a 100644
--- a/templates/sheets/spell-sheet.html
+++ b/templates/sheets/spell-sheet.html
@@ -1,6 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <input type="hidden" name="data.isSpell" value="data.isSpell"/>
-    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
     <div class="item-options">
         <div class="item-collum">
             <div class="item-option-tickbox">
diff --git a/templates/sheets/valuable-sheet.html b/templates/sheets/valuable-sheet.html
index 5ff8d5d8..3a02f7a0 100644
--- a/templates/sheets/valuable-sheet.html
+++ b/templates/sheets/valuable-sheet.html
@@ -1,5 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
     <div class="item-options">
         <div class="item-collum item-selector">
             <label>{{localize "WITCHER.Type"}}</label>
diff --git a/templates/sheets/weapon-sheet.html b/templates/sheets/weapon-sheet.html
index f3b0905d..43fe1d93 100644
--- a/templates/sheets/weapon-sheet.html
+++ b/templates/sheets/weapon-sheet.html
@@ -1,5 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
     <div class="item-options">
         <div class="item-collum">
             <div class="item-option-tickbox">