diff --git a/images/icons/armors/Chainmail.webp b/images/icons/armors/Chainmail.webp
new file mode 100644
index 0000000..dba7da7
Binary files /dev/null and b/images/icons/armors/Chainmail.webp differ
diff --git a/images/icons/armors/Full Plate.webp b/images/icons/armors/Full Plate.webp
new file mode 100644
index 0000000..96ce1ee
Binary files /dev/null and b/images/icons/armors/Full Plate.webp differ
diff --git a/images/icons/armors/Leather.webp b/images/icons/armors/Leather.webp
new file mode 100644
index 0000000..aa60f0c
Binary files /dev/null and b/images/icons/armors/Leather.webp differ
diff --git a/images/icons/armors/Padded.webp b/images/icons/armors/Padded.webp
new file mode 100644
index 0000000..b4be8ec
Binary files /dev/null and b/images/icons/armors/Padded.webp differ
diff --git a/images/icons/armors/Plate Mail.webp b/images/icons/armors/Plate Mail.webp
new file mode 100644
index 0000000..1ea920c
Binary files /dev/null and b/images/icons/armors/Plate Mail.webp differ
diff --git a/images/icons/armors/Scale.webp b/images/icons/armors/Scale.webp
new file mode 100644
index 0000000..de9ccd0
Binary files /dev/null and b/images/icons/armors/Scale.webp differ
diff --git a/images/icons/armors/Shield 0.webp b/images/icons/armors/Shield 0.webp
new file mode 100644
index 0000000..309b482
Binary files /dev/null and b/images/icons/armors/Shield 0.webp differ
diff --git a/images/icons/armors/Shield 1.webp b/images/icons/armors/Shield 1.webp
new file mode 100644
index 0000000..a4a0d5d
Binary files /dev/null and b/images/icons/armors/Shield 1.webp differ
diff --git a/images/icons/armors/Shield 2.webp b/images/icons/armors/Shield 2.webp
new file mode 100644
index 0000000..2b00830
Binary files /dev/null and b/images/icons/armors/Shield 2.webp differ
diff --git a/images/icons/armors/Studded Leather.webp b/images/icons/armors/Studded Leather.webp
new file mode 100644
index 0000000..e5db2e7
Binary files /dev/null and b/images/icons/armors/Studded Leather.webp differ
diff --git a/images/icons/conditions/BLEED 1.webp b/images/icons/conditions/BLEED 1.webp
new file mode 100644
index 0000000..c624987
Binary files /dev/null and b/images/icons/conditions/BLEED 1.webp differ
diff --git a/images/icons/conditions/BLEED 2.webp b/images/icons/conditions/BLEED 2.webp
new file mode 100644
index 0000000..1613766
Binary files /dev/null and b/images/icons/conditions/BLEED 2.webp differ
diff --git a/images/icons/conditions/BLINDED.webp b/images/icons/conditions/BLINDED.webp
new file mode 100644
index 0000000..a2f1355
Binary files /dev/null and b/images/icons/conditions/BLINDED.webp differ
diff --git a/images/icons/conditions/Frightened.webp b/images/icons/conditions/Frightened.webp
new file mode 100644
index 0000000..6de61b9
Binary files /dev/null and b/images/icons/conditions/Frightened.webp differ
diff --git a/images/icons/conditions/Grappled.webp b/images/icons/conditions/Grappled.webp
new file mode 100644
index 0000000..9d71478
Binary files /dev/null and b/images/icons/conditions/Grappled.webp differ
diff --git a/images/icons/conditions/Immobilized.webp b/images/icons/conditions/Immobilized.webp
new file mode 100644
index 0000000..aece0b3
Binary files /dev/null and b/images/icons/conditions/Immobilized.webp differ
diff --git a/images/icons/conditions/Impaled.webp b/images/icons/conditions/Impaled.webp
new file mode 100644
index 0000000..c776849
Binary files /dev/null and b/images/icons/conditions/Impaled.webp differ
diff --git a/images/icons/conditions/On Fire.webp b/images/icons/conditions/On Fire.webp
new file mode 100644
index 0000000..f018459
Binary files /dev/null and b/images/icons/conditions/On Fire.webp differ
diff --git a/images/icons/conditions/PRONE.webp b/images/icons/conditions/PRONE.webp
new file mode 100644
index 0000000..4a4f7c4
Binary files /dev/null and b/images/icons/conditions/PRONE.webp differ
diff --git a/images/icons/conditions/Poisoned.webp b/images/icons/conditions/Poisoned.webp
new file mode 100644
index 0000000..cf74dad
Binary files /dev/null and b/images/icons/conditions/Poisoned.webp differ
diff --git a/images/icons/conditions/SLOW.webp b/images/icons/conditions/SLOW.webp
new file mode 100644
index 0000000..ecedc3a
Binary files /dev/null and b/images/icons/conditions/SLOW.webp differ
diff --git a/images/icons/conditions/STAGGERED.webp b/images/icons/conditions/STAGGERED.webp
new file mode 100644
index 0000000..1036677
Binary files /dev/null and b/images/icons/conditions/STAGGERED.webp differ
diff --git a/images/icons/conditions/STUNNED.webp b/images/icons/conditions/STUNNED.webp
new file mode 100644
index 0000000..4b49527
Binary files /dev/null and b/images/icons/conditions/STUNNED.webp differ
diff --git a/images/icons/conditions/Sickened.webp b/images/icons/conditions/Sickened.webp
new file mode 100644
index 0000000..f0631fb
Binary files /dev/null and b/images/icons/conditions/Sickened.webp differ
diff --git a/images/icons/lore_air/Air Servant.webp b/images/icons/lore_air/Air Servant.webp
new file mode 100644
index 0000000..411f40f
Binary files /dev/null and b/images/icons/lore_air/Air Servant.webp differ
diff --git a/images/icons/lore_air/Ligntning.webp b/images/icons/lore_air/Ligntning.webp
new file mode 100644
index 0000000..3392cfd
Binary files /dev/null and b/images/icons/lore_air/Ligntning.webp differ
diff --git a/images/icons/lore_air/Push.webp b/images/icons/lore_air/Push.webp
new file mode 100644
index 0000000..7a1a997
Binary files /dev/null and b/images/icons/lore_air/Push.webp differ
diff --git a/images/icons/lore_air/Storm Front.webp b/images/icons/lore_air/Storm Front.webp
new file mode 100644
index 0000000..c26943a
Binary files /dev/null and b/images/icons/lore_air/Storm Front.webp differ
diff --git a/images/icons/lore_air/Vortex.webp b/images/icons/lore_air/Vortex.webp
new file mode 100644
index 0000000..865ade1
Binary files /dev/null and b/images/icons/lore_air/Vortex.webp differ
diff --git a/images/icons/lore_earth/Barrier.webp b/images/icons/lore_earth/Barrier.webp
new file mode 100644
index 0000000..1ad1e2c
Binary files /dev/null and b/images/icons/lore_earth/Barrier.webp differ
diff --git a/images/icons/lore_earth/Earthquake.webp b/images/icons/lore_earth/Earthquake.webp
new file mode 100644
index 0000000..4dedb30
Binary files /dev/null and b/images/icons/lore_earth/Earthquake.webp differ
diff --git a/images/icons/lore_earth/Quicksand.webp b/images/icons/lore_earth/Quicksand.webp
new file mode 100644
index 0000000..04d55c4
Binary files /dev/null and b/images/icons/lore_earth/Quicksand.webp differ
diff --git a/images/icons/lore_earth/Stone Golem.webp b/images/icons/lore_earth/Stone Golem.webp
new file mode 100644
index 0000000..2c2cb86
Binary files /dev/null and b/images/icons/lore_earth/Stone Golem.webp differ
diff --git a/images/icons/lore_earth/Stone Skin.webp b/images/icons/lore_earth/Stone Skin.webp
new file mode 100644
index 0000000..2a5e5a6
Binary files /dev/null and b/images/icons/lore_earth/Stone Skin.webp differ
diff --git a/images/icons/lore_fire/Fire Ball.webp b/images/icons/lore_fire/Fire Ball.webp
new file mode 100644
index 0000000..eeb1b10
Binary files /dev/null and b/images/icons/lore_fire/Fire Ball.webp differ
diff --git a/images/icons/lore_fire/Fire Bolt.webp b/images/icons/lore_fire/Fire Bolt.webp
new file mode 100644
index 0000000..344f1cd
Binary files /dev/null and b/images/icons/lore_fire/Fire Bolt.webp differ
diff --git a/images/icons/lore_fire/Fire Storm.webp b/images/icons/lore_fire/Fire Storm.webp
new file mode 100644
index 0000000..1f31256
Binary files /dev/null and b/images/icons/lore_fire/Fire Storm.webp differ
diff --git a/images/icons/lore_fire/Flame Serpent.webp b/images/icons/lore_fire/Flame Serpent.webp
new file mode 100644
index 0000000..205740f
Binary files /dev/null and b/images/icons/lore_fire/Flame Serpent.webp differ
diff --git a/images/icons/lore_fire/Flaming Weapon.webp b/images/icons/lore_fire/Flaming Weapon.webp
new file mode 100644
index 0000000..0508865
Binary files /dev/null and b/images/icons/lore_fire/Flaming Weapon.webp differ
diff --git a/images/icons/lore_shadow/Confusion.webp b/images/icons/lore_shadow/Confusion.webp
new file mode 100644
index 0000000..470d9c6
Binary files /dev/null and b/images/icons/lore_shadow/Confusion.webp differ
diff --git a/images/icons/lore_shadow/Grim Reaper.webp b/images/icons/lore_shadow/Grim Reaper.webp
new file mode 100644
index 0000000..60c61ca
Binary files /dev/null and b/images/icons/lore_shadow/Grim Reaper.webp differ
diff --git a/images/icons/lore_shadow/Shadow Meld.webp b/images/icons/lore_shadow/Shadow Meld.webp
new file mode 100644
index 0000000..a7f18e8
Binary files /dev/null and b/images/icons/lore_shadow/Shadow Meld.webp differ
diff --git a/images/icons/lore_shadow/Terror.webp b/images/icons/lore_shadow/Terror.webp
new file mode 100644
index 0000000..72fe148
Binary files /dev/null and b/images/icons/lore_shadow/Terror.webp differ
diff --git a/images/icons/lore_shadow/Whisper.webp b/images/icons/lore_shadow/Whisper.webp
new file mode 100644
index 0000000..9efdb53
Binary files /dev/null and b/images/icons/lore_shadow/Whisper.webp differ
diff --git a/images/icons/lore_water/Abolish.webp b/images/icons/lore_water/Abolish.webp
new file mode 100644
index 0000000..4059bd1
Binary files /dev/null and b/images/icons/lore_water/Abolish.webp differ
diff --git a/images/icons/lore_water/Fog.webp b/images/icons/lore_water/Fog.webp
new file mode 100644
index 0000000..575b29e
Binary files /dev/null and b/images/icons/lore_water/Fog.webp differ
diff --git a/images/icons/lore_water/Jet.webp b/images/icons/lore_water/Jet.webp
new file mode 100644
index 0000000..4b86aa7
Binary files /dev/null and b/images/icons/lore_water/Jet.webp differ
diff --git a/images/icons/lore_water/Restore.webp b/images/icons/lore_water/Restore.webp
new file mode 100644
index 0000000..7f95b24
Binary files /dev/null and b/images/icons/lore_water/Restore.webp differ
diff --git a/images/icons/lore_water/Water Elemental.webp b/images/icons/lore_water/Water Elemental.webp
new file mode 100644
index 0000000..6efd6e5
Binary files /dev/null and b/images/icons/lore_water/Water Elemental.webp differ
diff --git a/images/icons/skills/Acrobatics.webp b/images/icons/skills/Acrobatics.webp
new file mode 100644
index 0000000..bf11fab
Binary files /dev/null and b/images/icons/skills/Acrobatics.webp differ
diff --git a/images/icons/skills/Air Lore.webp b/images/icons/skills/Air Lore.webp
new file mode 100644
index 0000000..aa69ec7
Binary files /dev/null and b/images/icons/skills/Air Lore.webp differ
diff --git a/images/icons/skills/Athletics.webp b/images/icons/skills/Athletics.webp
new file mode 100644
index 0000000..42c9e85
Binary files /dev/null and b/images/icons/skills/Athletics.webp differ
diff --git a/images/icons/skills/Brawn.webp b/images/icons/skills/Brawn.webp
new file mode 100644
index 0000000..59734e9
Binary files /dev/null and b/images/icons/skills/Brawn.webp differ
diff --git a/images/icons/skills/Charm.webp b/images/icons/skills/Charm.webp
new file mode 100644
index 0000000..91d9de6
Binary files /dev/null and b/images/icons/skills/Charm.webp differ
diff --git a/images/icons/skills/Earth Lore.webp b/images/icons/skills/Earth Lore.webp
new file mode 100644
index 0000000..4ca9103
Binary files /dev/null and b/images/icons/skills/Earth Lore.webp differ
diff --git a/images/icons/skills/Fire Lore.webp b/images/icons/skills/Fire Lore.webp
new file mode 100644
index 0000000..3231f5a
Binary files /dev/null and b/images/icons/skills/Fire Lore.webp differ
diff --git a/images/icons/skills/First Aid.webp b/images/icons/skills/First Aid.webp
new file mode 100644
index 0000000..47ea3f0
Binary files /dev/null and b/images/icons/skills/First Aid.webp differ
diff --git a/images/icons/skills/Haggle.webp b/images/icons/skills/Haggle.webp
new file mode 100644
index 0000000..49e3d4e
Binary files /dev/null and b/images/icons/skills/Haggle.webp differ
diff --git a/images/icons/skills/Intimidate.webp b/images/icons/skills/Intimidate.webp
new file mode 100644
index 0000000..0ae57d9
Binary files /dev/null and b/images/icons/skills/Intimidate.webp differ
diff --git a/images/icons/skills/Intuition.webp b/images/icons/skills/Intuition.webp
new file mode 100644
index 0000000..be98f77
Binary files /dev/null and b/images/icons/skills/Intuition.webp differ
diff --git a/images/icons/skills/Locks and Pockets.webp b/images/icons/skills/Locks and Pockets.webp
new file mode 100644
index 0000000..aadb094
Binary files /dev/null and b/images/icons/skills/Locks and Pockets.webp differ
diff --git a/images/icons/skills/Perception.webp b/images/icons/skills/Perception.webp
new file mode 100644
index 0000000..270442d
Binary files /dev/null and b/images/icons/skills/Perception.webp differ
diff --git a/images/icons/skills/Persuade.webp b/images/icons/skills/Persuade.webp
new file mode 100644
index 0000000..433774b
Binary files /dev/null and b/images/icons/skills/Persuade.webp differ
diff --git a/images/icons/skills/Poison Use.webp b/images/icons/skills/Poison Use.webp
new file mode 100644
index 0000000..650a80d
Binary files /dev/null and b/images/icons/skills/Poison Use.webp differ
diff --git a/images/icons/skills/Research.webp b/images/icons/skills/Research.webp
new file mode 100644
index 0000000..b7b661a
Binary files /dev/null and b/images/icons/skills/Research.webp differ
diff --git a/images/icons/skills/Ride Mount.webp b/images/icons/skills/Ride Mount.webp
new file mode 100644
index 0000000..d9aed43
Binary files /dev/null and b/images/icons/skills/Ride Mount.webp differ
diff --git a/images/icons/skills/Shadow Lore.webp b/images/icons/skills/Shadow Lore.webp
new file mode 100644
index 0000000..adefd92
Binary files /dev/null and b/images/icons/skills/Shadow Lore.webp differ
diff --git a/images/icons/skills/Stealth.webp b/images/icons/skills/Stealth.webp
new file mode 100644
index 0000000..39df7eb
Binary files /dev/null and b/images/icons/skills/Stealth.webp differ
diff --git a/images/icons/skills/Survival.webp b/images/icons/skills/Survival.webp
new file mode 100644
index 0000000..686555f
Binary files /dev/null and b/images/icons/skills/Survival.webp differ
diff --git a/images/icons/skills/Swim.webp b/images/icons/skills/Swim.webp
new file mode 100644
index 0000000..2c953d3
Binary files /dev/null and b/images/icons/skills/Swim.webp differ
diff --git a/images/icons/skills/Water Lore.webp b/images/icons/skills/Water Lore.webp
new file mode 100644
index 0000000..745aa07
Binary files /dev/null and b/images/icons/skills/Water Lore.webp differ
diff --git a/images/icons/weapons/2-H Axe.webp b/images/icons/weapons/2-H Axe.webp
new file mode 100644
index 0000000..737164e
Binary files /dev/null and b/images/icons/weapons/2-H Axe.webp differ
diff --git a/images/icons/weapons/2-H Club.webp b/images/icons/weapons/2-H Club.webp
new file mode 100644
index 0000000..a296483
Binary files /dev/null and b/images/icons/weapons/2-H Club.webp differ
diff --git a/images/icons/weapons/2-H Flail.webp b/images/icons/weapons/2-H Flail.webp
new file mode 100644
index 0000000..a03b1ec
Binary files /dev/null and b/images/icons/weapons/2-H Flail.webp differ
diff --git a/images/icons/weapons/2-H Hammer.webp b/images/icons/weapons/2-H Hammer.webp
new file mode 100644
index 0000000..e7a410a
Binary files /dev/null and b/images/icons/weapons/2-H Hammer.webp differ
diff --git a/images/icons/weapons/2-H Mace.webp b/images/icons/weapons/2-H Mace.webp
new file mode 100644
index 0000000..376e652
Binary files /dev/null and b/images/icons/weapons/2-H Mace.webp differ
diff --git a/images/icons/weapons/2-H Pick.webp b/images/icons/weapons/2-H Pick.webp
new file mode 100644
index 0000000..e8a0a62
Binary files /dev/null and b/images/icons/weapons/2-H Pick.webp differ
diff --git a/images/icons/weapons/2-H Sword.webp b/images/icons/weapons/2-H Sword.webp
new file mode 100644
index 0000000..7b53079
Binary files /dev/null and b/images/icons/weapons/2-H Sword.webp differ
diff --git a/images/icons/weapons/Bow.webp b/images/icons/weapons/Bow.webp
new file mode 100644
index 0000000..953c18e
Binary files /dev/null and b/images/icons/weapons/Bow.webp differ
diff --git a/images/icons/weapons/Club.webp b/images/icons/weapons/Club.webp
new file mode 100644
index 0000000..c5cea83
Binary files /dev/null and b/images/icons/weapons/Club.webp differ
diff --git a/images/icons/weapons/Crossbow.webp b/images/icons/weapons/Crossbow.webp
new file mode 100644
index 0000000..84ae796
Binary files /dev/null and b/images/icons/weapons/Crossbow.webp differ
diff --git a/images/icons/weapons/Dagger.webp b/images/icons/weapons/Dagger.webp
new file mode 100644
index 0000000..8786695
Binary files /dev/null and b/images/icons/weapons/Dagger.webp differ
diff --git a/images/icons/weapons/Flail.webp b/images/icons/weapons/Flail.webp
new file mode 100644
index 0000000..93e8651
Binary files /dev/null and b/images/icons/weapons/Flail.webp differ
diff --git a/images/icons/weapons/Hammer.webp b/images/icons/weapons/Hammer.webp
new file mode 100644
index 0000000..1981ed7
Binary files /dev/null and b/images/icons/weapons/Hammer.webp differ
diff --git a/images/icons/weapons/Hand Axe.webp b/images/icons/weapons/Hand Axe.webp
new file mode 100644
index 0000000..21c41b2
Binary files /dev/null and b/images/icons/weapons/Hand Axe.webp differ
diff --git a/images/icons/weapons/Improvised.webp b/images/icons/weapons/Improvised.webp
new file mode 100644
index 0000000..29290a1
Binary files /dev/null and b/images/icons/weapons/Improvised.webp differ
diff --git a/images/icons/weapons/Javelin.webp b/images/icons/weapons/Javelin.webp
new file mode 100644
index 0000000..82f35f2
Binary files /dev/null and b/images/icons/weapons/Javelin.webp differ
diff --git a/images/icons/weapons/Mace.webp b/images/icons/weapons/Mace.webp
new file mode 100644
index 0000000..317b8a4
Binary files /dev/null and b/images/icons/weapons/Mace.webp differ
diff --git a/images/icons/weapons/Pick.webp b/images/icons/weapons/Pick.webp
new file mode 100644
index 0000000..14d486f
Binary files /dev/null and b/images/icons/weapons/Pick.webp differ
diff --git a/images/icons/weapons/Sling.webp b/images/icons/weapons/Sling.webp
new file mode 100644
index 0000000..e6e8899
Binary files /dev/null and b/images/icons/weapons/Sling.webp differ
diff --git a/images/icons/weapons/Spear.webp b/images/icons/weapons/Spear.webp
new file mode 100644
index 0000000..f650dab
Binary files /dev/null and b/images/icons/weapons/Spear.webp differ
diff --git a/images/icons/weapons/Staff.webp b/images/icons/weapons/Staff.webp
new file mode 100644
index 0000000..5fb3887
Binary files /dev/null and b/images/icons/weapons/Staff.webp differ
diff --git a/images/icons/weapons/Sword.webp b/images/icons/weapons/Sword.webp
new file mode 100644
index 0000000..e33e4a8
Binary files /dev/null and b/images/icons/weapons/Sword.webp differ
diff --git a/images/icons/weapons/Unarmed.webp b/images/icons/weapons/Unarmed.webp
new file mode 100644
index 0000000..65dd55d
Binary files /dev/null and b/images/icons/weapons/Unarmed.webp differ
diff --git a/modules/crucible-utility.js b/modules/crucible-utility.js
index e839ff8..3822efa 100644
--- a/modules/crucible-utility.js
+++ b/modules/crucible-utility.js
@@ -22,7 +22,6 @@ export class CrucibleUtility {
     this.diceList = [];
     this.diceFoundryList = [];
     this.optionsDiceList = "";
-    this.buildDiceLists();
     CrucibleCommands.init();
 
     Handlebars.registerHelper('count', function (list) {
@@ -87,14 +86,7 @@ export class CrucibleUtility {
 
     const templatePaths = [
       'systems/fvtt-crucible-rpg/templates/editor-notes-gm.html',
-      'systems/fvtt-crucible-rpg/templates/partial-roll-select-effects.html',
-      'systems/fvtt-crucible-rpg/templates/partial-options-statistics.html',
-      'systems/fvtt-crucible-rpg/templates/partial-options-level.html',
-      'systems/fvtt-crucible-rpg/templates/partial-options-range.html',
-      'systems/fvtt-crucible-rpg/templates/partial-options-equipment-types.html',
-      'systems/fvtt-crucible-rpg/templates/partial-equipment-effects.html',
-      'systems/fvtt-crucible-rpg/templates/partial-actor-stat-block.html',
-      'systems/fvtt-crucible-rpg/templates/partial-actor-status.html',
+      'systems/fvtt-crucible-rpg/templates/partial-options-abilities.html',
       'systems/fvtt-crucible-rpg/templates/partial-item-nav.html',
       'systems/fvtt-crucible-rpg/templates/partial-item-description.html',
       'systems/fvtt-crucible-rpg/templates/partial-actor-equipment.html'
diff --git a/system.json b/system.json
index fc8e83e..09566fe 100644
--- a/system.json
+++ b/system.json
@@ -90,9 +90,9 @@
   "styles": [
     "styles/simple.css"
   ],
-  "templateVersion": 1,
+  "templateVersion": 2,
   "title": "Crucible RPG",
   "url": "https://www.uberwald.me/data/files/fvtt-crucible-rpg",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "background" : "./images/ui/crucible_welcome_page.webp"
 }
diff --git a/template.json b/template.json
index b715987..e242006 100644
--- a/template.json
+++ b/template.json
@@ -83,23 +83,31 @@
    }
   },
   "Item": {
-    "types": [ "race", "skill", "armor", "shield", "equipment", "weapon", "money" ],
+    "types": [ "race", "skill", "armor", "shield", "equipment", "weapon", "money" , "feat"],
     "race": {
       "description": ""
     },
+    "feat": {
+      "isfeatdie": false,
+      "issl": false,
+      "sl": 0,
+      "description": ""
+    },
     "skill": {
       "ability": "",
+      "armorpenalty": false,
       "level": 0,
       "background": 0,
       "basic": 0,
       "class": 0,
       "exp": 0,
-      "armor": "",
       "description": ""
     },
     "armor": {
-      "type": "",
+      "armortype": "",
       "absorprionroll": "",
+      "damagedroll": "",
+      "isproficient": false,
       "minstr": 0,
       "skillpenalty": 0,
       "equipped": false,
@@ -125,13 +133,13 @@
     },
     "weapon": {
       "ability": "",
-      "qualities": [],
-      "flaws": [],
+      "isproficient": false,
+      "qualities": "",
+      "flaws": "",
       "damage": "",
-      "cost": 0,
-      "weight": 0,
       "range": "",
       "maxrange": "",
+      "cost": 0,
       "equipped": false,
       "description": ""
     }
diff --git a/templates/item-armor-sheet.html b/templates/item-armor-sheet.html
index 33b6de1..0522610 100644
--- a/templates/item-armor-sheet.html
+++ b/templates/item-armor-sheet.html
@@ -6,56 +6,85 @@
         </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">
 
         <div class="tab" data-group="primary">
           <ul>
-            <li class="flexrow"><label class="generic-label">Related Statistic</label>
-              <select class="competence-base flexrow" type="text" name="data.statistic" value="{{data.statistic}}" data-dtype="String">
-                {{#select data.statistic}}
-                {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html}}
+            <li class="flexrow"><label class="generic-label">Type</label>
+              <select class="competence-base flexrow" type="text" name="data.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>
                 {{/select}}
               </select> 
             </li>
 
-            <li class="flexrow"><label class="generic-label">DMG RES Dice</label>
-              <select class="competence-base flexrow" type="text" name="data.resistance" value="{{data.resistance}}" data-dtype="Number">
-                {{#select data.resistance}}
-                {{{optionsDiceList}}}
+            <li class="flexrow"><label class="generic-label">Absorption roll</label>
+              <select class="competence-base flexrow" type="text" name="data.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">Location Protected</label>
-              <input type="text" class="" name="data.locationprotected" value="{{data.locationprotected}}" data-dtype="String"/>
+
+            <li class="flexrow"><label class="generic-label">Damaged roll</label>
+              <select class="competence-base flexrow" type="text" name="data.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>
 
-            {{> systems/fvtt-pegasus-rpg/templates/partial-equipment-effects.html}}
+            <li class="flexrow"><label class="generic-label">Is proficient ?</label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="data.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="data.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="data.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="data.equipped" {{checked data.equipped}}/></label>
             </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">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>
+
+          </ul>
       </div>
     </div>
 
diff --git a/templates/item-skill-sheet.html b/templates/item-skill-sheet.html
new file mode 100644
index 0000000..759438a
--- /dev/null
+++ b/templates/item-skill-sheet.html
@@ -0,0 +1,65 @@
+<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">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}}
+                {{/select}}
+              </select> 
+            </li>
+
+            <li class="flexrow"><label class="generic-label">Subject to Armor Penalty ?</label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="data.armorpenalty" {{checked data.armorpenalty}}/></label>
+            </li>
+
+            <li class="flexrow"><label class="generic-label">Level</label>
+              <select class="competence-base flexrow" type="text" name="data.level" value="{{data.level}}" data-dtype="Number">
+                {{#select data.level}}
+                <option value="0">0</option>
+                <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>
+                <option value="6">6</option>
+                <option value="7">7</option>
+                <option value="8">8</option>
+                {{/select}}
+              </select> 
+            </li>
+
+            <li class="flexrow"><label class="generic-label">Background</label>
+              <input type="text" class="" name="data.background" value="{{data.background}}" data-dtype="Number"/>
+            </li>
+
+            <li class="flexrow"><label class="generic-label">Basic</label>
+              <input type="text" class="" name="data.basic" value="{{data.basic}}" data-dtype="Number"/>
+            </li>
+
+            <li class="flexrow"><label class="generic-label">Class</label>
+              <input type="text" class="" name="data.class" value="{{data.class}}" data-dtype="Number"/>
+            </li>
+
+            <li class="flexrow"><label class="generic-label">Exp</label>
+              <input type="text" class="" name="data.exp" value="{{data.exp}}" data-dtype="Number"/>
+            </li>
+
+          </ul>
+        </div>
+    </section>
+</form>
diff --git a/templates/item-weapon-sheet.html b/templates/item-weapon-sheet.html
index 88a6dcb..31f211c 100644
--- a/templates/item-weapon-sheet.html
+++ b/templates/item-weapon-sheet.html
@@ -5,141 +5,60 @@
           <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">Related Attack Statistic</label>
-            <select class="competence-base flexrow" type="text" name="data.statistic" value="{{data.statistic}}" data-dtype="String">
-              {{#select data.statistic}}
-              {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=false special=true}}
+
+      <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}}
               {{/select}}
             </select> 
           </li>
 
-          <li class="flexrow"><label class="generic-label">Related DMG Statistic</label>
-            <select class="competence-base flexrow" type="text" name="data.damagestatistic" value="{{data.damagestatistic}}" data-dtype="String">
-              {{#select data.damagestatistic}}
-              {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=false special=true}}
-              {{/select}}
-            </select> 
+          <li class="flexrow"><label class="generic-label">Is proficient ?</label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="data.isproficient" {{checked data.isproficient}}/></label>
           </li>
 
-          <li class="flexrow"><label class="generic-label">Damage Dice</label>
-            <select class="competence-base flexrow" type="text" name="data.damage" value="{{data.damage}}" data-dtype="String">
-              {{#select data.damage}}
-              {{{optionsDiceList}}}
-              {{/select}}
-            </select> 
-          </li>
-          <li class="flexrow"><label class="generic-label">Optimal Range</label>
-            <select class="competence-base flexrow" type="text" name="data.range" value="{{data.range}}" data-dtype="String">
-              {{#select data.range}}
-              {{> systems/fvtt-pegasus-rpg/templates/partial-options-range.html notapplicable=true}}
-              {{/select}}
-            </select>           
-          </li>          
-          <li class="flexrow"><label class="generic-label">Max Range</label>
-            <input type="text" class="" name="data.maxrange" value="{{data.maxrange}}" data-dtype="String"/>
+          <li class="flexrow"><label class="generic-label">Qualities (comma separated list)</label>
+            <input type="text" class="padd-right" name="data.qualities" value="{{data.qualities}}" data-dtype="String"/>
           </li>
 
-          <li class="flexrow"><label class="generic-label">AoE</label>
-            <select class="competence-base flexrow" type="text" name="data.aoe" value="{{data.aoe}}" data-dtype="String">
-              {{#select data.aoe}}
-              <option value="none">None</option>
-              <option value="tz">TZ</option>
-              <option value="close">Close</option>
-              <option value="medium">Medium</option>
-              <option value="long">Long</option>
-              <option value="extreme">Extreme</option>
-              <option value="special">Special</option>
-              {{{optionsDiceList}}}
-              {{/select}}
-            </select> 
+          <li class="flexrow"><label class="generic-label">Flaws (comma separated list)</label>
+            <input type="text" class="padd-right" name="data.flaws" value="{{data.flaws}}" data-dtype="String"/>
           </li>
 
-          <li class="flexrow"><label class="generic-label">Damage Type</label>
-            <select class="competence-base flexrow" type="text" name="data.damagetype" value="{{data.damagetype}}" data-dtype="String">
-              {{#select data.damagetype}}
-              <option value="none">None</option>
-              <option value="slashing">Slashing</option>
-              <option value="crushing">Crushing</option>
-              <option value="piercing">Piercing</option>
-              {{{optionsDiceList}}}
-              {{/select}}
-            </select> 
+          <li class="flexrow"><label class="generic-label">Damage</label>
+            <input type="text" class="right" name="data.damage" value="{{data.damage}}" data-dtype="String"/>
           </li>
-
-          <li class="flexrow"><label class="generic-label">Damage Type Level</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.damagetypelevel" value="{{data.damagetypelevel}}" data-dtype="Number"/>
+          <li class="flexrow"><label class="generic-label">Range</label>
+            <input type="text" class="right" name="data.range" value="{{data.range}}" data-dtype="String"/>
           </li>
-          
-          <li class="flexrow"><label class="generic-label">Vehicle Damage Type</label>
-            <select class="competence-base flexrow" type="text" name="data.vehicledamagetype" value="{{data.vehicledamagetype}}" data-dtype="String">
-              {{#select data.vehicledamagetype}}
-              <option value="none">None</option>
-              <option value="emp">EMP</option>
-              <option value="thermal">Thermal</option>
-              <option value="kinetic">Kinetic</option>
-              {{{optionsDiceList}}}
-              {{/select}}
-            </select> 
-          </li>
-
-          {{> systems/fvtt-pegasus-rpg/templates/partial-equipment-effects.html}}
-
-          <li class="flexrow"><label class="generic-label">Vehicle Damage Type Level</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.vehicledamagetypelevel" value="{{data.vehicledamagetypelevel}}" data-dtype="Number"/>
-          </li>
-          
-          <li class="flexrow"><label class="generic-label">Ammo - Current</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.ammocurrent" value="{{data.ammocurrent}}" data-dtype="Number"/>
-          </li>
-
-          <li class="flexrow"><label class="generic-label">Ammo - Max</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.ammomax" value="{{data.ammomax}}" data-dtype="Number"/>
+          <li class="flexrow"><label class="generic-label">Max range</label>
+            <input type="text" class="right" name="data.maxrange" value="{{data.maxrange}}" data-dtype="String"/>
           </li>
 
           <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">Enhanced ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.enhanced" {{checked data.enhanced}}/></label>
-          </li>
-          {{#if data.enhanced}}
-          <li class="flexrow"><label class="generic-label">Enhanced Attack Statistic</label>
-            <select class="competence-base flexrow" type="text" name="data.enhancedstat" value="{{data.enhancedstat}}" data-dtype="String">
-              {{#select data.enhancedstat}}
-              {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=false special=false}}
-              {{/select}}
-            </select> 
-          </li>
-          <li class="flexrow"><label class="generic-label">Enhance Level</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.enhancedlevel" value="{{data.enhancedlevel}}" data-dtype="Number"/>
-          </li>
-          {{/if}}
-
-          <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">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>
+
+        </ul>
     </div>
+  </div>
 
   </section>
 </form>
diff --git a/templates/partial-options-abilities.html b/templates/partial-options-abilities.html
new file mode 100644
index 0000000..0efa008
--- /dev/null
+++ b/templates/partial-options-abilities.html
@@ -0,0 +1,7 @@
+<option value="agi">Agility</option>
+<option value="str">Strength</option>
+<option value="dex">Dexterity</option>
+<option value="con">Constitution</option>
+<option value="int">Intelligence</option>
+<option value="wit">Wits</option>
+<option value="cha">Charisma</option>
diff --git a/templates/partial-options-statistics.html b/templates/partial-options-statistics.html
deleted file mode 100644
index b379372..0000000
--- a/templates/partial-options-statistics.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{{#if notapplicable}}
-<option value="notapplicable">Not applicable</option>
-{{/if}}
-{{#if all}}
-<option value="all">All</option>
-{{/if}}
-{{#if all}}
-<option value="special">Special</option>
-{{/if}}
-<option value="agi">AGI</option>
-<option value="mnd">MND</option>
-<option value="soc">SOC</option>
-<option value="str">STR</option>
-<option value="phy">PHY</option>
-<option value="com">COM</option>
-<option value="def">DEF</option>
-<option value="stl">STL</option>
-<option value="per">PER</option>
-<option value="foc">FOC</option>
-{{#if mr}}
-<option value="mr">MR</option>
-{{/if}}
-{{#if combat}}
-<option value="melee-atk">Melee ATK</option>
-<option value="ranged-atk">Ranged ATK</option>
-<option value="melee-dmg">Melee DMG</option>
-<option value="ranged-dmg">Ranged DMG</option>
-<option value="dmg-res">DMG RES</option>
-{{/if}}