diff --git a/system.json b/system.json
index 88020fc..ebe9e51 100644
--- a/system.json
+++ b/system.json
@@ -148,11 +148,11 @@
   "styles": [
     "styles/simple.css"
   ],
-  "templateVersion": 4,
+  "templateVersion": 5,
   "title": "Crucible RPG",
   "manifest": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg/raw/master/system.json",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg/archive/fvtt-crucible-rpg-v0.1.6.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg/archive/fvtt-crucible-rpg-v0.1.7.zip",
   "url": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "background" : "./images/ui/crucible_welcome_page.webp"
 }
diff --git a/template.json b/template.json
index 3a47919..1285798 100644
--- a/template.json
+++ b/template.json
@@ -118,6 +118,12 @@
       "cost": 0,
       "description":""
     },
+    "shield": {
+      "shielddie": "",
+      "equipped": false,
+      "cost": 0,
+      "description":""
+    },
     "equipment": {
       "equiptype": "",
       "cost": 0,
diff --git a/templates/chat-create-actor.html b/templates/chat-create-actor.html
deleted file mode 100644
index 3b2a9af..0000000
--- a/templates/chat-create-actor.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<div class="chat-message-header">
-  <img class="actor-icon" src="{{img}}" alt="{{alias}}" />
-  <h4 class=chat-actor-name>{{name}}</h4>
-</div>
-
-<hr>
-<div class="flexcol">
-
-  {{#if (eq step "select-race")}}
-  <div>Select a race from the list below</div>
-    <table class="table-create-actor">
-      {{#each races as |race index|}}
-      <tr>
-        <td><a class="view-item-from-chat" data-step="{{@root.step}}" data-item-id="{{race._id}}">{{race.name}}</a></td>
-        <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-item-id="{{race._id}}" >Select it !</a></td>
-      </tr>
-      {{/each}}
-    </table>  
-  {{/if}}
-
-  {{#if (eq step "select-race-optionnal")}}
-  <div>The selected Race has some optionnal abilities. Select one ability by clicking the relevant button below<br>
-    Remaining abilities to select : {{nboptionnal}}
-  </div>
-    <table class="table-create-actor">
-      {{#each optionnalabilities as |ability index|}}
-      <tr>
-        <td><a class="view-item-from-chat" data-step="{{@root.step}}" data-item-id="{{ability._id}}">{{ability.name}}</a></td>
-        <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-item-id="{{ability._id}}" >Select it !</a></td>
-      </tr>
-      {{/each}}
-    </table>  
-  {{/if}}
-
-  {{#if (eq step "select-race-stats")}}
-  <div>Select Stats to gain +1 modifier : <br>
-    Remaining stats to select : {{numberstats}}
-  </div>
-    <table class="table-create-actor">
-      {{#each stats as |stat key|}}
-      {{#if @root.statsonlyonce}}
-        {{#if stat.used}}
-        {{else}}
-            <tr>
-              <td>{{stat.label}} ({{stat.abbrev}})</td>
-              <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-stat-key="{{key}}" >Select it !</a></td>
-            </tr>
-        {{/if}}
-      {{else}}
-        <tr>
-          <td>{{stat.label}} ({{stat.abbrev}})</td>
-          <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-stat-key="{{key}}" >Select it !</a></td>
-        </tr>
-      {{/if}}
-      {{/each}}
-    </table>  
-  {{/if}}
-
-  {{#if (eq step "select-race-perks")}}
-  <div>Now select {{nbraceperks}} Perk(s) for your character
-  </div>
-  <table class="table-create-actor">
-    {{#each raceperks as |perk index|}}
-    <tr>
-      <td><a class="view-item-from-chat" data-step="{{@root.step}}" data-item-id="{{perk._id}}">{{perk.name}}</a></td>
-      <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-item-id="{{perk._id}}" >Select it !</a></td>
-    </tr>
-    {{/each}}
-  </table>  
-  {{/if}}
-
-  {{#if (eq step "select-role")}}
-  <div>Now select a Role for your character.
-  </div>
-  <table class="table-create-actor">
-    {{#each roles as |role index|}}
-    <tr>
-      <td><a class="view-item-from-chat" data-step="{{@root.step}}" data-item-id="{{role._id}}">{{role.name}}</a></td>
-      <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-item-id="{{role._id}}" >Select it !</a></td>
-    </tr>
-    {{/each}}
-  </table>  
-  {{/if}}
-
-  {{#if (eq step "select-role-start-spec")}}
-  <div>Choose 1 Specialisation at +1DT : 
-  </div>
-  <table class="table-create-actor">
-    {{#each rolestartspec as |spec index|}}
-    <tr>
-      <td><a class="view-item-from-chat" data-step="{{@root.step}}" data-item-id="{{spec._id}}">{{spec.name}}</a></td>
-      <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-item-id="{{spec._id}}" >Select it !</a></td>
-    </tr>
-    {{/each}}
-  </table>  
-  {{/if}}
-  
-  {{#if (eq step "select-role-stat")}}
-  <div>Choose 1 Stat at +1DT : 
-  </div>
-  <table class="table-create-actor">
-    {{#each rolestats as |rolestat key|}}
-      <tr>
-        <td>{{rolestat.label}}</td>
-        <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-stat-key="{{rolestat.abbrev}}">Select it !</a></td>
-      </tr>
-    {{/each}}
-  </table>  
-  {{/if}}
-
-  {{#if (eq step "select-role-spec")}}
-  <div>Now select a specialisation at +{{dt}}DT.
-  </div>
-  <table class="table-create-actor">
-    {{#each rolespec as |spec index|}}
-    <tr>
-      <td><a class="view-item-from-chat" data-step="{{@root.step}}" data-item-id="{{spec._id}}">{{spec.name}}</a></td>
-      <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-item-id="{{spec._id}}" >Select it !</a></td>
-    </tr>
-    {{/each}}
-  </table>  
-  {{/if}}
-
-  {{#if (eq step "select-role-perk")}}
-  <div>Now select a Perk.
-  </div>
-  <table class="table-create-actor">
-    {{#each roleperks as |perk index|}}
-    <tr>
-      <td><a class="view-item-from-chat" data-step="{{@root.step}}" data-item-id="{{perk._id}}">{{perk.name}}</a></td>
-      <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-item-id="{{perk._id}}" >Select it !</a></td>
-    </tr>
-    {{/each}}
-  </table>  
-  {{/if}}
-
-  {{#if (eq step "character-end")}}
-  <div>Follow the next steps from the rulebook page 50 !. You can now spend 150 CDPs to customise your character.
-  </div>
-  {{/if}}
-  
-
-</div>
diff --git a/templates/item-condition-sheet.html b/templates/item-condition-sheet.html
index 5e3e3ce..1410353 100644
--- a/templates/item-condition-sheet.html
+++ b/templates/item-condition-sheet.html
@@ -5,7 +5,7 @@
       <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
     </div>
   </header>
-  {{> systems/fvtt-pegasus-rpg/templates/partial-item-nav.html}}
+  {{> systems/fvtt-crucible-rpg/templates/partial-item-nav.html}}
 
   {{!-- Sheet Body --}}
   <section class="sheet-body">
diff --git a/templates/item-race-sheet.html b/templates/item-race-sheet.html
index 5e3e3ce..1410353 100644
--- a/templates/item-race-sheet.html
+++ b/templates/item-race-sheet.html
@@ -5,7 +5,7 @@
       <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
     </div>
   </header>
-  {{> systems/fvtt-pegasus-rpg/templates/partial-item-nav.html}}
+  {{> systems/fvtt-crucible-rpg/templates/partial-item-nav.html}}
 
   {{!-- Sheet Body --}}
   <section class="sheet-body">