diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee6199c..63b41bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 0.1.9
+- versions condensées des méthodes (@kristov)
+- renommage des templates
+- image actors par défaut
+
+## 0.1.8
+- refactoring sheet vers actor
+
 ## 0.1.7
 - sang-froid, effort, et santé
 
diff --git a/assets/icons/actors/character.webp b/assets/icons/actors/character.webp
index 4a8ff2b..6ea1efc 100644
Binary files a/assets/icons/actors/character.webp and b/assets/icons/actors/character.webp differ
diff --git a/assets/icons/actors/creature.webp b/assets/icons/actors/creature.webp
new file mode 100644
index 0000000..84a296a
Binary files /dev/null and b/assets/icons/actors/creature.webp differ
diff --git a/assets/icons/actors/group.webp b/assets/icons/actors/group.webp
new file mode 100644
index 0000000..242947b
Binary files /dev/null and b/assets/icons/actors/group.webp differ
diff --git a/assets/icons/actors/npc.webp b/assets/icons/actors/npc.webp
index 318a7a3..2889d26 100644
Binary files a/assets/icons/actors/npc.webp and b/assets/icons/actors/npc.webp differ
diff --git a/module/sheets/actor-sheet.mjs b/module/sheets/actor-sheet.mjs
index 6d8fbdc..5b529b6 100644
--- a/module/sheets/actor-sheet.mjs
+++ b/module/sheets/actor-sheet.mjs
@@ -10,7 +10,7 @@ export class VermineActorSheet extends ActorSheet {
   static get defaultOptions() {
     return mergeObject(super.defaultOptions, {
       classes: ["vermine2047", "sheet", "actor"],
-      template: "systems/vermine2047/templates/actor/actor-sheet.html",
+      template: "systems/vermine2047/templates/actor/actor-sheet.hbs",
       height: 800,
       width: 690,
       resizable: false,
@@ -20,7 +20,7 @@ export class VermineActorSheet extends ActorSheet {
 
   /** @override */
   get template() {
-    return `systems/vermine2047/templates/actor/actor-${this.actor.type}-sheet.html`;
+    return `systems/vermine2047/templates/actor/actor-${this.actor.type}-sheet.hbs`;
   }
 
   /* -------------------------------------------- */
diff --git a/module/sheets/character-sheet.mjs b/module/sheets/character-sheet.mjs
index 8e1bc58..3e7ef43 100644
--- a/module/sheets/character-sheet.mjs
+++ b/module/sheets/character-sheet.mjs
@@ -13,7 +13,7 @@ export class VermineCharacterSheet extends VermineActorSheet {
   static get defaultOptions() {
     return mergeObject(super.defaultOptions, {
       classes: ["vermine2047", "sheet", "actor"],
-      template: "systems/vermine2047/templates/actor/actor-sheet.html",
+      template: "systems/vermine2047/templates/actor/actor-sheet.hbs",
       width: 600,
       height: 600,
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "features" }]
@@ -22,7 +22,7 @@ export class VermineCharacterSheet extends VermineActorSheet {
 
   /** @override */
   get template() {
-    return `systems/vermine2047/templates/actor/actor-character-sheet.html`;
+    return `systems/vermine2047/templates/actor/actor-character-sheet.hbs`;
   }
 
   /* -------------------------------------------- */
diff --git a/module/sheets/creature-sheet.mjs b/module/sheets/creature-sheet.mjs
index 4084371..ed25a05 100644
--- a/module/sheets/creature-sheet.mjs
+++ b/module/sheets/creature-sheet.mjs
@@ -11,7 +11,7 @@ export class VermineCreatureSheet extends ActorSheet {
   static get defaultOptions() {
     return mergeObject(super.defaultOptions, {
       classes: ["vermine2047", "sheet", "actor"],
-      template: "systems/vermine2047/templates/actor/actor-sheet.html",
+      template: "systems/vermine2047/templates/actor/actor-sheet.hbs",
       width: 600,
       height: 600,
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "features" }]
@@ -20,7 +20,7 @@ export class VermineCreatureSheet extends ActorSheet {
 
   /** @override */
   get template() {
-    return `systems/vermine2047/templates/actor/actor-${this.actor.type}-sheet.html`;
+    return `systems/vermine2047/templates/actor/actor-${this.actor.type}-sheet.hbs`;
   }
 
   /* -------------------------------------------- */
diff --git a/module/sheets/npc-group.mjs b/module/sheets/npc-group.mjs
index 82acb70..4b60346 100644
--- a/module/sheets/npc-group.mjs
+++ b/module/sheets/npc-group.mjs
@@ -12,7 +12,7 @@ export class VermineGroupSheet extends VermineActorSheet {
   static get defaultOptions() {
     return mergeObject(super.defaultOptions, {
       classes: ["vermine2047", "sheet", "actor"],
-      template: "systems/vermine2047/templates/actor/actor-sheet.html",
+      template: "systems/vermine2047/templates/actor/actor-sheet.hbs",
       width: 600,
       height: 600,
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "features" }]
@@ -21,7 +21,7 @@ export class VermineGroupSheet extends VermineActorSheet {
 
   /** @override */
   get template() {
-    return `systems/vermine2047/templates/actor/actor-${this.actor.type}-sheet.html`;
+    return `systems/vermine2047/templates/actor/actor-${this.actor.type}-sheet.hbs`;
   }
 
   /* -------------------------------------------- */
diff --git a/module/sheets/npc-sheet.mjs b/module/sheets/npc-sheet.mjs
index e7e871a..727d65b 100644
--- a/module/sheets/npc-sheet.mjs
+++ b/module/sheets/npc-sheet.mjs
@@ -11,7 +11,7 @@ export class VermineNpcSheet extends VermineActorSheet {
   static get defaultOptions() {
     return mergeObject(super.defaultOptions, {
       classes: ["vermine2047", "sheet", "actor"],
-      template: "systems/vermine2047/templates/actor/actor-sheet.html",
+      template: "systems/vermine2047/templates/actor/actor-sheet.hbs",
       width: 600,
       height: 600,
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "features" }]
@@ -20,7 +20,7 @@ export class VermineNpcSheet extends VermineActorSheet {
 
   /** @override */
   get template() {
-    return `systems/vermine2047/templates/actor/actor-${this.actor.type}-sheet.html`;
+    return `systems/vermine2047/templates/actor/actor-${this.actor.type}-sheet.hbs`;
   }
 
   /* -------------------------------------------- */
diff --git a/module/system/handlebars-manager.mjs b/module/system/handlebars-manager.mjs
index 2f75f9d..d92dd7f 100644
--- a/module/system/handlebars-manager.mjs
+++ b/module/system/handlebars-manager.mjs
@@ -12,18 +12,33 @@
     "systems/vermine2047/templates/actor/parts/actor-totem.hbs",
     "systems/vermine2047/templates/actor/parts/character-features.hbs",
     "systems/vermine2047/templates/actor/parts/character-header.hbs",
-    "systems/vermine2047/templates/actor/parts/actor-items.html",
+    "systems/vermine2047/templates/actor/parts/actor-items.hbs",
     "systems/vermine2047/templates/actor/parts/actor-weapons.hbs",
     "systems/vermine2047/templates/actor/parts/actor-defenses.hbs",
     "systems/vermine2047/templates/actor/parts/actor-stories.hbs",
-    "systems/vermine2047/templates/actor/parts/actor-combat.html",
+    "systems/vermine2047/templates/actor/parts/actor-combat.hbs",
+
+    // Character partials.
+    "systems/vermine2047/templates/actor/character/character-id.hbs",
+    "systems/vermine2047/templates/actor/character/character-totem.hbs",
+    "systems/vermine2047/templates/actor/character/character-features.hbs",
+    "systems/vermine2047/templates/actor/character/character-header.hbs",
+    "systems/vermine2047/templates/actor/character/character-stories.hbs",
+    "systems/vermine2047/templates/actor/character/character-combat.hbs",
+
 
     // Group partials
-    "systems/vermine2047/templates/actor/parts/group-header.hbs",
-    "systems/vermine2047/templates/actor/parts/group-vehicles.hbs",
-    "systems/vermine2047/templates/actor/parts/group-info.hbs",
-    "systems/vermine2047/templates/actor/parts/group-items.hbs",
-    "systems/vermine2047/templates/actor/parts/group-experience.hbs",
+    "systems/vermine2047/templates/actor/group/group-header.hbs",
+    "systems/vermine2047/templates/actor/group/group-vehicles.hbs",
+    "systems/vermine2047/templates/actor/group/group-info.hbs",
+    "systems/vermine2047/templates/actor/group/group-items.hbs",
+    "systems/vermine2047/templates/actor/group/group-experience.hbs",
+
+    // npc partials
+    "systems/vermine2047/templates/actor/npc/npc-combat.hbs",
+
+    // creature partials
+    "systems/vermine2047/templates/actor/creature/creature-combat.hbs",
 
     // additional templates
     "systems/vermine2047/templates/roll.hbs",
diff --git a/module/system/hooks.mjs b/module/system/hooks.mjs
index de31efa..813de80 100644
--- a/module/system/hooks.mjs
+++ b/module/system/hooks.mjs
@@ -51,10 +51,9 @@ export const registerHooks = function () {
     /* -------------------------------------------- */
 
     Hooks.on("preCreateActor", function (actor) {
-        // console.log('pre create actor', actor);
+        console.log('pre create actor', actor.img);
         if (actor.img == "icons/svg/mystery-man.svg") {
-        // actor.updateSource({"img": `systems/vermine2047/icons/actors/${actor.type}.webp`});
-        // item.updateSource({"img": `systems/vermine2047/icons/competence.webp`});
+            actor.updateSource({"img": `systems/vermine2047/assets/icons/actors/${actor.type}.webp`});
         }
     });
     
diff --git a/templates/actor/actor-character-sheet.html b/templates/actor/actor-character-sheet.hbs
similarity index 82%
rename from templates/actor/actor-character-sheet.html
rename to templates/actor/actor-character-sheet.hbs
index 696ac96..cde1213 100644
--- a/templates/actor/actor-character-sheet.html
+++ b/templates/actor/actor-character-sheet.hbs
@@ -4,12 +4,12 @@
       <img class="logo mx-auto" src="systems/vermine2047/assets/images/ui/logo.webp" width="200" alt="logo Vermine" />
       <div class="sidebar" data-group="dashboard" data-tab="sidebar">
           <!--ID -->
-          {{> "systems/vermine2047/templates/actor/parts/actor-id.hbs"}}
+          {{> "systems/vermine2047/templates/actor/character/character-id.hbs"}}
       </div>
   </aside>
   <main>
     <!-- HEADER -->
-    {{> "systems/vermine2047/templates/actor/parts/character-header.hbs"}}
+    {{> "systems/vermine2047/templates/actor/character/character-header.hbs"}}
 
     <!-- SHEET NAVIGATION -->
     <nav class="sheet-navigation sheet-tabs tabs flex-group-end" data-group="primary">
@@ -42,26 +42,26 @@
         <section class="sheet-content">
           <div class="tab character character-pane active" data-group="primary" data-tab="character">
               <!-- Character -->
-            {{> "systems/vermine2047/templates/actor/parts/character-features.hbs"}}
+            {{> "systems/vermine2047/templates/actor/character/character-features.hbs"}}
           </div>
           <div class="tab totem" data-group="primary" data-tab="totem">
             <h3>{{ localize 'IDENTITY.totem'}}</h3>
-            {{> "systems/vermine2047/templates/actor/parts/actor-totem.hbs"}}
+            {{> "systems/vermine2047/templates/actor/character/character-totem.hbs"}}
           </div>
           <div class="tab equipment" data-group="primary" data-tab="equipment">
             <h3>{{ localize 'VERMINE.equipment'}}</h3>
             <!-- Rituals -->
-            {{> "systems/vermine2047/templates/actor/parts/actor-items.html"}}
+            {{> "systems/vermine2047/templates/actor/parts/actor-items.hbs"}}
           </div>
           <div class="tab combat" data-group="primary" data-tab="combat">
             <h3>{{ localize 'VERMINE.combat'}}</h3>
             <!-- effects -->
-            {{> "systems/vermine2047/templates/actor/parts/actor-combat.html"}}
+            {{> "systems/vermine2047/templates/actor/character/character-combat.hbs"}}
           </div>
         
           <div class="tab stories" data-group="primary" data-tab="stories">
               <h3>{{ localize 'VERMINE.stories'}}</h3>
-              {{> "systems/vermine2047/templates/actor/parts/actor-stories.hbs"}}
+              {{> "systems/vermine2047/templates/actor/character/character-stories.hbs"}}
         </div>
         
         </section>
diff --git a/templates/actor/actor-creature-sheet.html b/templates/actor/actor-creature-sheet.hbs
similarity index 97%
rename from templates/actor/actor-creature-sheet.html
rename to templates/actor/actor-creature-sheet.hbs
index 73cb1c3..cff7fc2 100644
--- a/templates/actor/actor-creature-sheet.html
+++ b/templates/actor/actor-creature-sheet.hbs
@@ -61,7 +61,7 @@
 
     {{!-- Active Effects Tab --}}
     <div class="tab effects flexcol" data-group="primary" data-tab="effects">
-      {{> "systems/vermine2047/templates/actor/parts/actor-effects.html"}}
+      {{> "systems/vermine2047/templates/actor/creature/creature-combat.hbs"}}
     </div>
 
   </section>
diff --git a/templates/actor/actor-group-sheet.html b/templates/actor/actor-group-sheet.hbs
similarity index 80%
rename from templates/actor/actor-group-sheet.html
rename to templates/actor/actor-group-sheet.hbs
index 78af286..310f9d2 100644
--- a/templates/actor/actor-group-sheet.html
+++ b/templates/actor/actor-group-sheet.hbs
@@ -1,7 +1,7 @@
 <form class="{{cssClass}} {{actor.type}} flexcol form" autocomplete="off">
 
   {{!-- Sheet Header --}}
-  {{> "systems/vermine2047/templates/actor/parts/group-header.hbs"}}
+  {{> "systems/vermine2047/templates/actor/group/group-header.hbs"}}
   
   {{!-- Sheet Tab Navigation --}}
   <nav class="sheet-tabs tabs" data-group="primary">
@@ -17,19 +17,19 @@
     {{!-- Biography Tab --}}
     <div class="tab biography" data-group="primary" data-tab="description">
       <h3>{{ localize 'VERMINE.information'}}</h3>
-      {{> "systems/vermine2047/templates/actor/parts/group-info.hbs"}}
+      {{> "systems/vermine2047/templates/actor/group/group-info.hbs"}}
     </div>
 
     {{!-- Owned Items Tab --}}
     <div class="tab items" data-group="primary" data-tab="gear">
         <h3>{{ localize 'VERMINE.gear'}}</h3>
-       {{> "systems/vermine2047/templates/actor/parts/group-items.hbs"}}
+       {{> "systems/vermine2047/templates/actor/group/group-items.hbs"}}
     </div>
 
     {{!-- Road Tab --}}
     <div class="tab effects" data-group="primary" data-tab="totem">
       <h3>{{ localize 'VERMINE.road'}}</h3>
-      {{> "systems/vermine2047/templates/actor/parts/group-experience.hbs"}}
+      {{> "systems/vermine2047/templates/actor/group/group-experience.hbs"}}
     </div>
 
   </section>
diff --git a/templates/actor/actor-npc-sheet.html b/templates/actor/actor-npc-sheet.hbs
similarity index 98%
rename from templates/actor/actor-npc-sheet.html
rename to templates/actor/actor-npc-sheet.hbs
index c022c63..22cc695 100644
--- a/templates/actor/actor-npc-sheet.html
+++ b/templates/actor/actor-npc-sheet.hbs
@@ -88,12 +88,12 @@
 
     {{!-- Owned Items Tab --}}
     <div class="tab items" data-group="primary" data-tab="items">
-       {{> "systems/vermine2047/templates/actor/parts/actor-items.html"}}
+       {{> "systems/vermine2047/templates/actor/parts/actor-items.hbs"}}
     </div>
 
     {{!-- Active Effects Tab --}}
     <div class="tab effects flexcol" data-group="primary" data-tab="effects">
-      {{> "systems/vermine2047/templates/actor/parts/actor-effects.html"}}
+      {{> "systems/vermine2047/templates/actor/npc/npc-combat.hbs"}}
     </div>
 
   </section>
diff --git a/templates/actor/parts/actor-combat.html b/templates/actor/character/character-combat.hbs
similarity index 100%
rename from templates/actor/parts/actor-combat.html
rename to templates/actor/character/character-combat.hbs
diff --git a/templates/actor/parts/character-features.hbs b/templates/actor/character/character-features.hbs
similarity index 100%
rename from templates/actor/parts/character-features.hbs
rename to templates/actor/character/character-features.hbs
diff --git a/templates/actor/parts/character-header.hbs b/templates/actor/character/character-header.hbs
similarity index 100%
rename from templates/actor/parts/character-header.hbs
rename to templates/actor/character/character-header.hbs
diff --git a/templates/actor/parts/actor-id.hbs b/templates/actor/character/character-id.hbs
similarity index 100%
rename from templates/actor/parts/actor-id.hbs
rename to templates/actor/character/character-id.hbs
diff --git a/templates/actor/parts/actor-stories.hbs b/templates/actor/character/character-stories.hbs
similarity index 100%
rename from templates/actor/parts/actor-stories.hbs
rename to templates/actor/character/character-stories.hbs
diff --git a/templates/actor/parts/actor-totem.hbs b/templates/actor/character/character-totem.hbs
similarity index 100%
rename from templates/actor/parts/actor-totem.hbs
rename to templates/actor/character/character-totem.hbs
diff --git a/templates/actor/creature/creature-combat.hbs b/templates/actor/creature/creature-combat.hbs
new file mode 100644
index 0000000..5af0bcf
--- /dev/null
+++ b/templates/actor/creature/creature-combat.hbs
@@ -0,0 +1,76 @@
+<div class="grid grid-2col">
+  <div>
+    <h4 class="align-center">{{ localize "VERMINE.self_control"}}</h4>
+    <p class="align-center">
+      <input type="number" name="system.attributes.self_control.value" value="{{ system.attributes.self_control.value }}" data-dtype="Number" min="{{ system.attributes.self_control.min }}" max="{{ system.attributes.self_control.max }}" /> / {{ system.attributes.self_control.max }}
+    </p>
+  </div> 
+  <div>
+    <h4 class="align-center">{{ localize "VERMINE.effort"}}</h4>
+    <p class="align-center">
+      <input type="number" name="system.attributes.effort.value" value="{{ system.attributes.effort.value }}" data-dtype="Number" min="{{ system.attributes.effort.min }}" max="{{ system.attributes.effort.max }}" /> / {{ system.attributes.effort.max }}
+    </p>
+  </div> 
+</div>
+<h4 class="item-name effect-name flexrow">{{ localize "VERMINE.wounds.name"}}</h4>
+<ul class="unstyled">
+  <li class="row mdb">{{ localize 'VERMINE.wounds.light'}} ({{ system.minorWound.threshold }}) 
+    {{#range system.minorWound.max }}
+      <input type="radio" data-dtype="Number" name="system.minorWound.value" value="{{this}}" {{#ife @root.system.minorWound.value this }}checked="checked"{{/ife}} />
+    {{/range}}</li>
+  <li class="row mdb">{{ localize 'VERMINE.wounds.heavy'}}  ({{ system.majorWound.threshold }})
+    {{#range system.majorWound.max }}
+      <input type="radio" name="system.majorWound.value" value="{{this}}"  {{#ife @root.system.majorWound.value this }}checked="checked"{{/ife}} />
+    {{/range}}
+  </li>
+  <li class="row mdb">{{ localize 'VERMINE.wounds.deadly'}}  ({{ system.deadlyWound.threshold }})
+    {{#range system.deadlyWound.max }}
+    <input type="radio" name="system.deadlyWound.value" value="{{this}}"  {{#ife @root.system.deadlyWound.value this }}checked="checked"{{/ife}} />
+  {{/range}}
+  </li>
+</ul>
+<h4 class="item-name effect-name flexrow">{{ localize "UI.effects.name"}}</h4>
+<ol class="items-list effects-list">
+  {{#each effects as |section sid|}}
+    <li class="items-header flexrow" data-effect-type="{{section.type}}">
+      <p class="item-name effect-name flexrow">{{#if (eq section.type 'temporary')}}
+          {{localize "UI.effects.temporary" }}
+        {{else if (eq section.type 'passive')}}
+          {{localize "UI.effects.passive" }}
+        {{else if (eq section.type 'inactive')}}
+        {{localize "UI.effects.inactive" }}
+        {{/if}}
+      </p>
+      <div class="effect-source">{{localize 'UI.source'}}</div>
+      <div class="effect-source">{{localize 'UI.duration'}}</div>
+      <div class="item-controls effect-controls flexrow">
+        <a class="effect-control" data-action="create" title="{{localize 'UI.effect_create'}}">
+          <i class="fas fa-plus"></i> {{localize "UI.add"}}
+        </a>
+      </div>
+    </li>
+
+    <ol class="item-list">
+    {{#each section.effects as |effect|}}
+      <li class="item effect flexrow" data-effect-id="{{effect.id}}">
+        <div class="item-name effect-name">
+          <a class="effect-control flexrow flex-group-center items-center" data-action="edit" title="{{localize 'UI.effect_edit'}}">
+          <img class="item-image" src="{{effect.icon}}"/>
+          <span>{{effect.label}}</span>
+          </a>
+        </div>
+        <div class="effect-source">{{effect.sourceName}}</div>
+        <div class="effect-duration">{{effect.duration.label}}</div>
+        <div class="item-controls effect-controls flexrow">
+          <a class="effect-control" data-action="toggle" title="{{localize 'UI.effect_toggle'}}">
+            <i class="fas {{#if effect.disabled}}fa-check{{else}}fa-times{{/if}}"></i>
+          </a>          
+          <a class="effect-control" data-action="delete" title="{{localize 'UI.effect_delete'}}">
+            <i class="fas fa-trash"></i>
+          </a>
+        </div>
+      </li>
+    {{/each}}
+    </ol>
+  {{/each}}
+</ol>
diff --git a/templates/actor/parts/group-experience.hbs b/templates/actor/group/group-experience.hbs
similarity index 100%
rename from templates/actor/parts/group-experience.hbs
rename to templates/actor/group/group-experience.hbs
diff --git a/templates/actor/parts/group-header.hbs b/templates/actor/group/group-header.hbs
similarity index 100%
rename from templates/actor/parts/group-header.hbs
rename to templates/actor/group/group-header.hbs
diff --git a/templates/actor/parts/group-info.hbs b/templates/actor/group/group-info.hbs
similarity index 100%
rename from templates/actor/parts/group-info.hbs
rename to templates/actor/group/group-info.hbs
diff --git a/templates/actor/parts/group-items.hbs b/templates/actor/group/group-items.hbs
similarity index 96%
rename from templates/actor/parts/group-items.hbs
rename to templates/actor/group/group-items.hbs
index ee40e9f..b1bc3bf 100644
--- a/templates/actor/parts/group-items.hbs
+++ b/templates/actor/group/group-items.hbs
@@ -36,4 +36,4 @@
 <h4>{{localize 'ITEMS.defenses'}}</h4>
 {{> "systems/vermine2047/templates/actor/parts/actor-defenses.hbs"}}
 <h4>{{localize 'ITEMS.vehicles'}}</h4>
-{{> "systems/vermine2047/templates/actor/parts/group-vehicles.hbs"}}
\ No newline at end of file
+{{> "systems/vermine2047/templates/actor/group/group-vehicles.hbs"}}
\ No newline at end of file
diff --git a/templates/actor/parts/group-vehicles.hbs b/templates/actor/group/group-vehicles.hbs
similarity index 100%
rename from templates/actor/parts/group-vehicles.hbs
rename to templates/actor/group/group-vehicles.hbs
diff --git a/templates/actor/npc/npc-combat.hbs b/templates/actor/npc/npc-combat.hbs
new file mode 100644
index 0000000..5af0bcf
--- /dev/null
+++ b/templates/actor/npc/npc-combat.hbs
@@ -0,0 +1,76 @@
+<div class="grid grid-2col">
+  <div>
+    <h4 class="align-center">{{ localize "VERMINE.self_control"}}</h4>
+    <p class="align-center">
+      <input type="number" name="system.attributes.self_control.value" value="{{ system.attributes.self_control.value }}" data-dtype="Number" min="{{ system.attributes.self_control.min }}" max="{{ system.attributes.self_control.max }}" /> / {{ system.attributes.self_control.max }}
+    </p>
+  </div> 
+  <div>
+    <h4 class="align-center">{{ localize "VERMINE.effort"}}</h4>
+    <p class="align-center">
+      <input type="number" name="system.attributes.effort.value" value="{{ system.attributes.effort.value }}" data-dtype="Number" min="{{ system.attributes.effort.min }}" max="{{ system.attributes.effort.max }}" /> / {{ system.attributes.effort.max }}
+    </p>
+  </div> 
+</div>
+<h4 class="item-name effect-name flexrow">{{ localize "VERMINE.wounds.name"}}</h4>
+<ul class="unstyled">
+  <li class="row mdb">{{ localize 'VERMINE.wounds.light'}} ({{ system.minorWound.threshold }}) 
+    {{#range system.minorWound.max }}
+      <input type="radio" data-dtype="Number" name="system.minorWound.value" value="{{this}}" {{#ife @root.system.minorWound.value this }}checked="checked"{{/ife}} />
+    {{/range}}</li>
+  <li class="row mdb">{{ localize 'VERMINE.wounds.heavy'}}  ({{ system.majorWound.threshold }})
+    {{#range system.majorWound.max }}
+      <input type="radio" name="system.majorWound.value" value="{{this}}"  {{#ife @root.system.majorWound.value this }}checked="checked"{{/ife}} />
+    {{/range}}
+  </li>
+  <li class="row mdb">{{ localize 'VERMINE.wounds.deadly'}}  ({{ system.deadlyWound.threshold }})
+    {{#range system.deadlyWound.max }}
+    <input type="radio" name="system.deadlyWound.value" value="{{this}}"  {{#ife @root.system.deadlyWound.value this }}checked="checked"{{/ife}} />
+  {{/range}}
+  </li>
+</ul>
+<h4 class="item-name effect-name flexrow">{{ localize "UI.effects.name"}}</h4>
+<ol class="items-list effects-list">
+  {{#each effects as |section sid|}}
+    <li class="items-header flexrow" data-effect-type="{{section.type}}">
+      <p class="item-name effect-name flexrow">{{#if (eq section.type 'temporary')}}
+          {{localize "UI.effects.temporary" }}
+        {{else if (eq section.type 'passive')}}
+          {{localize "UI.effects.passive" }}
+        {{else if (eq section.type 'inactive')}}
+        {{localize "UI.effects.inactive" }}
+        {{/if}}
+      </p>
+      <div class="effect-source">{{localize 'UI.source'}}</div>
+      <div class="effect-source">{{localize 'UI.duration'}}</div>
+      <div class="item-controls effect-controls flexrow">
+        <a class="effect-control" data-action="create" title="{{localize 'UI.effect_create'}}">
+          <i class="fas fa-plus"></i> {{localize "UI.add"}}
+        </a>
+      </div>
+    </li>
+
+    <ol class="item-list">
+    {{#each section.effects as |effect|}}
+      <li class="item effect flexrow" data-effect-id="{{effect.id}}">
+        <div class="item-name effect-name">
+          <a class="effect-control flexrow flex-group-center items-center" data-action="edit" title="{{localize 'UI.effect_edit'}}">
+          <img class="item-image" src="{{effect.icon}}"/>
+          <span>{{effect.label}}</span>
+          </a>
+        </div>
+        <div class="effect-source">{{effect.sourceName}}</div>
+        <div class="effect-duration">{{effect.duration.label}}</div>
+        <div class="item-controls effect-controls flexrow">
+          <a class="effect-control" data-action="toggle" title="{{localize 'UI.effect_toggle'}}">
+            <i class="fas {{#if effect.disabled}}fa-check{{else}}fa-times{{/if}}"></i>
+          </a>          
+          <a class="effect-control" data-action="delete" title="{{localize 'UI.effect_delete'}}">
+            <i class="fas fa-trash"></i>
+          </a>
+        </div>
+      </li>
+    {{/each}}
+    </ol>
+  {{/each}}
+</ol>
diff --git a/templates/actor/parts/actor-features.html b/templates/actor/parts/actor-features.hbs
similarity index 100%
rename from templates/actor/parts/actor-features.html
rename to templates/actor/parts/actor-features.hbs
diff --git a/templates/actor/parts/actor-items.html b/templates/actor/parts/actor-items.hbs
similarity index 100%
rename from templates/actor/parts/actor-items.html
rename to templates/actor/parts/actor-items.hbs
diff --git a/templates/actor/parts/actor-spells.html b/templates/actor/parts/actor-spells.html
deleted file mode 100644
index 5a01b0b..0000000
--- a/templates/actor/parts/actor-spells.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<ol class="items-list">
-  {{#each spells as |spells spellLevel|}}
-    <li class="item flexrow items-header">
-      <div class="item-name">Level {{spellLevel}} Spells</div>
-      <div class="item-controls">
-        <a class="item-control item-create" title="Create item" data-type="spell" data-spell-level="{{spellLevel}}"><i class="fas fa-plus"></i> Add LVL {{spellLevel}}</a>
-      </div>
-    </li>
-    {{#each spells as |item id|}}
-      <li class="item flexrow" data-item-id="{{item._id}}">
-        <div class="item-name flexrow">
-          <div class="item-image">
-            <a class="rollable" data-roll-type="item"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></a>
-          </div>
-          <h4>{{item.name}}</h4>
-        </div>
-        <div class="item-controls">
-          <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-          <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-        </div>
-      </li>
-    {{/each}}
-  {{/each}}
-</ol>
\ No newline at end of file