diff --git a/system.json b/system.json
index 09566fe..72d9cef 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,6 @@
   "author": "Uberwald",
   "compatibleCoreVersion": "9",
   "description": "Crucible RPG system for FoundryVTT",
-  "download": "https://www.uberwald.me/data/files/fvtt-crucible-rpg/fvtt-crucible-rpg.zip",
   "esmodules": [
     "modules/crucible-main.js"
   ],
@@ -17,7 +16,6 @@
   ],
   "library": false,
   "license": "LICENSE.txt",
-  "manifest": "https://www.uberwald.me/data/files/fvtt-crucible-rpg/system.json",
   "manifestPlusVersion": "1.0.0",
   "media": [],
   "minimumCoreVersion": "0.8.0",
@@ -90,9 +88,11 @@
   "styles": [
     "styles/simple.css"
   ],
-  "templateVersion": 2,
+  "templateVersion": 3,
   "title": "Crucible RPG",
-  "url": "https://www.uberwald.me/data/files/fvtt-crucible-rpg",
-  "version": "0.1.1",
+  "manifest": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg/raw/master/system.json",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg/archive/fvtt-crucible-rpg-v0.1.1.zip",
+  "url": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg",
+  "version": "0.1.2",
   "background" : "./images/ui/crucible_welcome_page.webp"
 }
diff --git a/template.json b/template.json
index e242006..e4e8cb2 100644
--- a/template.json
+++ b/template.json
@@ -83,7 +83,10 @@
    }
   },
   "Item": {
-    "types": [ "race", "skill", "armor", "shield", "equipment", "weapon", "money" , "feat"],
+    "types": [ "race", "skill", "armor", "shield", "equipment", "weapon", "money" , "feat", "spell", "condition"],
+    "condition": {
+      "description": ""
+    },
     "race": {
       "description": ""
     },
@@ -115,20 +118,18 @@
       "description":""
     },
     "equipment": {
-      "type": "",
+      "equiptype": "",
       "cost": 0,
-      "weight": 0,
       "quantity": 0,
       "equipped": false,
       "iscontainer": false,
       "containercapacity": 0,
       "containerid": "",
-      "threatlevel": 0
+      "description":""
     },
     "money" : {
       "value": 0,
       "quantity": 0,
-      "weight": 0,
       "description": ""
     },
     "weapon": {
@@ -142,6 +143,12 @@
       "cost": 0,
       "equipped": false,
       "description": ""
+    },
+    "spell":{
+      "lore": "",
+      "circle": 1,
+      "range": "",
+      "description": ""
     }
   }
 }
diff --git a/templates/item-condition-sheet.html b/templates/item-condition-sheet.html
new file mode 100644
index 0000000..5e3e3ce
--- /dev/null
+++ b/templates/item-condition-sheet.html
@@ -0,0 +1,28 @@
+<form class="{{cssClass}}" autocomplete="off">
+  <header class="sheet-header">
+    <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}" />
+    <div class="header-fields">
+      <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
+    </div>
+  </header>
+  {{> systems/fvtt-pegasus-rpg/templates/partial-item-nav.html}}
+
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+
+    <div class="tab details" data-group="primary" data-tab="description">
+
+      <label class="generic-label">Description</label>
+      <div class="medium-editor item-text-long-line">
+        {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+      </div>
+    </div>
+
+    <div class="tab details" data-group="primary" data-tab="details">
+      <ul>
+      </ul>
+
+    </div>
+
+  </section>
+</form>
\ No newline at end of file
diff --git a/templates/item-equipment-sheet.html b/templates/item-equipment-sheet.html
index 0d66d2d..0558259 100644
--- a/templates/item-equipment-sheet.html
+++ b/templates/item-equipment-sheet.html
@@ -6,79 +6,24 @@
       </div>
   </header>
 
-  {{> systems/fvtt-pegasus-rpg/templates/partial-item-nav.html}}
+  {{> systems/fvtt-crucible-rpg/templates/partial-item-nav.html}}
 
   {{!-- Sheet Body --}}
   <section class="sheet-body">
 
-    {{> systems/fvtt-pegasus-rpg/templates/partial-item-description.html}}
+    {{> systems/fvtt-crucible-rpg/templates/partial-item-description.html}}
 
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
-          <li class="flexrow"><label class="generic-label">Type</label>
-            <select class="competence-base flexrow" type="text" name="data.type" value="{{data.type}}" data-dtype="String">
-              {{#select data.type}}
-              {{> systems/fvtt-pegasus-rpg/templates/partial-options-equipment-types.html}}
-              {{/select}}
-            </select> 
-          </li>
-
-          <li class="flexrow"><label class="generic-label">Related Statistic</label>
-            <select class="competence-base flexrow" type="text" name="data.stataffected" value="{{data.stataffected}}" data-dtype="String">
-              {{#select data.stataffected}}
-              {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=true mr=true}}
-              {{/select}}
-            </select> 
-          </li>
-
-          <li class="flexrow"><label class="generic-label">Level</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.level" value="{{data.level}}" data-dtype="Number"/>
-          </li>
-
-          <li class="flexrow"><label class="generic-label">Stat Dice ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.statdice" {{checked data.statdice}}/></label>
-          </li>
-
-          <li class="flexrow"><label class="generic-label">Bonus Dice ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.bonusdice" {{checked data.bonusdice}}/></label>
-          </li>
-          
-          <li class="flexrow"><label class="generic-label">Other Dice ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.otherdice" {{checked data.otherdice}}/></label>
-          </li>
-
-          {{> systems/fvtt-pegasus-rpg/templates/partial-equipment-effects.html}}
-
           <li class="flexrow"><label class="generic-label">Equipped ?</label>
             <label class="attribute-value checkbox"><input type="checkbox" name="data.equipped" {{checked data.equipped}}/></label>
           </li>
           <li class="flexrow"><label class="generic-label">Quantity</label>
             <input type="text" class="input-numeric-short padd-right" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/>
           </li>
-          <li class="flexrow"><label class="generic-label">Weight</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.weight" value="{{data.weight}}" data-dtype="Number"/>
-          </li>
-          <li class="flexrow"><label class="generic-label">Is a container ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.iscontainer" {{checked data.iscontainer}}/></label>
-          </li>
-          {{#if data.iscontainer}}
-          <li class="flexrow"><label class="generic-label">Container capacity</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.containercapacity" value="{{data.containercapacity}}" data-dtype="Number"/>
-          </li>
-          {{/if}}
-          <li class="flexrow"><label class="generic-label">Threat Level Value</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.threatlevel" value="{{data.threatlevel}}" data-dtype="Number"/>
-          </li>
           <li class="flexrow"><label class="generic-label">Cost</label>
             <input type="text" class="input-numeric-short padd-right" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
           </li>
-          <li class="flexrow"><label class="generic-label">IDR</label>
-            <select class="competence-base flexrow" type="text" name="data.idr" value="{{data.idr}}" data-dtype="String">
-              {{#select data.idr}}
-              {{{optionsDiceList}}}
-              {{/select}}
-            </select> 
-          </li>
       </ul>
     </div>
 
diff --git a/templates/item-feat-sheet.html b/templates/item-feat-sheet.html
new file mode 100644
index 0000000..b398d4b
--- /dev/null
+++ b/templates/item-feat-sheet.html
@@ -0,0 +1,35 @@
+<form class="{{cssClass}}" autocomplete="off">
+    <header class="sheet-header">
+        <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+        <div class="header-fields">
+            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
+        </div>
+    </header>
+
+    {{> systems/fvtt-crucible-rpg/templates/partial-item-nav.html}}
+
+    {{!-- Sheet Body --}}
+    <section class="sheet-body">
+
+      {{> systems/fvtt-crucible-rpg/templates/partial-item-description.html}}
+
+      <div class="tab details" data-group="primary" data-tab="details">
+        <ul>
+            <li class="flexrow"><label class="generic-label">Add feat die  ?</label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="data.isfeatdie" {{checked data.isfeatdie}}/></label>
+            </li>
+
+            <li class="flexrow"><label class="generic-label">Add SL  ?</label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="data.issl" {{checked data.issl}}/></label>
+            </li>
+
+            {{#if data.issl}}
+            <li class="flexrow"><label class="generic-label">SL value</label>
+              <input type="text" class="" name="data.sl" value="{{data.sl}}" data-dtype="Number"/>
+            </li>
+            {{/if}}
+
+          </ul>
+        </div>
+    </section>
+</form>
diff --git a/templates/item-money-sheet.html b/templates/item-money-sheet.html
index da8430c..dddfb3b 100644
--- a/templates/item-money-sheet.html
+++ b/templates/item-money-sheet.html
@@ -5,26 +5,21 @@
           <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
       </div>
   </header>
-  {{> systems/fvtt-pegasus-rpg/templates/partial-item-nav.html}}
+
+  {{> systems/fvtt-crucible-rpg/templates/partial-item-nav.html}}
 
   {{!-- Sheet Body --}}
   <section class="sheet-body">
-    {{> systems/fvtt-pegasus-rpg/templates/partial-item-description.html}}
+
+    {{> systems/fvtt-crucible-rpg/templates/partial-item-description.html}}
 
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
           <li class="flexrow"><label class="generic-label">Quantity</label>
             <input type="text" class="input-numeric-short padd-right" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/>
           </li>
-          <li class="flexrow"><label class="generic-label">Weight</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.weight" value="{{data.weight}}" data-dtype="Number"/>
-          </li>
-          <li class="flexrow"><label class="generic-label">IDR</label>
-            <select class="competence-base flexrow" type="text" name="data.idr" value="{{data.idr}}" data-dtype="String">
-              {{#select data.idr}}
-              {{{optionsDiceList}}}
-              {{/select}}
-            </select> 
+          <li class="flexrow"><label class="generic-label">Unit value</label>
+            <input type="text" class="input-numeric-short padd-right" name="data.value" value="{{data.value}}" data-dtype="Number"/>
           </li>
       </ul>
     </div>
diff --git a/templates/item-race-sheet.html b/templates/item-race-sheet.html
index ec9bb16..5e3e3ce 100644
--- a/templates/item-race-sheet.html
+++ b/templates/item-race-sheet.html
@@ -16,116 +16,10 @@
       <div class="medium-editor item-text-long-line">
         {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
       </div>
-      <label class="generic-label">Environment</label>
-      <div class="medium-editor item-text-long-line">
-        {{editor content=data.environment target="data.environment" button=true owner=owner editable=editable}}
-      </div>
-      <label class="generic-label">Society/Culture</label>
-      <div class="medium-editor item-text-long-line">
-        {{editor content=data.society_culture target="data.society_culture" button=true owner=owner editable=editable}}
-      </div>
-      <label class="generic-label">Outlook</label>
-      <div class="medium-editor item-text-long-line">
-        {{editor content=data.outlook target="data.outlook" button=true owner=owner editable=editable}}
-      </div>
     </div>
 
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
-        <li class="flexrow"><label class="generic-label">Abilities</label>
-        </li>
-        <ul class="ul-level1">
-          <li class="flexrow">
-            <div class="drop-abilities"><label>Drop Abilities here !</label></div>
-          </li>
-          {{#each data.abilities as |ability idx|}}
-          <li class="flexrow">
-            <label name="data.abilities[{{idx}}].name"><a class="view-subitem" data-type="abilities"
-                data-index="{{idx}}">{{ability.name}}</a></label>
-            <div class="item-controls padd-left">
-              <a class="item-control delete-subitem padd-left" data-type="abilities" data-index="{{idx}}"
-                title="Delete Ability"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-      </ul>
-
-      <ul>
-        <li class="flexrow"><label class="generic-label">Selectable Stats ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="data.selectablestats" {{checked
-              data.selectablestats}} /></label>
-        </li>
-        {{#if data.selectablestats}}
-        <li class="flexrow"><label class="generic-label">Select 1 stat only once?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="data.statsonlyonce" {{checked
-              data.statsonlyonce}} /></label>
-        </li>
-        <li class="flexrow"><label class="generic-label">Number of selectable stats</label>
-          <input type="text" class="input-numeric-short padd-right" name="data.numberstats" value="{{data.numberstats}}"
-            data-dtype="Number" />
-        </li>
-        {{/if}}
-      </ul>
-
-      <ul>
-        <li class="flexrow"><label class="generic-label">Number of Optionnal Abilities</label>
-          <input type="text" class="input-numeric-short padd-right" name="data.nboptionnal" value="{{data.nboptionnal}}"
-            data-dtype="Number" />
-        </li>
-
-        <li class="flexrow"><label class="generic-label">Optionnal Abilities</label>
-        </li>
-        <ul class="ul-level1">
-          <li class="flexrow">
-            <div class="drop-optionnal-abilities"><label>Drop Abilities here !</label></div>
-          </li>
-          {{#each data.optionnalabilities as |ability idx|}}
-          <li class="flexrow">
-            <label name="data.optionnalabilities[{{idx}}].name"><a class="view-subitem" data-type="optionnalabilities"
-                data-index="{{idx}}">{{ability.name}}</a></label>
-            <div class="item-controls padd-left">
-              <a class="item-control delete-subitem padd-left" data-type="optionnalabilities" data-index="{{idx}}"
-                title="Delete Ability"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-      </ul>
-
-      <ul>
-        <li class="flexrow"><label class="generic-label">Perks Gained ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="data.perksgained" {{checked
-              data.perksgained}} /></label>
-        </li>
-        {{#if data.perksgained}}
-        <li class="flexrow"><label class="generic-label">Choose in all available perks?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="data.perksall" {{checked
-              data.perksall}} /></label>
-        </li>
-        <li class="flexrow"><label class="generic-label">Number of perks to gain</label>
-          <input type="text" class="input-numeric-short padd-right" name="data.perksnumber" value="{{data.perksnumber}}"
-            data-dtype="Number" />
-        </li>
-        {{#if data.perksall}}
-        {{else}}
-        <ul class="ul-level1">
-          <li class="flexrow">
-            <div class="drop-race-perk"><label>Drop Perks here !</label></div>
-          </li>
-          {{#each data.perks as |perk idx|}}
-          <li class="flexrow">
-            <label name="data.perks[{{idx}}].name"><a class="view-subitem" data-type="perks"
-                data-index="{{idx}}">{{perk.name}}</a></label>
-            <div class="item-controls padd-left">
-              <a class="item-control delete-subitem padd-left" data-type="perks" data-index="{{idx}}"
-                title="Delete Perk"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-          {{/each}}
-        </ul>
-        {{/if}}
-        {{/if}}
       </ul>
 
     </div>
diff --git a/templates/item-spell-sheet.html b/templates/item-spell-sheet.html
new file mode 100644
index 0000000..6aa531f
--- /dev/null
+++ b/templates/item-spell-sheet.html
@@ -0,0 +1,49 @@
+<form class="{{cssClass}}" autocomplete="off">
+    <header class="sheet-header">
+        <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+        <div class="header-fields">
+            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
+        </div>
+    </header>
+
+    {{> systems/fvtt-crucible-rpg/templates/partial-item-nav.html}}
+
+    {{!-- Sheet Body --}}
+    <section class="sheet-body">
+
+      {{> systems/fvtt-crucible-rpg/templates/partial-item-description.html}}
+
+      <div class="tab details" data-group="primary" data-tab="details">
+        <ul>
+            <li class="flexrow"><label class="generic-label">Lore</label>
+              <select class="competence-base flexrow" type="text" name="data.lore" value="{{data.lore}}" data-dtype="String">
+                {{#select data.lore}}
+                <option value="earth">Earth</option>
+                <option value="air">Air</option>
+                <option value="fire">Fire</option>
+                <option value="water">Water</option>
+                <option value="shadow">Shadow</option>
+                {{/select}}
+              </select> 
+            </li>
+
+            <li class="flexrow"><label class="generic-label">Circle</label>
+              <select class="competence-base flexrow" type="text" name="data.circle" value="{{data.circle}}" data-dtype="Number">
+                {{#select data.circle}}
+                <option value="1">1</option>
+                <option value="2">2</option>
+                <option value="3">3</option>
+                <option value="4">4</option>
+                <option value="5">5</option>
+                {{/select}}
+              </select> 
+            </li>
+
+            <li class="flexrow"><label class="generic-label">Range</label>
+              <input type="text" class="" name="data.range" value="{{data.range}}" data-dtype="String"/>
+            </li>
+
+          </ul>
+        </div>
+    </section>
+</form>