diff --git a/lang/en.json b/lang/en.json
index 4984c43..dba7ff8 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -85,7 +85,43 @@
   "WH.ui.conditions": "Conditions",
   "WH.ui.effect": "Effect",
   
-  "WH.ui.magicschool": "Magic School",
+  "WH.ui.main": "Main",
+  "WH.ui.combat": "Combat",
+  "WH.ui.skillstab": "Skills&Effects",
+  "WH.ui.powers": "Powers",
+  "WH.ui.equipment": "Equipment",
+  "WH.ui.biography": "Biography",
+  "WH.ui.race": "Race",
+  "WH.ui.class": "Class",
+  "WH.ui.religion": "Religion",
+  "WH.ui.origin": "Origin",
+  "WH.ui.age": "Age",
+  "WH.ui.height": "Height",
+  "WH.ui.eyes": "Eyes",
+  "WH.ui.hair": "Hair",
+  "WH.ui.preferredhand": "Preferred Hand",
+  "WH.ui.size": "Size",
+  "WH.ui.gender": "Gender",
+  "WH.ui.background": "Background",
+  "WH.ui.type": "Type",
+  "WH.ui.description": "Description",
+  "WH.ui.rawroll": "Raw Roll Formula (ex: 1d20+@statistics.str.value)",
+  "WH.ui.rawdamage": "Raw Damage Formula (ex: 1d6+(@statistics.str.value/2))",
+  "WH.ui.damage": "Damage",
+  "WH.ui.2hdamage": "2 Hands Damage",
+  "WH.ui.slotlocation": "Slot location",
+  "WH.ui.quantity": "Quantity",
+  "WH.ui.cost": "Cost",
+  "WH.ui.details": "Details",
 
-  "WH.chat.save": "Save"
+  "WH.chat.save": "Save",
+  "WH.chat.mweaponmalus": "Multiple weapons malus ",
+  "WH.chat.diceresult": "Dice result",
+  "WH.chat.result": "Result",
+  "WH.chat.parysuccess": "Parry success !",
+  "WH.chat.paryfailed": "Parry failed !",
+  "WH.chat.rollformula": "Roll Formula",
+  "WH.chat.useshield":"Use shield ?",
+  "WH.chat.power": "Power",
+  "WH.chat.powerlevel": "Power Level"
 }
\ No newline at end of file
diff --git a/lang/it.json b/lang/it.json
new file mode 100644
index 0000000..186f221
--- /dev/null
+++ b/lang/it.json
@@ -0,0 +1,91 @@
+{
+  "WH.conf.short": "Corte",
+  "WH.conf.long": "Lunghe",
+  "WH.conf.twohanded": "A Due mani",
+  "WH.conf.shooting": "Da tiro",
+  "WH.conf.throwing": "Da lancio",
+  "WH.conf.lightarmor" : "Leggera",
+  "WH.conf.mediumarmor": "Media",
+  "WH.conf.heavyarmor": "Pesante", 
+  "WH.conf.lightshield": "Leggero",
+  "WH.conf.mediumshield": "Medio",
+  "WH.conf.towershield": "Torre",
+  "WH.conf.polearm": "Armi in asta",
+  "WH.conf.special": "Speciali",
+
+  "WH.conf.head": "Testa",
+  "WH.conf.cloak": "Mantello",
+  "WH.conf.weapon1": "Mano primaria",
+  "WH.conf.weapon2": "Mano secondaria",
+  "WH.conf.gloves": "Guanti",
+  "WH.conf.dress": "Abito",
+  "WH.conf.boots": "Stivali",
+  "WH.conf.ring": "Anelli",
+  "WH.conf.belt": "Cintura",
+  "WH.conf.quiver": "Faretra",
+  "WH.conf.armor": "Armatura",
+  "WH.conf.shield": "Scudo",
+  "WH.conf.backpack": "Zaino",
+  "WH.conf.beltpouch1": "Borsa da cintura 1",
+  "WH.conf.beltpouch2": "Borsa da cintura 2",
+  "WH.conf.beltpouch3": "Borsa da cintura 3",
+
+  "WH.ui.level": "Livello",
+  "WH.ui.notes": "Note",
+
+  "WH.ui.hpprog": "Progressione PF",
+  "WH.ui.lan": "Lingue",
+  "WH.ui.attrbonus": "Attributi",
+  "WH.ui.weapons": "Armi",
+  "WH.ui.armors": "Armature",
+  "WH.ui.shields": "Scudi",
+  "WH.ui.weapon": "Arma",
+
+  "WH.ui.Strength": "Fisico",
+  "WH.ui.Instinct": "Istinto",
+  "WH.ui.Dexterity": "Istinto",
+  "WH.ui.Mind": "Mente",
+  "WH.ui.Type": "Tipo",
+  "WH.ui.HitPoints": "Punti ferita",
+  "WH.ui.Defence": "Difesa",
+  "WH.ui.Throw2HitM": "TxC (corpo a corpo)",
+  "WH.ui.Throw2HitR": "TxC (distanza)",
+  "WH.ui.Mana": "Mana",
+  "WH.ui.Initiative": "Iniziativa",
+  "WH.ui.Movement": "Movimento (Terra)",
+  "WH.ui.MovementSwim": "Movimento (Nuoto)",
+  "WH.ui.MovementFly": "Movimento (Volare)",
+  "WH.ui.power": "Potere",
+  
+  "WH.ui.Qty": "Quantitá",
+  "WH.ui.maxslots": "Max slots",
+  "WH.ui.slotsused": "Slots usati",
+  "WH.ui.Damage": "Danni",
+  "WH.ui.parrybonus": "Bonus a parata",
+  "WH.ui.damagereduction": "Riduzione danno",
+  "WH.ui.save": "Salva",
+  "WH.ui.XP": "PE",
+  "WH.ui.xphp": "Progressione PF",
+  "WH.ui.Knowledge": "Conoscenze",
+  "WH.ui.malusmultiweapon": "Malus nell uso di due armi",
+  "WH.ui.drbonus": "Bonus RD",
+  "WH.ui.parrybonustotal": "Bonus Parata totale",
+  "WH.ui.drbonustotal": "Bonus RD totale",
+  "WH.ui.counterspell": "Contropotere",
+  "WH.ui.createitem": "Bonus ai tiri percentuali",
+  "WH.ui.classSkills": "Abilitá di classe",
+  "WH.ui.skills": "Abilitá Aggiuntiva",
+  "WH.ui.isclassskill": "Abilitá di classe?",
+  "WH.ui.unlimited": "Usi illimitati?",
+  "WH.ui.currentuse": "Numero di usi",
+  "WH.ui.maxuse": "Usi Massimi",
+  "WH.ui.languages": "Lingue",
+  "WH.ui.languagesbonus": "Bonus a linguaggi conosciuti (men/2)",
+  "WH.ui.competency": "Competeze",
+  "WH.ui.conditions": "Condizioni",
+  "WH.ui.effect": "Effetti",
+  
+  "WH.ui.magicschool": "Sfera di magia",
+
+  "WH.chat.save": "Salva"
+}
\ No newline at end of file
diff --git a/modules/warhero-utility.js b/modules/warhero-utility.js
index 5810a26..375c815 100644
--- a/modules/warhero-utility.js
+++ b/modules/warhero-utility.js
@@ -216,10 +216,8 @@ export class WarheroUtility {
 
     const templatePaths = [
       'systems/fvtt-warhero/templates/editor-notes-gm.html',
-      'systems/fvtt-warhero/templates/partial-roll-select.html',
       'systems/fvtt-warhero/templates/partial-actor-stat-block.html',
       'systems/fvtt-warhero/templates/partial-actor-status.html',
-      'systems/fvtt-warhero/templates/partial-options-abilities.html',
       'systems/fvtt-warhero/templates/partial-item-nav.html',
       'systems/fvtt-warhero/templates/partial-item-description.html',
       'systems/fvtt-warhero/templates/partial-item-common-equipment.html',
diff --git a/system.json b/system.json
index c798a80..9774592 100644
--- a/system.json
+++ b/system.json
@@ -18,6 +18,12 @@
       "name": "English",
       "path": "lang/en.json",
       "flags": {}
+    },
+    {
+      "lang": "it",
+      "name": "English",
+      "path": "lang/it.json",
+      "flags": {}
     }
   ],
   "license": "LICENSE.txt",
@@ -101,7 +107,7 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "10.0.25",
+  "version": "10.0.26",
   "compatibility": {
     "minimum": "10",
     "verified": "10",
@@ -109,7 +115,7 @@
   },
   "title": "Warhero RPG",
   "manifest": "https://www.uberwald.me/gitea/public/fvtt-warhero/raw/branch/master/system.json",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-warhero/archive/fvtt-warhero-10.0.25.zip",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-warhero/archive/fvtt-warhero-10.0.26.zip",
   "url": "https://www.uberwald.me/gitea/public/fvtt-warhero",
   "background": "images/ui/warhero_welcome_page.webp",
   "id": "fvtt-warhero"
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 517f058..09877ba 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -64,12 +64,12 @@
 
   {{!-- Sheet Tab Navigation --}}
   <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="main">Main</a>
-    <a class="item" data-tab="combat">Combat</a>
-    <a class="item" data-tab="skill">Skills&Effects</a>
-    <a class="item" data-tab="power">Powers</a>
-    <a class="item" data-tab="equipment">Equipment</a>
-    <a class="item" data-tab="biodata">Biography</a>
+    <a class="item" data-tab="main">{{localize "WH.ui.main"}}</a>
+    <a class="item" data-tab="combat">{{localize "WH.ui.combat"}}</a>
+    <a class="item" data-tab="skill">{{localize "WH.ui.skillstab"}}</a>
+    <a class="item" data-tab="power">{{localize "WH.ui.powers"}}</a>
+    <a class="item" data-tab="equipment">{{localize "WH.ui.equipment"}}</a>
+    <a class="item" data-tab="biodata">{{localize "WH.ui.biography"}}</a>
   </nav>
 
   {{!-- Sheet Body --}}
@@ -176,7 +176,7 @@
           <ul class="stat-list alternate-list">
             <li class="item flexrow list-item items-title-bg">
               <span class="item-name-label-header-long">
-                <h3><label class="items-title-text">Weapons</label></h3>
+                <h3><label class="items-title-text">{{localize "WH.ui.weapons"}}</label></h3>
               </span>
               <span class="item-field-label-medium">
                 <label class="short-label">{{localize "WH.ui.Type"}}</label>
@@ -216,7 +216,7 @@
           <ul class="stat-list alternate-list">
             <li class="item flexrow list-item items-title-bg">
               <span class="item-name-label-header-long">
-                <h3><label class="items-title-text">Shields</label></h3>
+                <h3><label class="items-title-text">{{localize "WH.ui.shields"}}</label></h3>
               </span>
               <span class="item-field-label-short">
                 <label class="short-label">{{localize "WH.ui.Type"}}</label>
@@ -248,7 +248,7 @@
           <ul class="stat-list alternate-list">
             <li class="item flexrow list-item items-title-bg">
               <span class="item-name-label-header-long">
-                <h3><label class="items-title-text">Armors</label></h3>
+                <h3><label class="items-title-text">{{localize "WH.ui.armors"}}</label></h3>
               </span>
               <span class="item-field-label-short">
                 <label class="short-label">{{localize "WH.ui.Type"}}</label>
@@ -485,28 +485,20 @@
         <div>
           <ul class="item-list alternate-list">
             <li class="item flexrow">
-              <label class="generic-label">Origin</label>
+              <label class="generic-label">{{localize "WH.ui.origin"}}</label>
               <input type="text" class="" name="system.biodata.origin" value="{{data.biodata.origin}}"
                 data-dtype="String" />
             </li>
             <li class="item flexrow">
-              <label class="generic-label">Age</label>
+              <label class="generic-label">{{localize "WH.ui.age"}}</label>
               <input type="text" class="" name="system.biodata.age" value="{{data.biodata.age}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
-              <label class="generic-label">Height</label>
+              <label class="generic-label">{{localize "WH.ui.height"}}</label>
               <input type="text" class="" name="system.biodata.height" value="{{data.biodata.height}}" data-dtype="String" />
             </li>
-            <li class="item flexrow">
-              <label class="generic-label">Eyes</label>
-              <input type="text" class="" name="system.biodata.eyes" value="{{data.biodata.eyes}}" data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="generic-label">Hair</label>
-              <input type="text" class="" name="system.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
-            </li>
             <li class="flexrow item">
-              <label class="generic-label">Preferred Hand</label>
+              <label class="generic-label">{{localize "WH.ui.preferredhand"}}</label>
               <input type="text" class="" name="system.biodata.preferredhand" value="{{data.biodata.preferredhand}}"
                 data-dtype="String" />
             </li>
@@ -515,7 +507,7 @@
        <div>
           <ul>
             <li class="flexrow item">
-              <label class="generic-label">Size</label>
+              <label class="generic-label">{{localize "WH.ui.size"}}</label>
               <select class="competence-base flexrow" type="text" name="system.biodata.size" value="{{data.biodata.size}}" data-dtype="Number">
                 {{#select data.biodata.size}}
                 <option value="1">Tiny</option>
@@ -528,22 +520,30 @@
               </select> 
             </li>
             <li class="flexrow item">
-              <label class="generic-label">Sex</label>
+              <label class="generic-label">{{localize "WH.ui.gender"}}</label>
               <input type="text" class="" name="system.biodata.sex" value="{{data.biodata.sex}}" data-dtype="String" />
             </li>
+            <li class="item flexrow">
+              <label class="generic-label">{{localize "WH.ui.eyes"}}</label>
+              <input type="text" class="" name="system.biodata.eyes" value="{{data.biodata.eyes}}" data-dtype="String" />
+            </li>
+            <li class="item flexrow">
+              <label class="generic-label">{{localize "WH.ui.hair"}}</label>
+              <input type="text" class="" name="system.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
+            </li>
           </ul>
         </div>
       </div>
 
 
       <hr>
-      <h3>Background : </h3>
+      <h3>{{localize "WH.ui.background"}} : </h3>
       <div class="form-group editor">
         {{editor description target="system.biodata.description" button=true owner=owner
         editable=editable}}
       </div>
       <hr>
-      <h3>Notes : </h3>
+      <h3>{{localize "WH.ui.notes"}} : </h3>
       <div class="form-group editor">
         {{editor notes target="system.biodata.notes" button=true owner=owner editable=editable}}
       </div>
diff --git a/templates/chat-attack-defense-result.html b/templates/chat-attack-defense-result.html
deleted file mode 100644
index 4367f4b..0000000
--- a/templates/chat-attack-defense-result.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<div class="chat-message-header">
-  {{#if actorImg}}
-  <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
-  {{/if}}
-  <h4 class=chat-actor-name>{{alias}}</h4>
-</div>
-
-  <hr>
-  
-  {{#if img}}
-  <div >
-    <img class="chat-icon" src="{{img}}" alt="{{name}}" />
-  </div>
-  {{/if}}
-
-  <div class="flexcol">
-    </div>
-
-    <div>
-      <ul>
-        <li><strong>Fight result !</strong></li>
-        {{#if successDetails.fumbleDetails}}
-        <li>Fumble ! :  {{successDetails.fumbleDetails.data.text}} </li>
-        {{/if}}
-
-
-        {{#if armorResult}}
-          <li>Armor initial result : {{armorResult.rawArmor}}</li>
-          {{#each armorResult.messages as |message idx|}}
-            <li>{{message}}</li>
-          {{/each}}
-        {{/if}}
-
-        {{#if successDetails.hack_vs_shields}} 
-        <li>Hack weapon : check shield !</li>
-        {{/if}}
-
-        {{#if successDetails.entangle}} 
-        <li>Entangle weapon : attacker can entangle !</li>
-        {{/if}}
-        
-        {{#if successDetails.knockback}} 
-        <li>Knockback weapon : check knockback !</li>
-        {{/if}}
-        
-        {{#if successDetails.hack_armors}} 
-        <li>Hack weapon : check armor damage !</li>
-        {{/if}}
-
-        {{#if successDetails.penetrating_impale}} 
-        <li>Penetrating weapon : apply the Impale condition !</li>
-        {{/if}}
-
-        {{#if (or successDetails.critical_1 successDetails.critical_2)}} 
-        <li>Critical {{#if successDetails.critical_1}} 1 {{else}} 2 {{/if}} : {{successDetails.criticalText}} </li>
-        {{/if}}
-
-        {{#if successDetails.attackerHPLossValue}}
-        <li>Attacker has lost HP :  {{successDetails.attackerHPLossValue}} HP </li>
-        {{/if}}
-
-        {{#if successDetails.defenderHPLossValue}}
-        <li>Defender has lost HP :  {{successDetails.defenderHPLossValue}} HP </li>
-        {{/if}}
-
-        <li>Success details : {{successDetails.result}} </li>
-
-        <li><strong>Final successes</strong> {{sumSuccess}} </li>
-
-        <!-- <button class="chat-card-button reroll-level-remaining" data-roll-id="{{rollId}}">Reroll</button> -->
-
-      </ul>  
-    </div>
-
-  </div>
diff --git a/templates/chat-generic-result.html b/templates/chat-generic-result.html
index b461d47..82d0fc5 100644
--- a/templates/chat-generic-result.html
+++ b/templates/chat-generic-result.html
@@ -31,18 +31,18 @@
       {{/if}}
 
       {{#if usemWeaponMalus}}
-      <li>Multiple weapons malus : {{mWeaponMalus}}</li>
+      <li>{{localize "WH.chat.mweaponmalus"}}: {{mWeaponMalus}}</li>
       {{/if}}
       
       {{#if diceFormula}}
         <li>Formula : {{diceFormula}}</li>
         {{#if isCriticalSuccess}}
-          <li><span class="crit-success">Dice result : {{diceResult}}</span></li>
+          <li><span class="crit-success">{{localize "WH.chat.diceresult"}} : {{diceResult}}</span></li>
         {{else}}
           {{#if isCriticalFailure}}
-            <li><span class="crit-failure">Dice result : {{diceResult}}</span></li>
+            <li><span class="crit-failure">{{localize "WH.chat.diceresult"}} : {{diceResult}}</span></li>
           {{else}}
-            <li>Dice result : <span>{{diceResult}}</span></li>
+            <li>{{localize "WH.chat.diceresult"}} : <span>{{diceResult}}</span></li>
           {{/if}}
         {{/if}}
       {{/if}}
@@ -53,7 +53,7 @@
       <li>{{localize "WH.ui.level"}} : {{power.system.level}}</li>
       <li>{{{powerText}}}</li>
       {{else}}
-      <li><strong>Result : {{roll.total}} </strong></li>
+      <li><strong>{{localize "WH.chat.result"}} : {{roll.total}} </strong></li>
       {{/if}}
 
     </ul>  
diff --git a/templates/chat-opposed-fail.html b/templates/chat-opposed-fail.html
deleted file mode 100644
index 4e71d14..0000000
--- a/templates/chat-opposed-fail.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="chat-message-header">
-  <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
-  <h4 class=chat-actor-name>{{defenderName}}</h4>
-</div>
-
-  <hr>
-  <div >
-    {{defenderName}} wins the opposition against {{attackerName}} !
-  </div>
-
-  </div>
diff --git a/templates/chat-parry-result.html b/templates/chat-parry-result.html
index 35e007b..973d1f5 100644
--- a/templates/chat-parry-result.html
+++ b/templates/chat-parry-result.html
@@ -20,19 +20,19 @@
 
       <li>Formula : {{diceFormula}}</li>
       {{#if isCriticalSuccess}}
-        <li><span class="crit-success">Dice result : {{diceResult}}</span></li>
+        <li><span class="crit-success">{{localize "WH.chat.diceresult"}} : {{diceResult}}</span></li>
       {{else}}
         {{#if isCriticalFailure}}
-          <li><span class="crit-failure">Dice result : {{diceResult}}</span></li>
+          <li><span class="crit-failure">{{localize "WH.chat.diceresult"}} : {{diceResult}}</span></li>
         {{else}}
-          <li>Dice result : <span>{{diceResult}}</span></li>
+          <li>{{localize "WH.chat.diceresult"}} : <span>{{diceResult}}</span></li>
         {{/if}}
       {{/if}}
 
       {{#if isSuccess}}
-      <li><strong>Parry success ! </strong></li>
+      <li><strong>{{localize "WH.chat.parysuccess"}} </strong></li>
       {{else}}
-      <li><strong>Parry failed ! </strong></li>
+      <li><strong>{{localize "WH.chat.paryfailed"}} </strong></li>
       {{/if}}
     </ul>  
   </div>
diff --git a/templates/chat-request-defense.html b/templates/chat-request-defense.html
deleted file mode 100644
index f5bda4d..0000000
--- a/templates/chat-request-defense.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<div class="chat-message-header">
-  {{#if actorImg}}
-  <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
-  {{/if}}
-  <h4 class=chat-actor-name>{{alias}}</h4>
-</div>
-
-<hr>
-
-{{#if img}}
-<div>
-  <img class="chat-icon" src="{{img}}" alt="{{name}}" />
-</div>
-{{/if}}
-
-<div class="flexcol">
-</div>
-
-<div>
-  
-  {{#if isRangedAttack}}
-  <div>{{defender.name}} is under Ranged attack. He must roll a Target Roll to defend himself.</div>
-  {{else}}
-  <div>{{defender.name}} is under Melee attack. He must roll a Defense Roll to defend himself.</div>
-  {{/if}}
-
-  <ul>
-    {{#if isRangedAttack}}
-      <li>
-        <button class="chat-card-button roll-defense-ranged" data-roll-id="{{@root.rollId}}">Roll Target !</button>
-      </li>
-    {{else}}
-      <li>
-        {{#each defenderWeapons as |weapon idx|}}
-        <button class="chat-card-button roll-defense-melee" data-defense-weapon-id="{{weapon._id}}"
-          data-roll-id="{{@root.rollId}}">{{weapon.name}}</button>
-        {{/each}}
-      </li>
-    {{/if}}
-    </ul>
-  <!-- <button class="chat-card-button reroll-level-remaining" data-roll-id="{{rollId}}">Reroll</button> -->
-
-  </ul>
-</div>
-
-</div>
\ No newline at end of file
diff --git a/templates/item-armor-sheet.html b/templates/item-armor-sheet.html
index 769bf3e..b7640d8 100644
--- a/templates/item-armor-sheet.html
+++ b/templates/item-armor-sheet.html
@@ -18,7 +18,7 @@
 
         <div class="tab" data-group="primary">
           <ul>
-            <li class="flexrow"><label class="item-field-label-medium ">Type</label>
+            <li class="flexrow"><label class="item-field-label-medium ">{{localize "WH.ui.type"}}</label>
               <select class="item-field-label-medium" type="text" name="system.armortype" value="{{system.armortype}}" data-dtype="String">
                 {{#select system.armortype}}
                   {{#each config.armorTypes as |type key|}}
@@ -28,7 +28,7 @@
               </select> 
             </li>
 
-            <li class="flexrow"><label class="item-field-label-medium ">Damage reduction</label>
+            <li class="flexrow"><label class="item-field-label-medium ">{{localize "WH.ui.damagereduction"}}</label>
               <input type="text" class="item-field-label-medium " name="system.damagereduction" value="{{system.damagereduction}}" data-dtype="Number"/>
             </li>
 
diff --git a/templates/item-class-sheet.html b/templates/item-class-sheet.html
index e7798ce..e11dfd5 100644
--- a/templates/item-class-sheet.html
+++ b/templates/item-class-sheet.html
@@ -12,7 +12,7 @@
 
     <div class="tab details" data-group="primary" data-tab="description">
 
-      <label class="generic-label">Description</label>
+      <label class="generic-label">{{localize "WH.ui.description"}}</label>
       <div class="medium-editor item-text-long-line">
         {{editor description target="system.description" button=true owner=owner editable=editable}}
       </div>
diff --git a/templates/item-shield-sheet.html b/templates/item-shield-sheet.html
index 5aaebc1..5f53d88 100644
--- a/templates/item-shield-sheet.html
+++ b/templates/item-shield-sheet.html
@@ -18,7 +18,7 @@
 
         <div class="tab" data-group="primary">
           <ul>
-            <li class="flexrow"><label class="item-field-label-medium ">Shield type</label>
+            <li class="flexrow"><label class="item-field-label-medium ">{{localize "WH.ui.type"}}</label>
               <select class="item-field-label-long " type="text" name="system.shieldtype" value="{{system.shieldtype}}" data-dtype="String">
                 {{#select system.shieldtype}}
                   {{#each config.armorTypes as |type key|}}
@@ -28,7 +28,7 @@
               </select> 
             </li>
 
-            <li class="flexrow"><label class="item-field-label-medium ">Parry Bonus</label>
+            <li class="flexrow"><label class="item-field-label-medium ">{{localize "WH.ui.parrybonus"}}</label>
               <input type="text" class="item-field-label-medium " name="system.parrybonus" value="{{system.parrybonus}}" data-dtype="Number"/>
             </li>
           
diff --git a/templates/item-spell-sheet.html b/templates/item-spell-sheet.html
deleted file mode 100644
index 8053b4f..0000000
--- a/templates/item-spell-sheet.html
+++ /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-warhero/templates/partial-item-nav.html}}
-
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-
-      {{> systems/fvtt-warhero/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/item-weapon-sheet.html b/templates/item-weapon-sheet.html
index 2a539bb..bf724bf 100644
--- a/templates/item-weapon-sheet.html
+++ b/templates/item-weapon-sheet.html
@@ -18,7 +18,7 @@
 
       <div class="tab" data-group="primary">
         <ul>
-          <li class="flexrow"><label class="item-field-label-long ">Type</label>
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.type"}}</label>
             <select class="item-field-label-medium " type="text" name="system.weapontype" value="{{system.weapontype}}" data-dtype="String">
               {{#select system.weapontype}}
                 {{#each config.weaponTypes as |type key|}}
@@ -29,20 +29,20 @@
           </li>
           
           {{#if (eq system.weapontype "special")}}
-          <li class="flexrow"><label class="item-field-label-vlong2 ">Raw Roll Formula (ex: 1d20+@statistics.str.value)</label>
+          <li class="flexrow"><label class="item-field-label-vlong2 ">{{localize "WH.ui.rawroll"}}</label>
             <input type="text" class="item-field-label-long " name="system.rollformula" value="{{system.rollformula}}" data-dtype="String"/>
           </li>          
-          <li class="flexrow"><label class="item-field-label-vlong2 ">Raw Damage Formula (ex: 1d6+(@statistics.str.value/2))</label>
+          <li class="flexrow"><label class="item-field-label-vlong2 ">{{localize "WH.ui.rawdamage"}}</label>
             <input type="text" class="item-field-label-long " name="system.damageformula" value="{{system.damageformula}}" data-dtype="String"/>
           </li>          
           {{else}}          
-          <li class="flexrow"><label class="item-field-label-long ">Damage</label>
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.damage"}}</label>
             <input type="text" class="item-field-label-medium " name="system.damage" value="{{system.damage}}" data-dtype="String"/>
           </li>
           {{/if}}
           
           {{#if (eq system.weapontype "polearm")}}
-          <li class="flexrow"><label class="item-field-label-long ">Damage 2 arms</label>
+          <li class="flexrow"><label class="item-field-label-long ">{{localize "WH.ui.2hdamage"}}</label>
             <input type="text" class="item-field-label-medium " name="system.damage2hands" value="{{system.damage2hands}}" data-dtype="String"/>
           </li>
           {{/if}}
diff --git a/templates/monster-sheet.html b/templates/monster-sheet.html
index c3a1258..09877ba 100644
--- a/templates/monster-sheet.html
+++ b/templates/monster-sheet.html
@@ -64,12 +64,12 @@
 
   {{!-- Sheet Tab Navigation --}}
   <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="main">Main</a>
-    <a class="item" data-tab="combat">Combat</a>
-    <a class="item" data-tab="skill">Skills&Effects</a>
-    <a class="item" data-tab="power">Powers</a>
-    <a class="item" data-tab="equipment">Equipment</a>
-    <a class="item" data-tab="biodata">Biography</a>
+    <a class="item" data-tab="main">{{localize "WH.ui.main"}}</a>
+    <a class="item" data-tab="combat">{{localize "WH.ui.combat"}}</a>
+    <a class="item" data-tab="skill">{{localize "WH.ui.skillstab"}}</a>
+    <a class="item" data-tab="power">{{localize "WH.ui.powers"}}</a>
+    <a class="item" data-tab="equipment">{{localize "WH.ui.equipment"}}</a>
+    <a class="item" data-tab="biodata">{{localize "WH.ui.biography"}}</a>
   </nav>
 
   {{!-- Sheet Body --}}
@@ -176,7 +176,7 @@
           <ul class="stat-list alternate-list">
             <li class="item flexrow list-item items-title-bg">
               <span class="item-name-label-header-long">
-                <h3><label class="items-title-text">Weapons</label></h3>
+                <h3><label class="items-title-text">{{localize "WH.ui.weapons"}}</label></h3>
               </span>
               <span class="item-field-label-medium">
                 <label class="short-label">{{localize "WH.ui.Type"}}</label>
@@ -192,8 +192,16 @@
               <span class="item-name-label-long"><a class="roll-weapon"><i class="fa-solid fa-dice-d20"></i>{{weapon.name}}</a></span>
 
               <span class="item-field-label-medium">{{weapon.system.weapontype}}</span>
-
+              
+              {{#if (eq system.weapontype "special")}}
+              <span class="item-field-label-medium"><a class="roll-damage"><i class="fa-solid fa-dice-d20"></i>{{weapon.system.damageformula}}</a></span>
+              {{else}}
               <span class="item-field-label-medium"><a class="roll-damage"><i class="fa-solid fa-dice-d20"></i>{{weapon.damageFormula}}</a></span>
+              {{/if}}
+
+              {{#if (eq system.weapontype "polearm")}}
+              <span class="item-field-label-medium"><a class="roll-damage-2hands"><i class="fa-solid fa-dice-d20"></i>{{weapon.damageFormula2Hands}}</a></span>
+              {{/if}}
 
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
@@ -208,7 +216,7 @@
           <ul class="stat-list alternate-list">
             <li class="item flexrow list-item items-title-bg">
               <span class="item-name-label-header-long">
-                <h3><label class="items-title-text">Shields</label></h3>
+                <h3><label class="items-title-text">{{localize "WH.ui.shields"}}</label></h3>
               </span>
               <span class="item-field-label-short">
                 <label class="short-label">{{localize "WH.ui.Type"}}</label>
@@ -240,7 +248,7 @@
           <ul class="stat-list alternate-list">
             <li class="item flexrow list-item items-title-bg">
               <span class="item-name-label-header-long">
-                <h3><label class="items-title-text">Armors</label></h3>
+                <h3><label class="items-title-text">{{localize "WH.ui.armors"}}</label></h3>
               </span>
               <span class="item-field-label-short">
                 <label class="short-label">{{localize "WH.ui.Type"}}</label>
@@ -477,28 +485,20 @@
         <div>
           <ul class="item-list alternate-list">
             <li class="item flexrow">
-              <label class="generic-label">Origin</label>
+              <label class="generic-label">{{localize "WH.ui.origin"}}</label>
               <input type="text" class="" name="system.biodata.origin" value="{{data.biodata.origin}}"
                 data-dtype="String" />
             </li>
             <li class="item flexrow">
-              <label class="generic-label">Age</label>
+              <label class="generic-label">{{localize "WH.ui.age"}}</label>
               <input type="text" class="" name="system.biodata.age" value="{{data.biodata.age}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
-              <label class="generic-label">Height</label>
+              <label class="generic-label">{{localize "WH.ui.height"}}</label>
               <input type="text" class="" name="system.biodata.height" value="{{data.biodata.height}}" data-dtype="String" />
             </li>
-            <li class="item flexrow">
-              <label class="generic-label">Eyes</label>
-              <input type="text" class="" name="system.biodata.eyes" value="{{data.biodata.eyes}}" data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="generic-label">Hair</label>
-              <input type="text" class="" name="system.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
-            </li>
             <li class="flexrow item">
-              <label class="generic-label">Preferred Hand</label>
+              <label class="generic-label">{{localize "WH.ui.preferredhand"}}</label>
               <input type="text" class="" name="system.biodata.preferredhand" value="{{data.biodata.preferredhand}}"
                 data-dtype="String" />
             </li>
@@ -507,7 +507,7 @@
        <div>
           <ul>
             <li class="flexrow item">
-              <label class="generic-label">Size</label>
+              <label class="generic-label">{{localize "WH.ui.size"}}</label>
               <select class="competence-base flexrow" type="text" name="system.biodata.size" value="{{data.biodata.size}}" data-dtype="Number">
                 {{#select data.biodata.size}}
                 <option value="1">Tiny</option>
@@ -520,22 +520,30 @@
               </select> 
             </li>
             <li class="flexrow item">
-              <label class="generic-label">Sex</label>
+              <label class="generic-label">{{localize "WH.ui.gender"}}</label>
               <input type="text" class="" name="system.biodata.sex" value="{{data.biodata.sex}}" data-dtype="String" />
             </li>
+            <li class="item flexrow">
+              <label class="generic-label">{{localize "WH.ui.eyes"}}</label>
+              <input type="text" class="" name="system.biodata.eyes" value="{{data.biodata.eyes}}" data-dtype="String" />
+            </li>
+            <li class="item flexrow">
+              <label class="generic-label">{{localize "WH.ui.hair"}}</label>
+              <input type="text" class="" name="system.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
+            </li>
           </ul>
         </div>
       </div>
 
 
       <hr>
-      <h3>Background : </h3>
+      <h3>{{localize "WH.ui.background"}} : </h3>
       <div class="form-group editor">
         {{editor description target="system.biodata.description" button=true owner=owner
         editable=editable}}
       </div>
       <hr>
-      <h3>Notes : </h3>
+      <h3>{{localize "WH.ui.notes"}} : </h3>
       <div class="form-group editor">
         {{editor notes target="system.biodata.notes" button=true owner=owner editable=editable}}
       </div>
diff --git a/templates/npc-sheet.html b/templates/npc-sheet.html
index ce9f9b7..09877ba 100644
--- a/templates/npc-sheet.html
+++ b/templates/npc-sheet.html
@@ -64,12 +64,12 @@
 
   {{!-- Sheet Tab Navigation --}}
   <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="main">Main</a>
-    <a class="item" data-tab="combat">Combat</a>
-    <a class="item" data-tab="skill">Skills&Effects</a>
-    <a class="item" data-tab="power">Powers</a>
-    <a class="item" data-tab="equipment">Equipment</a>
-    <a class="item" data-tab="biodata">Biography</a>
+    <a class="item" data-tab="main">{{localize "WH.ui.main"}}</a>
+    <a class="item" data-tab="combat">{{localize "WH.ui.combat"}}</a>
+    <a class="item" data-tab="skill">{{localize "WH.ui.skillstab"}}</a>
+    <a class="item" data-tab="power">{{localize "WH.ui.powers"}}</a>
+    <a class="item" data-tab="equipment">{{localize "WH.ui.equipment"}}</a>
+    <a class="item" data-tab="biodata">{{localize "WH.ui.biography"}}</a>
   </nav>
 
   {{!-- Sheet Body --}}
@@ -176,7 +176,7 @@
           <ul class="stat-list alternate-list">
             <li class="item flexrow list-item items-title-bg">
               <span class="item-name-label-header-long">
-                <h3><label class="items-title-text">Weapons</label></h3>
+                <h3><label class="items-title-text">{{localize "WH.ui.weapons"}}</label></h3>
               </span>
               <span class="item-field-label-medium">
                 <label class="short-label">{{localize "WH.ui.Type"}}</label>
@@ -192,8 +192,16 @@
               <span class="item-name-label-long"><a class="roll-weapon"><i class="fa-solid fa-dice-d20"></i>{{weapon.name}}</a></span>
 
               <span class="item-field-label-medium">{{weapon.system.weapontype}}</span>
-
+              
+              {{#if (eq system.weapontype "special")}}
+              <span class="item-field-label-medium"><a class="roll-damage"><i class="fa-solid fa-dice-d20"></i>{{weapon.system.damageformula}}</a></span>
+              {{else}}
               <span class="item-field-label-medium"><a class="roll-damage"><i class="fa-solid fa-dice-d20"></i>{{weapon.damageFormula}}</a></span>
+              {{/if}}
+
+              {{#if (eq system.weapontype "polearm")}}
+              <span class="item-field-label-medium"><a class="roll-damage-2hands"><i class="fa-solid fa-dice-d20"></i>{{weapon.damageFormula2Hands}}</a></span>
+              {{/if}}
 
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
@@ -208,7 +216,7 @@
           <ul class="stat-list alternate-list">
             <li class="item flexrow list-item items-title-bg">
               <span class="item-name-label-header-long">
-                <h3><label class="items-title-text">Shields</label></h3>
+                <h3><label class="items-title-text">{{localize "WH.ui.shields"}}</label></h3>
               </span>
               <span class="item-field-label-short">
                 <label class="short-label">{{localize "WH.ui.Type"}}</label>
@@ -240,7 +248,7 @@
           <ul class="stat-list alternate-list">
             <li class="item flexrow list-item items-title-bg">
               <span class="item-name-label-header-long">
-                <h3><label class="items-title-text">Armors</label></h3>
+                <h3><label class="items-title-text">{{localize "WH.ui.armors"}}</label></h3>
               </span>
               <span class="item-field-label-short">
                 <label class="short-label">{{localize "WH.ui.Type"}}</label>
@@ -378,6 +386,7 @@
       </div>
     </div>
 
+
     {{!-- Powers Tab --}}
     <div class="tab power" data-group="primary" data-tab="power">
 
@@ -476,28 +485,20 @@
         <div>
           <ul class="item-list alternate-list">
             <li class="item flexrow">
-              <label class="generic-label">Origin</label>
+              <label class="generic-label">{{localize "WH.ui.origin"}}</label>
               <input type="text" class="" name="system.biodata.origin" value="{{data.biodata.origin}}"
                 data-dtype="String" />
             </li>
             <li class="item flexrow">
-              <label class="generic-label">Age</label>
+              <label class="generic-label">{{localize "WH.ui.age"}}</label>
               <input type="text" class="" name="system.biodata.age" value="{{data.biodata.age}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
-              <label class="generic-label">Height</label>
+              <label class="generic-label">{{localize "WH.ui.height"}}</label>
               <input type="text" class="" name="system.biodata.height" value="{{data.biodata.height}}" data-dtype="String" />
             </li>
-            <li class="item flexrow">
-              <label class="generic-label">Eyes</label>
-              <input type="text" class="" name="system.biodata.eyes" value="{{data.biodata.eyes}}" data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="generic-label">Hair</label>
-              <input type="text" class="" name="system.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
-            </li>
             <li class="flexrow item">
-              <label class="generic-label">Preferred Hand</label>
+              <label class="generic-label">{{localize "WH.ui.preferredhand"}}</label>
               <input type="text" class="" name="system.biodata.preferredhand" value="{{data.biodata.preferredhand}}"
                 data-dtype="String" />
             </li>
@@ -506,7 +507,7 @@
        <div>
           <ul>
             <li class="flexrow item">
-              <label class="generic-label">Size</label>
+              <label class="generic-label">{{localize "WH.ui.size"}}</label>
               <select class="competence-base flexrow" type="text" name="system.biodata.size" value="{{data.biodata.size}}" data-dtype="Number">
                 {{#select data.biodata.size}}
                 <option value="1">Tiny</option>
@@ -519,22 +520,30 @@
               </select> 
             </li>
             <li class="flexrow item">
-              <label class="generic-label">Sex</label>
+              <label class="generic-label">{{localize "WH.ui.gender"}}</label>
               <input type="text" class="" name="system.biodata.sex" value="{{data.biodata.sex}}" data-dtype="String" />
             </li>
+            <li class="item flexrow">
+              <label class="generic-label">{{localize "WH.ui.eyes"}}</label>
+              <input type="text" class="" name="system.biodata.eyes" value="{{data.biodata.eyes}}" data-dtype="String" />
+            </li>
+            <li class="item flexrow">
+              <label class="generic-label">{{localize "WH.ui.hair"}}</label>
+              <input type="text" class="" name="system.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
+            </li>
           </ul>
         </div>
       </div>
 
 
       <hr>
-      <h3>Background : </h3>
+      <h3>{{localize "WH.ui.background"}} : </h3>
       <div class="form-group editor">
         {{editor description target="system.biodata.description" button=true owner=owner
         editable=editable}}
       </div>
       <hr>
-      <h3>Notes : </h3>
+      <h3>{{localize "WH.ui.notes"}} : </h3>
       <div class="form-group editor">
         {{editor notes target="system.biodata.notes" button=true owner=owner editable=editable}}
       </div>
diff --git a/templates/partial-item-common-equipment.html b/templates/partial-item-common-equipment.html
index 80298cd..95cf073 100644
--- a/templates/partial-item-common-equipment.html
+++ b/templates/partial-item-common-equipment.html
@@ -1,7 +1,7 @@
-<li class="flexrow"><label class="item-field-label-medium ">Slots used</label>
+<li class="flexrow"><label class="item-field-label-medium ">{{localize "WH.ui.slotsused"}}</label>
   <input type="text" class="item-field-label-medium " name="system.slotused" value="{{system.slotused}}" data-dtype="Number"/>
 </li>
-<li class="flexrow"><label class="item-field-label-medium ">Slot location</label>
+<li class="flexrow"><label class="item-field-label-medium ">{{localize "WH.ui.slotlocation"}}</label>
   <select class="item-field-label-long " type="text" name="system.slotlocation" value="{{system.slotlocation}}" data-dtype="String">
     {{#select system.slotlocation}}
       {{#each config.slotNames as |type key|}}
@@ -10,9 +10,9 @@
     {{/select}}
   </select> 
 </li>
-  <li class="flexrow"><label class="item-field-label-medium ">Quantity</label>
+  <li class="flexrow"><label class="item-field-label-medium ">{{localize "WH.ui.quantity"}}</label>
     <input type="text" class="item-field-label-medium " name="system.quantity" value="{{system.quantity}}" data-dtype="Number"/>
   </li>
-  <li class="flexrow"><label class="item-field-label-medium">Cost</label>
+  <li class="flexrow"><label class="item-field-label-medium">{{localize "WH.ui.cost"}}</label>
     <input type="text" class="item-field-label-medium " name="system.cost" value="{{system.cost}}" data-dtype="Number"/>
   </li>
diff --git a/templates/partial-item-description.html b/templates/partial-item-description.html
index 26c9623..af0db77 100644
--- a/templates/partial-item-description.html
+++ b/templates/partial-item-description.html
@@ -1,6 +1,6 @@
 <div class="tab description" data-group="primary" data-tab="description">
   <div>
-    <label class="generic-label">Description</label>
+    <label class="generic-label">{{localize "WH.ui.description"}}</label>
     <div class="medium-editor item-text-long-line">
     {{editor description target="system.description" button=true owner=owner editable=editable}}
     </div>
diff --git a/templates/partial-item-nav.html b/templates/partial-item-nav.html
index 95b52cd..127fc33 100644
--- a/templates/partial-item-nav.html
+++ b/templates/partial-item-nav.html
@@ -1,5 +1,5 @@
 {{!-- Sheet Tab Navigation --}}
 <nav class="sheet-tabs tabs" data-group="primary">
-  <a class="item" data-tab="description">Description</a>
-  <a class="item" data-tab="details">Details</a>
+  <a class="item" data-tab="description">{{localize "WH.ui.description"}}</a>
+  <a class="item" data-tab="details">{{localize "WH.ui.details"}}</a>
 </nav>
diff --git a/templates/partial-options-abilities.html b/templates/partial-options-abilities.html
deleted file mode 100644
index 0efa008..0000000
--- a/templates/partial-options-abilities.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<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-equipment-types.html b/templates/partial-options-equipment-types.html
deleted file mode 100644
index ab60653..0000000
--- a/templates/partial-options-equipment-types.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<option value="camping">Camping & Survival</option>
-<option value="communication">Communication & Information</option>
-<option value="equestrian">Equestrian</option>
-<option value="spy">Law/Security/Spy/Thief</option>
-<option value="medical">Medical</option>
-<option value="tools">Tools</option>
-<option value="weaponaccess">Weapons accessories</option>
-<option value="wizard">Wizards materials</option>
-<option value="mount">Mounts</option>
-<option value="vehicle">Vehicles</option>
-<option value="clothing">Clothing</option>
-<option value="ammo">Ammo</option>
-<option value="misc">Misc</option>
diff --git a/templates/partial-options-level.html b/templates/partial-options-level.html
deleted file mode 100644
index 0fb86c0..0000000
--- a/templates/partial-options-level.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{{#if notapplicable}}
-<option value="notapplicable">Not applicable</option>
-{{/if}}
-<option value="0">0</option>
-<option value="1">d4</option>
-<option value="2">d6</option>
-<option value="3">d8</option>
-<option value="4">d10</option>
-<option value="5">d12</option>
-<option value="6">d12 d4</option>
-<option value="7">d12 d6</option>
-<option value="8">d12 d8</option>
-<option value="9">d12 d10</option>
-<option value="10">d12 d12</option>
diff --git a/templates/partial-options-range.html b/templates/partial-options-range.html
deleted file mode 100644
index e08a1e5..0000000
--- a/templates/partial-options-range.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{{#if notapplicable}}
-<option value="notapplicable">Not applicable</option>
-{{/if}}
-<option value="touch">Self Only</option>
-<option value="touchself">Touch/Self</option>
-<option value="tz">Threat Zone</option>
-<option value="close">Close</option>
-<option value="medium">Medium</option>
-<option value="long">Long</option>
-<option value="extreme">Extreme</option>
-<option value="sight">Line of Sight</option>
-<option value="tz_close">TZ/Close</option>
-<option value="close_medium">Close/Medium</option>
-<option value="medium_long">Medium/Long</option>
-<option value="long_extreme">Long/Extreme</option>
diff --git a/templates/partial-roll-select.html b/templates/partial-roll-select.html
deleted file mode 100644
index 7c9e85f..0000000
--- a/templates/partial-roll-select.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<ul>
-</ul>
-
diff --git a/templates/post-item.html b/templates/post-item.html
index 1bad9c8..8ce0f51 100644
--- a/templates/post-item.html
+++ b/templates/post-item.html
@@ -4,5 +4,5 @@
   <img class="chat-img" src="{{img}}" title="{{name}}" />
   {{/if}}
     <h4><b>Description : </b></h4>
-  <p class="card-content">{{{data.description}}}</p>
+  <p class="card-content">{{{system.description}}}</p>
 </div>
diff --git a/templates/roll-dialog-generic.html b/templates/roll-dialog-generic.html
index 205a410..9256771 100644
--- a/templates/roll-dialog-generic.html
+++ b/templates/roll-dialog-generic.html
@@ -10,19 +10,19 @@
 
       {{#if weapon}}
         <div class="flexrow">
-            <span class="item-field-label-vlong">Weapon : </span>
+            <span class="item-field-label-vlong">{{localize "WH.ui.weapon"}} : </span>
             <span class="item-field-label-vlong">{{weapon.name}}</span>
         </div>
         
         {{#if (eq mode "damage")}}
           {{#if (eq weapon.system.weapontype "special")}}
             <div class="flexrow">
-              <span class="item-field-label-vlong">Damage : </span>
+              <span class="item-field-label-vlong">{{localize "WH.ui.damage"}} : </span>
               <span class="item-field-label-vlong">{{weapon.system.damageformula}}</span>
             </div>
           {{else}}
             <div class="flexrow">
-              <span class="item-field-label-vlong">Damage : </span>
+              <span class="item-field-label-vlong">{{localize "WH.ui.damage"}} : </span>
               {{#if is2hands}}
                 <span class="item-field-label-vlong">{{weapon.damageFormula2Hands}}</span>
               {{else}}
@@ -34,7 +34,7 @@
         {{else}}
           {{#if (eq weapon.system.weapontype "special")}}
           <div class="flexrow">
-            <span class="item-field-label-vlong">Roll Formula : </span>
+            <span class="item-field-label-vlong">{{localize "WH.chat.rollformula"}} : </span>
             <span class="item-field-label-vlong">{{weapon.system.rollformula}}</span>
            </div>
           {{/if}}
@@ -54,7 +54,7 @@
 
         {{#if stat.istxc}}
         <div class="flexrow">
-          <span class="item-field-label-vlong">Multiple weapons malus ({{mWeaponMalus}})? </span>
+          <span class="item-field-label-vlong">{{localize "WH.chat.mweaponmalus}}" ({{mWeaponMalus}})? </span>
           <span class="item-field-label-medium"><input type="checkbox" id="usemWeaponMalus" name="usemWeaponMalus" {{checked usemWeaponMalus}}/></span>          
         {{/if}}
         </div>
@@ -62,7 +62,7 @@
 
       {{#if shield}}
       <div class="flexrow">
-        <span class="item-field-label-vlong">Use shield ? : </span>
+        <span class="item-field-label-vlong">{{localize "WH.chat.useshield"}} : </span>
         <span class="roll-dialog-label">
           <input type="checkbox" id="useshield" name="useshield" {{checked useshield}}/>
         </span>
@@ -75,11 +75,11 @@
 
       {{#if power}}
       <div class="flexrow">
-        <span class="item-field-label-vlong">Power : </span>
+        <span class="item-field-label-vlong">{{localize "WH.chat.power"}} : </span>
         <span class="item-field-label-medium">{{power.name}}</span>
       </div>
       <div class="flexrow">
-        <span class="item-field-label-vlong">Power Level : </span>
+        <span class="item-field-label-vlong">{{localize "WH.chat.powerlevel"}} : </span>
         <span class="item-field-label-medium">{{power.system.level}}</span>
       </div>
       {{/if}}