diff --git a/fonts/middlesaxonytext.ttf b/fonts/middlesaxonytext.ttf
deleted file mode 100755
index ceb8483..0000000
Binary files a/fonts/middlesaxonytext.ttf and /dev/null differ
diff --git a/fonts/zag_bold.otf b/fonts/zag_bold.otf
deleted file mode 100755
index 4088867..0000000
Binary files a/fonts/zag_bold.otf and /dev/null differ
diff --git a/fonts/zag_regular.otf b/fonts/zag_regular.otf
deleted file mode 100755
index 0574594..0000000
Binary files a/fonts/zag_regular.otf and /dev/null differ
diff --git a/template.json b/template.json
index 88d86a4..301399c 100644
--- a/template.json
+++ b/template.json
@@ -1,17 +1,39 @@
 {
   "Actor": {
-    "types": ["character", "npc"],
+    "types": [
+      "character",
+      "npc"
+    ],
     "templates": {
       "biodata": {
         "biodata": {
-          "class": "",
+          "species": "",
           "age": 0,
-          "size": 0,
+          "gender": 0,
+          "character": "",
+          "religion": "",
           "weight": "",
           "height": "",
-          "hair": "",
-          "sex": "",
-          "eyes": "",
+          "earlyeducation": "",
+          "tertiaryeducation": "",
+          "worldoforigin": "",
+          "style": {
+            "clothes": "",
+            "hairstyle": "",
+            "accessories": ""
+          },
+          "environment": {
+            "culturalorigin": "",
+            "familyorigin": "",
+            "parent": "",
+            "siblings": "",
+            "childhoodenv": "",
+            "personality": "",
+            "motivation": "",
+            "outlookpeople": "",
+            "outlookorganisation": "",
+            "valuepossession": ""
+          },
           "background": "",
           "description": "",
           "notes": "",
@@ -20,73 +42,194 @@
       },
       "core": {
         "subactors": [],
-        "abilities": {
-          "str":{ 
+        "attributes": {
+          "str": {
             "label": "Strength",
             "abbrev": "str",
             "col": 1,
-            "value": 1
+            "value": 0,
+            "bonusname": "CSB",
+            "base": 0,
+            "bonus": 0
           },
-          "agi":{ 
-            "label": "Agility",
-            "abbrev": "agi",
-            "col": 1,
-            "value": 1
-          },
-          "dex":{ 
+          "dex": {
             "label": "Dexterity",
             "abbrev": "dex",
             "col": 1,
-            "value": 1
+            "value": 0,
+            "bonusname": "ASB",
+            "base": 0,
+            "bonus": 0
           },
-          "con":{ 
+          "con": {
             "label": "Constitution",
             "abbrev": "con",
             "col": 1,
-            "value": 1
+            "value": 0,
+            "bonusname": "SSB",
+            "base": 0,
+            "bonus": 0
           },
-          "int":{ 
+          "siz": {
+            "label": "Size",
+            "abbrev": "siz",
+            "col": 2,
+            "value": 0,
+            "bonusname": "MSB",
+            "base": 0,
+            "bonus": 0
+          },
+          "att": {
+            "label": "Attractiveness",
+            "abbrev": "att",
+            "col": 2,
+            "value": 0,
+            "bonusname": "PSB",
+            "base": 0,
+            "bonus": 0
+          },
+          "int": {
             "label": "Intelligence",
             "abbrev": "int",
             "col": 2,
-            "value": 1
+            "value": 0,
+            "derivname": "EGO",
+            "derivvalue": 0,
+            "base": 0
           },
-          "wit":{ 
-            "label": "Wits",
-            "abbrev": "wit",
+          "edu": {
+            "label": "Education",
+            "abbrev": "edu",
             "col": 2,
-            "value": 1
+            "value": 0,
+            "derivname": "HUP",
+            "base": 0,
+            "derivvalue": 0
           },
-          "cha":{ 
+          "cha": {
             "label": "Charisma",
             "abbrev": "cha",
             "col": 2,
-            "value": 1
+            "value": 0,
+            "derivname": "SS",
+            "base": 0,
+            "derivvalue": 0
+          },
+          "emp": {
+            "label": "Empathy",
+            "abbrev": "edu",
+            "col": 2,
+            "value": 0,
+            "derivname": "MCDB",
+            "base": 0,
+            "derivvalue": 0
+          },
+          "sel": {
+            "label": "Self-Control",
+            "abbrev": "sel",
+            "col": 2,
+            "value": 0,
+            "derivname": "SI",
+            "base": 0,
+            "derivvalue": 0
           }
         },
         "secondary": {
           "hp": {
             "label": "Hitpoint",
-            "abbrev": "hb",
-            "value": -1,
+            "abbrev": "hp",
+            "value": 0,
+            "bonus": 0,
             "max": 0
           },
-          "effort": {
-            "label": "Effort",
-            "abbrev": "eff",
-            "value": -1,
+          "lp": {
+            "label": "Hitpoint",
+            "abbrev": "lp",
+            "value": 0,
+            "bonus": 0,
+            "max": 0
+          },
+          "bulk": {
+            "label": "Bulk",
+            "abbrev": "bulk",
+            "value": 0,
+            "bonus": 0,
             "max": 0
           }
         },
-        "social": {
-          "fame": {
-            "label": "Fame",
-            "value": 0
+        "hitlocations": {
+          "head": {
+            "label": "Head",
+            "dice": [
+              1
+            ],
+            "max": 0,
+            "value": 0,
+            "armour": 0
           },
-          "reputation": {
-            "label": "Reputation",
-            "value": 0
+          "chest": {
+            "label": "Chest",
+            "dice": [
+              2,
+              4
+            ],
+            "max": 0,
+            "value": 0,
+            "armour": 0
+          },
+          "abdomen": {
+            "label": "Abdomen",
+            "dice": [
+              5,
+              6
+            ],
+            "max": 0,
+            "value": 0,
+            "armour": 0
+          },
+          "leftarm": {
+            "label": "Left Arm",
+            "dice": [
+              7
+            ],
+            "max": 0,
+            "value": 0,
+            "armour": 0
+          },
+          "righttarm": {
+            "label": "Right Arm",
+            "dice": [
+              8
+            ],
+            "max": 0,
+            "value": 0,
+            "armour": 0
+          },
+          "rightleg": {
+            "label": "Right Leg",
+            "dice": [
+              9
+            ],
+            "max": 0,
+            "value": 0,
+            "armour": 0
+          },
+          "leftleg": {
+            "label": "Left Leg",
+            "dice": [
+              10
+            ],
+            "max": 0,
+            "value": 0,
+            "armour": 0
           }
+        },
+        "xp": {
+          "total": 0,
+          "spent": 0
+        },
+        "speed": {
+          "value": 0
         }
       },
       "npccore": {
@@ -95,111 +238,131 @@
       }
     },
     "character": {
-      "templates": [ "biodata", "core" ]
+      "templates": [
+        "biodata",
+        "core"
+      ]
     },
     "npc": {
-      "templates": [ "biodata", "core" ]
-   }
+      "templates": [
+        "biodata",
+        "core"
+      ]
+    }
   },
   "Item": {
-    "types": [ "race", "skill", "armor", "shield", "equipment", "weapon", "money" , "feat", "spell", "condition", "poison"],
-    "poison": {
-      "description": ""
-    },
-    "condition": {
-      "advantage": false,
-      "disadvantage": false,
-      "rolladvantage": false,
-      "rolldisadvantage": false,
-      "loosehpround": false,
-      "loohproundvalue": 0,
-      "noadvantage": false,
-      "attackdisadvantage": false,
-      "defensedisadvantage": false,
-      "targetadvantage": false,
-      "noaction": false,
-      "description": ""
-    },
-    "race": {
-      "description": ""
-    },
-    "feat": {
-      "isfeatdie": false,
-      "issl": false,
-      "sl": 0,
-      "description": ""
-    },
+    "types": [
+      "skill",
+      "perk",
+      "ability",
+      "armor",
+      "equipment",
+      "weapon",
+      "money",
+      "genetic",
+      "cyber"
+    ],
     "skill": {
-      "ability": "",
-      "armorpenalty": false,
-      "isproficient": false,
-      "isweaponskill": false,
-      "isshieldskill": false,
-      "isfeatdie": false,
-      "issl2": false,
-      "islore": false,
-      "skilltype": "",
-      "isinnate": false,
-      "bonusdice": "",
-      "background": 0,
-      "basic": 0,
-      "class": 0,
-      "exp": 0,
-      "explevel": 0,
+      "base": "",
+      "bonus": 0,
+      "used": false,
+      "description": ""
+    },
+    "perk": {
+      "description": ""
+    },
+    "ability": {
+      "description": ""
+    },
+    "genetic": {
+      "hup": 0,
+      "description": ""
+    },
+    "cyber": {
+      "hup": 0,
       "description": ""
     },
     "armor": {
       "armortype": "",
-      "absorprionroll": "",
-      "damagedroll": "",
-      "isproficient": false,
-      "minstr": 0,
-      "skillpenalty": 0,
+      "locations": {
+        "head": {
+          "protected": false,
+          "max": 0,
+          "value": 0
+        },
+        "abdomen": {
+          "protected": false,
+          "max": 0,
+          "value": 0
+        },
+        "chest": {
+          "protected": false,
+          "max": 0,
+          "value": 0
+        },
+        "leftleg": {
+          "protected": false,
+          "max": 0,
+          "value": 0
+        },
+        "rightleg": {
+          "protected": false,
+          "max": 0,
+          "value": 0
+        },
+        "leftarm": {
+          "protected": false,
+          "max": 0,
+          "value": 0
+        },
+        "righttarm": {
+          "protected": false,
+          "max": 0,
+          "value": 0
+        }
+      },
+      "si": 0,
+      "skillbonus": "",
+      "availability": "",
       "equipped": false,
+      "bulk": 0,
       "cost": 0,
-      "description":""
-    },
-    "shield": {
-      "shielddie": "",
-      "skill": "",
-      "equipped": false,
-      "cost": 0,
-      "description":""
+      "description": ""
     },
     "equipment": {
       "equiptype": "",
       "cost": 0,
+      "skillbonus": "",
       "quantity": 0,
+      "bulk": 0,
       "equipped": false,
       "iscontainer": false,
       "containercapacity": 0,
       "containerid": "",
-      "description":""
+      "description": ""
     },
-    "money" : {
+    "money": {
       "value": 0,
       "quantity": 0,
       "description": ""
     },
     "weapon": {
-      "isproficient": false,
-      "skill": "",
-      "qualities": "",
-      "flaws": "",
+      "weapontype": "",
+      "associatedskill": "",
+      "penetration": "",
       "damage": "",
-      "isranged": false,
-      "range": "",
+      "bulk": 0,
+      "br": 0,
+      "rof": 0,
+      "ammo": 0,
+      "effectiverange": "",
       "maxrange": "",
-      "minstr": 0,
+      "sp": 0,
       "cost": 0,
+      "size": 0,
+      "skillbonus": "",
       "equipped": false,
       "description": ""
-    },
-    "spell":{
-      "lore": "",
-      "circle": 1,
-      "range": "",
-      "description": ""
     }
   }
-}
+}
\ No newline at end of file
diff --git a/templates/items/item-armor-sheet.hbs b/templates/items/item-armor-sheet.hbs
index f4ebe36..0b095f9 100644
--- a/templates/items/item-armor-sheet.hbs
+++ b/templates/items/item-armor-sheet.hbs
@@ -19,63 +19,38 @@
         <div class="tab" data-group="primary">
           <ul>
             <li class="flexrow"><label class="generic-label">Type</label>
-              <select class="competence-base flexrow" type="text" name="system.armortype" value="{{data.armortype}}" data-dtype="String">
-                {{#select data.armortype}}
-                <option value="clothes">Clothes</option>
-                <option value="paddedlight">Padded (Light)</option>
-                <option value="leatherlight">Leather/Hide (Light)</option>
-                <option value="leathermedium">Studded Leather (Medium)</option>
-                <option value="chain">Chain (Medium)</option>
-                <option value="scale">Scale (Heavy)</option>
-                <option value="scale">Scale (Heavy)</option>
-                <option value="platemail">Plate Mail (Heavy)</option>
-                <option value="platefull">Full Plate (Heavy)</option>
+              <input type="text" class="input-numeric-short padd-right" name="system.armortype" value="{{system.armortype}}" data-dtype="String"/>
+            </li>
+
+            {{#each system.locations as |location key|}}
+            <li class="flexrow"><label class="generic-label">{{location.label}}</label>
+              <li class="flexrow"><label class="generic-label">Protected ?</label>
+                <label class="attribute-value checkbox"><input type="checkbox" name="system.locations.{{key}}.protected" {{checked location.protected}}/></label>
+              </li>
+              {{#if location.protected}}
+                <li class="flexrow"><label class="generic-label">Protection (max)</label>
+                  <input type="text" class="input-numeric-short padd-right" name="system.locations.{{key}}.max" value="{{location.max}}" data-dtype="Number"/>
+                </li>
+                <li class="flexrow"><label class="generic-label">Protection (current)</label>
+                  <input type="text" class="input-numeric-short padd-right" name="system.locations.{{key}}.value" value="{{location.value}}" data-dtype="Number"/>
+                </li>
+              {{/if}}
+            {{/each}}
+
+            <li class="flexrow"><label class="generic-label">SI</label>
+              <input type="text" class="input-numeric-short padd-right" name="system.si" value="{{system.si}}" data-dtype="Number"/>
+            </li>
+
+            <li class="flexrow"><label class="generic-label">Availability</label>
+              <select class="competence-base flexrow" type="text" name="system.availability" value="{{system.availability}}" data-dtype="String">
+                {{#select system.availability}}
+                  {{#each config.availability as |name key|}}
+                  <option value="{{key}}">{{name}}</option>
+                  {{/each}}
                 {{/select}}
               </select> 
             </li>
 
-            <li class="flexrow"><label class="generic-label">Absorption roll</label>
-              <select class="competence-base flexrow" type="text" name="system.absorprionroll" value="{{data.absorprionroll}}" data-dtype="String">
-                {{#select data.absorprionroll}}
-                <option value="none">None</option>
-                <option value="white">White</option>
-                <option value="green">Green</option>
-                <option value="blue">Blue</option>
-                <option value="purple">Purple</option>
-                <option value="red">Red</option>
-                <option value="black">Black</option>
-                <option value="blackgreen">Black+Green</option>
-                {{/select}}
-              </select> 
-            </li>
-
-            <li class="flexrow"><label class="generic-label">Damaged roll</label>
-              <select class="competence-base flexrow" type="text" name="system.damagedroll" value="{{data.damagedroll}}" data-dtype="String">
-                {{#select data.damagedroll}}
-                <option value="none">None</option>
-                <option value="white">White</option>
-                <option value="green">Green</option>
-                <option value="blue">Blue</option>
-                <option value="purple">Purple</option>
-                <option value="red">Red</option>
-                <option value="black">Black</option>
-                <option value="blackgreen">Black+Green</option>
-                {{/select}}
-              </select> 
-            </li>
-
-            <li class="flexrow"><label class="generic-label">Is proficient ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="system.isproficient" {{checked data.isproficient}}/></label>
-            </li>
-
-            <li class="flexrow"><label class="generic-label">Minimum strength</label>
-              <input type="text" class="input-numeric-short padd-right" name="system.minstr" value="{{data.minstr}}" data-dtype="Number"/>
-            </li>
-
-            <li class="flexrow"><label class="generic-label">Skill penalty</label>
-              <input type="text" class="input-numeric-short padd-right" name="system.skillpenalty" value="{{data.skillpenalty}}" data-dtype="Number"/>
-            </li>
-
             <li class="flexrow"><label class="generic-label">Equipped ?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="system.equipped" {{checked data.equipped}}/></label>
             </li>
diff --git a/templates/items/item-condition-sheet.hbs b/templates/items/item-condition-sheet.hbs
deleted file mode 100644
index a84066a..0000000
--- a/templates/items/item-condition-sheet.hbs
+++ /dev/null
@@ -1,64 +0,0 @@
-<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">
-
-    <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 description target="system.description" 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">Provides 1 Advantage ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="system.advantage" {{checked data.advantage}}/></label>
-        </li>
-        <li class="flexrow"><label class="generic-label">Provides 1 Disadvantage ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="system.disadvantage" {{checked data.disadvantage}}/></label>
-        </li>
-        <li class="flexrow"><label class="generic-label">Provides Roll Advantage ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="system.rolladvantage" {{checked data.rolladvantage}}/></label>
-        </li>
-        <li class="flexrow"><label class="generic-label">Provides Roll Disadvantage ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="system.rolldisadvantage" {{checked data.rolldisadvantage}}/></label>
-        </li>
-        <li class="flexrow"><label class="generic-label">Loose HP per round ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="system.loosehpround" {{checked data.loosehpround}}/></label>
-        </li>
-        {{#if data.loosehpround}}
-          <li class="flexrow"><label class="generic-label">Number of HP : </label>
-            <input type="text" class="input-numeric-short padd-right" name="system.loohproundvalue" value="{{data.loohproundvalue}}" data-dtype="Number"/>
-          </li>
-        {{/if}}
-        <li class="flexrow"><label class="generic-label">No advantage possible ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="system.noadvantage" {{checked data.noadvantage}}/></label>
-        </li>
-        <li class="flexrow"><label class="generic-label">Disadvantage on attack ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="system.attackdisadvantage" {{checked data.attackdisadvantage}}/></label>
-        </li>
-        <li class="flexrow"><label class="generic-label">Disadvantage on defense ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="system.defensedisadvantage" {{checked data.defensedisadvantage}}/></label>
-        </li>
-        <li class="flexrow"><label class="generic-label">Provides advantage to attacker ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="system.targetadvantage" {{checked data.targetadvantage}}/></label>
-        </li>
-        <li class="flexrow"><label class="generic-label">No action possible ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="system.noaction" {{checked data.noaction}}/></label>
-        </li>
-
-      </ul>
-
-    </div>
-
-  </section>
-</form>
\ No newline at end of file
diff --git a/templates/items/item-equipment-sheet.hbs b/templates/items/item-equipment-sheet.hbs
index 68b2708..83ff166 100644
--- a/templates/items/item-equipment-sheet.hbs
+++ b/templates/items/item-equipment-sheet.hbs
@@ -16,13 +16,16 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
           <li class="flexrow"><label class="generic-label">Equipped ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="system.equipped" {{checked data.equipped}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.equipped" {{checked system.equipped}}/></label>
           </li>
           <li class="flexrow"><label class="generic-label">Quantity</label>
-            <input type="text" class="input-numeric-short padd-right" name="system.quantity" value="{{data.quantity}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.quantity" value="{{system.quantity}}" data-dtype="Number"/>
+          </li>
+          <li class="flexrow"><label class="generic-label">Bulk</label>
+            <input type="text" class="input-numeric-short padd-right" name="system.bulk" value="{{system.bulk}}" data-dtype="Number"/>
           </li>
           <li class="flexrow"><label class="generic-label">Cost</label>
-            <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{system.cost}}" data-dtype="Number"/>
           </li>
       </ul>
     </div>
diff --git a/templates/items/item-feat-sheet.hbs b/templates/items/item-feat-sheet.hbs
deleted file mode 100644
index 0751e74..0000000
--- a/templates/items/item-feat-sheet.hbs
+++ /dev/null
@@ -1,35 +0,0 @@
-<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="system.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="system.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="{{system.sl}}" data-dtype="Number"/>
-            </li>
-            {{/if}}
-
-          </ul>
-        </div>
-    </section>
-</form>
diff --git a/templates/items/item-poison-sheet.hbs b/templates/items/item-poison-sheet.hbs
deleted file mode 100644
index 9f587ae..0000000
--- a/templates/items/item-poison-sheet.hbs
+++ /dev/null
@@ -1,28 +0,0 @@
-<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">
-
-    <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 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/items/item-race-sheet.hbs b/templates/items/item-race-sheet.hbs
deleted file mode 100644
index 9f587ae..0000000
--- a/templates/items/item-race-sheet.hbs
+++ /dev/null
@@ -1,28 +0,0 @@
-<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">
-
-    <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 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/items/item-shield-sheet.hbs b/templates/items/item-shield-sheet.hbs
deleted file mode 100644
index 985f820..0000000
--- a/templates/items/item-shield-sheet.hbs
+++ /dev/null
@@ -1,55 +0,0 @@
-<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">
-
-        <div class="tab" data-group="primary">
-          <ul>
-            <li class="flexrow"><label class="generic-label">Shield die</label>
-              <select class="competence-base flexrow" type="text" name="system.shielddie" value="{{data.shielddie}}" data-dtype="String">
-                {{#select data.shielddie}}
-                <option value="d6">d6</option>
-                <option value="d8">d8</option>
-                <option value="d10">d10</option>
-                {{/select}}
-              </select> 
-            </li>
-
-            <li class="flexrow"><label class="generic-label">Associated skill</label>
-              <select class="competence-base flexrow" type="text" name="system.skill" value="{{data.skill}}" data-dtype="String">
-                {{#select data.skill}}
-                  {{#each shieldSkills as |skill idx|}}
-                  <option value="{{skill.name}}">{{skill.name}}</option>
-                  {{/each}}
-                {{/select}}
-              </select> 
-            </li>
-  
-  
-            <li class="flexrow"><label class="generic-label">Equipped ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="system.equipped" {{checked data.equipped}}/></label>
-            </li>
-
-            <li class="flexrow"><label class="generic-label">Cost</label>
-              <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
-            </li>
-
-          </ul>
-      </div>
-    </div>
-
-    </section>
-</form>
diff --git a/templates/items/item-skill-sheet.hbs b/templates/items/item-skill-sheet.hbs
index 5f7c68e..10b7751 100644
--- a/templates/items/item-skill-sheet.hbs
+++ b/templates/items/item-skill-sheet.hbs
@@ -15,88 +15,22 @@
 
       <div class="tab details" data-group="primary" data-tab="details">
         <ul>
-            <li class="flexrow"><label class="generic-label">Ability</label>
-              <select class="competence-base flexrow" type="text" name="system.ability" value="{{data.ability}}" data-dtype="String">
-                {{#select data.ability}}
-                {{> systems/fvtt-crucible-rpg/templates/partial-options-abilities.html}}
+            <li class="flexrow"><label class="generic-label">Base</label>
+              <select class="competence-base flexrow" type="text" name="system.base" value="{{system.base}}" data-dtype="String">
+                {{#select system.base}}
+                  {{#each config.basebonus as |name key|}}
+                  <option value="{{key}}">{{name}}</option>
+                  {{/each}}
                 {{/select}}
               </select> 
             </li>
 
-            <li class="flexrow"><label class="generic-label">Is Feat Die ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="system.isfeatdie" {{checked data.isfeatdie}}/></label>
-            </li>
-            <li class="flexrow"><label class="generic-label">Is SL +2 ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="system.issl2" {{checked data.issl2}}/></label>
+            <li class="flexrow"><label class="generic-label">Bonus</label>
+              <input type="text" class="" name="system.bonus" value="{{system.bonus}}" data-dtype="Number"/>
             </li>
 
-            <li class="flexrow"><label class="generic-label">Subject to Armor Penalty ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="system.armorpenalty" {{checked data.armorpenalty}}/></label>
-            </li>
-
-            <li class="flexrow"><label class="generic-label">Skill Type</label>
-              <select class="competence-base flexrow" type="text" name="system.skilltype" value="{{data.skilltype}}" data-dtype="string">
-                {{#select data.skilltype}}
-                <option value="simple">Simple</option>
-                <option value="complex">Complex</option>
-                {{/select}}
-              </select> 
-            </li>
-
-            <li class="flexrow"><label class="generic-label">Skill Dice</label>
-              <input type="text" class="" name="system.skilldice" value="{{data.skilldice}} (level {{data.level}})" data-dtype="String" disabled/>
-            </li>
-
-            <li class="flexrow"><label class="generic-label">Is Innate ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="system.isinnate" {{checked data.isinnate}}/></label>
-            </li>
-            
-            <li class="flexrow"><label class="generic-label">Is Lore ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="system.islore" {{checked data.islore}}/></label>
-            </li>
-
-            <li class="flexrow"><label class="generic-label">Is Weapon Skill ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="system.isweaponskill" {{checked data.isweaponskill}}/></label>
-            </li>
-
-            <!-- <li class="flexrow"><label class="generic-label">Is Shield Skill ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.isshieldskill" {{checked data.isshieldskill}}/></label>
-            </li> -->
-
-            <li class="flexrow"><label class="generic-label">Bonus dice</label>
-              <select class="competence-base flexrow" type="text" name="system.bonusdice" value="{{data.bonusdice}}" data-dtype="String">
-                {{#select data.bonusdice}}
-                <option value="none">None</option>
-                <option value="1d6">1d6</option>
-                <option value="2d6">2d6</option>
-                <option value="3d6">3d6</option>
-                <option value="4d6">4d6</option>
-                <option value="5d6">5d6</option>
-                <option value="6d6">6d6</option>
-                <option value="7d6">7d6</option>
-                <option value="8d6">8d6</option>
-                {{/select}}
-              </select> 
-            </li>
-
-            <li class="flexrow"><label class="generic-label">Background</label>
-              <input type="text" class="" name="system.background" value="{{data.background}}" data-dtype="Number"/>
-            </li>
-
-            <li class="flexrow"><label class="generic-label">Basic</label>
-              <input type="text" class="" name="system.basic" value="{{data.basic}}" data-dtype="Number"/>
-            </li>
-
-            <li class="flexrow"><label class="generic-label">Class</label>
-              <input type="text" class="" name="system.class" value="{{data.class}}" data-dtype="Number"/>
-            </li>
-
-            <li class="flexrow"><label class="generic-label">Exp level</label>
-              <input type="text" class="" name="system.explevel" value="{{data.explevel}}" data-dtype="Number"/>
-            </li>
-
-            <li class="flexrow"><label class="generic-label">Gained exp (+1 to Exp level at 25)</label>
-              <input type="text" class="" name="system.exp" value="{{data.exp}}" data-dtype="Number"/>
+            <li class="flexrow"><label class="generic-label">Used ?</label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.used" {{checked system.used}}/></label>
             </li>
 
           </ul>
diff --git a/templates/items/item-spell-sheet.hbs b/templates/items/item-spell-sheet.hbs
deleted file mode 100644
index 61f5949..0000000
--- a/templates/items/item-spell-sheet.hbs
+++ /dev/null
@@ -1,49 +0,0 @@
-<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="system.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="system.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="system.range" value="{{data.range}}" data-dtype="String"/>
-            </li>
-
-          </ul>
-        </div>
-    </section>
-</form>
diff --git a/templates/items/item-weapon-sheet.hbs b/templates/items/item-weapon-sheet.hbs
index dcb6071..42f78e7 100644
--- a/templates/items/item-weapon-sheet.hbs
+++ b/templates/items/item-weapon-sheet.hbs
@@ -18,54 +18,77 @@
 
       <div class="tab" data-group="primary">
         <ul>
-          <!-- <li class="flexrow"><label class="generic-label">Ability</label>
-            <select class="competence-base flexrow" type="text" name="data.ability" value="{{data.ability}}" data-dtype="String">
-              {{#select data.ability}}
-              {{> systems/fvtt-crucible-rpg/templates/partial-options-abilities.html}}
+
+          <li class="flexrow"><label class="generic-label">Weapon Type</label>
+            <select class="competence-base flexrow" type="text" name="system.weapontype" value="{{system.weapontype}}" data-dtype="String">
+              {{#select system.weapontype}}
+                {{#each config.weapontypes as |type key|}}
+                <option value="{{key.name}}">{{type}}</option>
+                {{/each}}
               {{/select}}
             </select> 
-          </li> -->
-
-          <li class="flexrow"><label class="generic-label">Is proficient ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="system.isproficient" {{checked data.isproficient}}/></label>
           </li>
 
           <li class="flexrow"><label class="generic-label">Associated skill</label>
-            <select class="competence-base flexrow" type="text" name="system.skill" value="{{data.skill}}" data-dtype="String">
-              {{#select data.skill}}
+            <select class="competence-base flexrow" type="text" name="system.skill" value="{{system.skill}}" data-dtype="String">
+              {{#select system.skill}}
                 {{#each weaponSkills as |skill idx|}}
                 <option value="{{skill.name}}">{{skill.name}}</option>
                 {{/each}}
               {{/select}}
             </select> 
           </li>
-
-          <li class="flexrow"><label class="generic-label">Qualities (comma separated list)</label>
-            <input type="text" class="padd-right" name="system.qualities" value="{{data.qualities}}" data-dtype="String"/>
+          <li class="flexrow"><label class="generic-label">Penetration</label>
+            <input type="text" class="right" name="system.penetration" value="{{system.penetration}}" data-dtype="String"/>
           </li>
 
-          <li class="flexrow"><label class="generic-label">Flaws (comma separated list)</label>
-            <input type="text" class="padd-right" name="system.flaws" value="{{data.flaws}}" data-dtype="String"/>
-          </li>
 
           <li class="flexrow"><label class="generic-label">Damage</label>
-            <input type="text" class="right" name="system.damage" value="{{data.damage}}" data-dtype="String"/>
+            <input type="text" class="right" name="system.damage" value="{{system.damage}}" data-dtype="String"/>
           </li>
 
-          <li class="flexrow"><label class="generic-label">Is ranged weapon ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="system.isranged" {{checked data.isranged}}/></label>
+          <li class="flexrow"><label class="generic-label">Bulk</label>
+            <input type="text" class="input-numeric-short padd-right" name="system.bulk" value="{{data.bulk}}" data-dtype="Number"/>
           </li>
-          {{#if data.isranged}}
-            <li class="flexrow"><label class="generic-label">Effective Range</label>
-              <input type="text" class="right" name="system.range" value="{{data.range}}" data-dtype="String"/>
-            </li>
-            <li class="flexrow"><label class="generic-label">Max range</label>
-              <input type="text" class="right" name="system.maxrange" value="{{data.maxrange}}" data-dtype="String"/>
-            </li>
-          {{/if}}
 
-          <li class="flexrow"><label class="generic-label">Minimum strength</label>
-            <input type="text" class="input-numeric-short padd-right" name="system.minstr" value="{{data.minstr}}" data-dtype="Number"/>
+          <li class="flexrow"><label class="generic-label">BR</label>
+            <input type="text" class="input-numeric-short padd-right" name="system.br" value="{{data.br}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="generic-label">RoF</label>
+            <input type="text" class="input-numeric-short padd-right" name="system.rof" value="{{data.rof}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="generic-label">Ammo</label>
+            <input type="text" class="input-numeric-short padd-right" name="system.ammo" value="{{data.ammo}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="generic-label">Effective Range</label>
+            <select class="competence-base flexrow" type="text" name="system.effectiverange" value="{{system.effectiverange}}" data-dtype="Number">
+              {{#select system.effectiverange}}
+                {{#each config.range as |type key|}}
+                <option value="{{key.name}}">{{type}}</option>
+                {{/each}}
+              {{/select}}
+            </select> 
+          </li>
+
+          <li class="flexrow"><label class="generic-label">Maximum Range</label>
+            <select class="competence-base flexrow" type="text" name="system.maxrange" value="{{system.maxrange}}" data-dtype="Number">
+              {{#select system.maxrange}}
+                {{#each config.range as |type key|}}
+                <option value="{{key.name}}">{{type}}</option>
+                {{/each}}
+              {{/select}}
+            </select> 
+          </li>
+
+          <li class="flexrow"><label class="generic-label">SP</label>
+            <input type="text" class="input-numeric-short padd-right" name="system.sp" value="{{data.sp}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="generic-label">Size (-1 for non applicable)</label>
+            <input type="text" class="input-numeric-short padd-right" name="system.size" value="{{data.size}}" data-dtype="Number"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">Equipped ?</label>