diff --git a/templates/actor/parts/actor-items.hbs b/templates/actor/parts/actor-items.hbs
index ec0aa0c..5ef214d 100644
--- a/templates/actor/parts/actor-items.hbs
+++ b/templates/actor/parts/actor-items.hbs
@@ -2,36 +2,83 @@
   <div>
     <ol class="items-list">
       <li class="item flexrow items-header">
-        <div class="item-name"  style="flex:4;">{{ localize 'IDENTITY.name'}}</div>
+        <div
+          class="item-name"
+          style="flex:4;"
+        >{{ localize
+          'IDENTITY.name'}}</div>
         <div class="item-quantity">{{ localize 'VERMINE.qty'}}</div>
         <div class="item-weight">{{ localize 'VERMINE.weight'}}</div>
         <div class="item-controls">
-          <a class="item-control item-create" title="Create item" data-type="item"><i class="fas fa-plus"></i></a>
+          <a
+            class="item-control item-create"
+            title="Create item"
+            data-type="item"
+          ><i class="fas fa-plus"></i></a>
         </div>
       </li>
       {{#each gear as |item id|}}
-        <li class="item flexrow flex-group-center" data-item-id="{{item._id}}">
-          <div class="item-name" style="flex:4;">
+        <li
+          class="item flexrow flex-group-center"
+          data-item-id="{{item._id}}"
+        >
+          <div
+            class="item-name"
+            style="flex:4;"
+          >
             <div class="item-image">
-              <a class="item-control item-edit" data-roll-type="item"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></a>
+              <a
+                class="item-control item-edit"
+                data-roll-type="item"
+              ><img
+                  src="{{item.img}}"
+                  title="{{item.name}}"
+                  width="24"
+                  height="24"
+                /></a>
             </div>
-            <a class="item-control item-edit" title="Edit Item">{{item.name}}</a>
+            <a
+              class="item-control item-edit"
+              data-tooltip="Edit Item"
+            >{{item.name}} </a>
+
+            {{#if item.system.damages.value}}
+              /
+              <span data-tooltip="{{item.damagedLabel}}">{{{item.damagedIcon}}}</span>
+            {{/if}}
+
           </div>
-          <p><a class="item-control item-edit" title="Edit Item">{{item.system.quantity}}</a></p>
-          <p><a class="item-control item-edit" title="Edit Item">{{item.system.weight}}</a></p>
+          <p><a
+              class="item-control item-edit"
+              title="Edit Item"
+            >{{item.system.quantity}}</a></p>
+          <p><a
+              class="item-control item-edit"
+              title="Edit Item"
+            >{{item.system.weight}}</a></p>
           <div class="item-controls">
-            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+            <a
+              class="item-control item-delete"
+              title="Delete Item"
+            ><i class="fas fa-trash"></i></a>
           </div>
         </li>
       {{/each}}
-    </ol>    
-  </div> 
+    </ol>
+  </div>
   <div>
     <h4>{{ localize 'IDENTITY.notes'}}</h4>
-    {{editor system.equipment.description target="system.equipment.description" button=true owner=owner editable=editable}}
-  </div> 
+    {{editor system.equipment.description target="system.equipment.description"
+    button=true owner=owner editable=editable}}
+  </div>
 </div>
-<h4>{{localize 'ITEMS.weapons'}}</h4>
-{{> "systems/vermine2047/templates/actor/parts/actor-weapons.hbs"}}
-<h4>{{localize 'ITEMS.defenses'}}</h4>
-{{> "systems/vermine2047/templates/actor/parts/actor-defenses.hbs"}}
+<div class="grid grid-2">
+  <div class="weapons">
+    <h4>{{localize 'ITEMS.weapons'}}</h4>
+    {{> "systems/vermine2047/templates/actor/parts/actor-weapons.hbs"}}
+  </div>
+  <div class="protections">
+    <h4>{{localize 'ITEMS.defenses'}}</h4>
+    {{> "systems/vermine2047/templates/actor/parts/actor-defenses.hbs"}}
+  </div>
+</div>
\ No newline at end of file
diff --git a/templates/item/item-rite-sheet.html b/templates/item/item-rite-sheet.html
index 6080b56..bc08c20 100644
--- a/templates/item/item-rite-sheet.html
+++ b/templates/item/item-rite-sheet.html
@@ -1,55 +1,41 @@
 {{!-- This template is a fallback for when items don't have more specific templates. --}}
 {{!-- Generally, you'll want to make more specific templates when possible. --}}
 <form class="{{cssClass}} form" autocomplete="off">
-  <header class="sheet-header">
-    <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
-    <div class="header-fields">
-      <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-    </div>
-  </header>
+	{{> "systems/vermine2047/templates/item/partials/header.hbs"}}
 
-  {{!-- Sheet Tab Navigation --}}
-  <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item active" data-tab="description">{{ localize "VERMINE.stats" }}</a>
-    <a class="item" data-tab="details">{{ localize "ITEMS.details" }}</a>
-  </nav>
 
-  {{!-- Sheet Body --}}
-  <section class="sheet-body">
-    <div class="tab flexrow gap-4" data-group="primary" data-tab="description">
-      <aside style="flex:20%;">
-        <div class="resource">
-          
-          <label class="resource-label">{{ localize "VERMINE.ability"}}</label>
-          <select name="system.ability" data-dtype="String">
-            <option value="">-- Aucune --</option>
-            {{#each config.abilities as |ability akey| }}
-              <option value="{{ akey }}"{{#if (eq akey @root.system.ability)}} selected="selected"{{/if}}>{{ localize ability}}</option>
-            {{/each}}
-          </select>
-        </div> 
-      </aside>    
-      <main style="flex:10">
-          <div class="editor-wrapper">
-            {{editor system.description target="system.description" button=true owner=owner editable=editable}}
-          </div>
-        </main>
-      </div>
-      <div class="tab" data-group="primary" data-tab="details">
-          <div class="grid">
-            <div>
-              <h4>{{ localize 'ITEMS.rituel'}}</h4>
-              <textarea name="system.rituel">{{ system.rituel }}</textarea>
-            </div>
-            <div>
-                <h4>{{ localize 'ITEMS.transe'}}</h4>
-                <textarea name="system.transe">{{ system.transe }}</textarea>
-            </div>
-          </div>
-          <h4>{{ localize 'ITEMS.effects'}}</h4>            
-          <div class="editor-wrapper">
-            {{editor system.effects target="system.effects" button=true owner=owner editable=editable}}
-          </div>
-      </div>
-  </section>
+	{{!-- Sheet Body --}}
+	<section class="sheet-body">
+		<aside style="flex:20%;">
+			<div class="resource">
+
+				<label class="resource-label">{{ localize "VERMINE.ability"}}</label>
+				<select name="system.ability" data-dtype="String">
+					<option value="">-- Aucune --</option>
+					{{#each config.abilities as |ability akey| }}
+						<option value="{{ akey }}" {{#if (eq akey @root.system.ability)}} selected="selected" {{/if}}>{{ localize ability}}</option>
+					{{/each}}
+				</select>
+			</div>
+		</aside>
+		<main style="flex:10">
+			<div class="editor-wrapper">
+				{{editor system.description target="system.description" button=true owner=owner editable=editable}}
+			</div>
+		</main>
+		<div class="grid">
+			<div>
+				<h4>{{ localize 'ITEMS.rituel'}}</h4>
+				<textarea name="system.rituel">{{ system.rituel }}</textarea>
+			</div>
+			<div>
+				<h4>{{ localize 'ITEMS.transe'}}</h4>
+				<textarea name="system.transe">{{ system.transe }}</textarea>
+			</div>
+		</div>
+		<h4>{{ localize 'ITEMS.effects'}}</h4>
+		<div class="editor-wrapper">
+			{{editor system.effects target="system.effects" button=true owner=owner editable=editable}}
+		</div>
+	</div>
 </form>
diff --git a/templates/item/item-rumor-sheet.html b/templates/item/item-rumor-sheet.html
index 61673f5..49397f7 100644
--- a/templates/item/item-rumor-sheet.html
+++ b/templates/item/item-rumor-sheet.html
@@ -1,24 +1,11 @@
 <form class="{{cssClass}}" autocomplete="off">
-  <header class="sheet-header">
-    <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
-    <div class="header-fields">
-      <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-    </div>
-  </header>
+	{{> "systems/vermine2047/templates/item/partials/header.hbs"}}
 
 
-  {{!-- Sheet Tab Navigation --}}
-  <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item active" data-tab="description">Description</a>
-  </nav>
+	{{!-- Sheet Body --}}
+	<section class="sheet-body">
 
-  {{!-- Sheet Body --}}
-  <section class="sheet-body">
+		{{editor system.description target="system.description" rollData=rollData button=true owner=owner editable=editable}}
 
-    {{!-- Description Tab --}}
-    <div class="tab" data-group="primary" data-tab="description">
-      {{editor system.description target="system.description" rollData=rollData button=true owner=owner editable=editable}}
-    </div>
-
-  </section>
+	</section>
 </form>
diff --git a/templates/item/item-target-sheet.html b/templates/item/item-target-sheet.html
index 61673f5..49397f7 100644
--- a/templates/item/item-target-sheet.html
+++ b/templates/item/item-target-sheet.html
@@ -1,24 +1,11 @@
 <form class="{{cssClass}}" autocomplete="off">
-  <header class="sheet-header">
-    <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
-    <div class="header-fields">
-      <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-    </div>
-  </header>
+	{{> "systems/vermine2047/templates/item/partials/header.hbs"}}
 
 
-  {{!-- Sheet Tab Navigation --}}
-  <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item active" data-tab="description">Description</a>
-  </nav>
+	{{!-- Sheet Body --}}
+	<section class="sheet-body">
 
-  {{!-- Sheet Body --}}
-  <section class="sheet-body">
+		{{editor system.description target="system.description" rollData=rollData button=true owner=owner editable=editable}}
 
-    {{!-- Description Tab --}}
-    <div class="tab" data-group="primary" data-tab="description">
-      {{editor system.description target="system.description" rollData=rollData button=true owner=owner editable=editable}}
-    </div>
-
-  </section>
+	</section>
 </form>
diff --git a/templates/item/item-vehicle-sheet.html b/templates/item/item-vehicle-sheet.html
index f69f1a3..9b387ef 100644
--- a/templates/item/item-vehicle-sheet.html
+++ b/templates/item/item-vehicle-sheet.html
@@ -1,34 +1,23 @@
 <form class="{{cssClass}}" autocomplete="off">
-	<header class="sheet-header">
-		<img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
-		<div class="header-fields">
-			<h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-		</div>
-	</header>
+	{{> "systems/vermine2047/templates/item/partials/header.hbs"}}
+
 
 	<section class="sheet-body">
 		{{> "systems/vermine2047/templates/item/partials/traits.html"}}
 
 
-		<div class=" flexcol" data-group="primary" data-tab="description">
-			<div class="flexrow">
-				<div class="resource">
-					<label class="resource-label">{{ localize "VERMINE.mobility"}}</label>
+		<div class="flexrow">
+			<div class="resource flexrow align-center">
+				<label class="resource-label">{{ localize "VERMINE.mobility"}}</label>
+				<div class="hexa">
 					<input type="number" name="system.mobility" value="{{system.mobility}}" data-dtype="Number"/>
 				</div>
-				<div class="resource">
-					<label class="resource-label">{{ localize "VERMINE.rarity"}}</label>
-					<input type="number" name="system.rarity" value="{{system.rarity}}" data-dtype="Number"/>
-				</div>
-				<div class="resource">
-					<label class="resource-label">{{ localize "VERMINE.reliability"}}</label>
-					<input type="number" name="system.reliability" value="{{system.reliability}}" data-dtype="Number"/>
-				</div>
 			</div>
-			<h2>Description</h2>
-			{{editor system.description target="system.description" rollData=rollData button=true owner=owner editable=editable}}
+
+
 		</div>
-		{{> "systems/vermine2047/templates/item/partials/damages.html"}}
+		{{> "systems/vermine2047/templates/item/partials/physicalItems.hbs"}}
+
 
 	</section>
 </form>
diff --git a/templates/item/item-weapon-sheet.html b/templates/item/item-weapon-sheet.html
index 6d03ac9..ca7d602 100644
--- a/templates/item/item-weapon-sheet.html
+++ b/templates/item/item-weapon-sheet.html
@@ -1,5 +1,4 @@
 <form class="{{cssClass}}" autocomplete="off">
-	{{log this}}
 	{{> "systems/vermine2047/templates/item/partials/header.hbs"}}