diff --git a/images/icons/boots1.png b/images/icons/boots1.png
deleted file mode 100644
index 8607f6e..0000000
Binary files a/images/icons/boots1.png and /dev/null differ
diff --git a/images/icons/boots1.webp b/images/icons/boots1.webp
new file mode 100644
index 0000000..fcbdc3c
Binary files /dev/null and b/images/icons/boots1.webp differ
diff --git a/images/icons/boots2.png b/images/icons/boots2.png
deleted file mode 100644
index e694317..0000000
Binary files a/images/icons/boots2.png and /dev/null differ
diff --git a/images/icons/boots2.webp b/images/icons/boots2.webp
new file mode 100644
index 0000000..eb08bf8
Binary files /dev/null and b/images/icons/boots2.webp differ
diff --git a/images/icons/chest1.png b/images/icons/chest1.png
deleted file mode 100644
index f6c8878..0000000
Binary files a/images/icons/chest1.png and /dev/null differ
diff --git a/images/icons/chest1.webp b/images/icons/chest1.webp
new file mode 100644
index 0000000..0ed05bd
Binary files /dev/null and b/images/icons/chest1.webp differ
diff --git a/images/icons/chest2.png b/images/icons/chest2.png
deleted file mode 100644
index 8de41c1..0000000
Binary files a/images/icons/chest2.png and /dev/null differ
diff --git a/images/icons/chest2.webp b/images/icons/chest2.webp
new file mode 100644
index 0000000..09cf449
Binary files /dev/null and b/images/icons/chest2.webp differ
diff --git a/images/icons/cloak1.png b/images/icons/cloak1.png
deleted file mode 100644
index 62039b0..0000000
Binary files a/images/icons/cloak1.png and /dev/null differ
diff --git a/images/icons/cloak1.webp b/images/icons/cloak1.webp
new file mode 100644
index 0000000..acd2241
Binary files /dev/null and b/images/icons/cloak1.webp differ
diff --git a/images/icons/cloak2.png b/images/icons/cloak2.png
deleted file mode 100644
index 8964545..0000000
Binary files a/images/icons/cloak2.png and /dev/null differ
diff --git a/images/icons/cloak2.webp b/images/icons/cloak2.webp
new file mode 100644
index 0000000..7e17b8b
Binary files /dev/null and b/images/icons/cloak2.webp differ
diff --git a/images/icons/focus1.png b/images/icons/focus1.png
deleted file mode 100644
index 69840b7..0000000
Binary files a/images/icons/focus1.png and /dev/null differ
diff --git a/images/icons/focus1.webp b/images/icons/focus1.webp
new file mode 100644
index 0000000..b243cb6
Binary files /dev/null and b/images/icons/focus1.webp differ
diff --git a/images/icons/focus2.png b/images/icons/focus2.png
deleted file mode 100644
index 3a16446..0000000
Binary files a/images/icons/focus2.png and /dev/null differ
diff --git a/images/icons/focus2.webp b/images/icons/focus2.webp
new file mode 100644
index 0000000..c5488b8
Binary files /dev/null and b/images/icons/focus2.webp differ
diff --git a/images/icons/gloves1.png b/images/icons/gloves1.png
deleted file mode 100644
index 874664d..0000000
Binary files a/images/icons/gloves1.png and /dev/null differ
diff --git a/images/icons/gloves1.webp b/images/icons/gloves1.webp
new file mode 100644
index 0000000..bd69299
Binary files /dev/null and b/images/icons/gloves1.webp differ
diff --git a/images/icons/gloves2.png b/images/icons/gloves2.png
deleted file mode 100644
index bfc3b77..0000000
Binary files a/images/icons/gloves2.png and /dev/null differ
diff --git a/images/icons/gloves2.webp b/images/icons/gloves2.webp
new file mode 100644
index 0000000..8e30ec5
Binary files /dev/null and b/images/icons/gloves2.webp differ
diff --git a/images/icons/helmet1.png b/images/icons/helmet1.png
deleted file mode 100644
index 79253ff..0000000
Binary files a/images/icons/helmet1.png and /dev/null differ
diff --git a/images/icons/helmet1.webp b/images/icons/helmet1.webp
new file mode 100644
index 0000000..4de7483
Binary files /dev/null and b/images/icons/helmet1.webp differ
diff --git a/images/icons/helmet2.png b/images/icons/helmet2.png
deleted file mode 100644
index 3511d0d..0000000
Binary files a/images/icons/helmet2.png and /dev/null differ
diff --git a/images/icons/helmet2.webp b/images/icons/helmet2.webp
new file mode 100644
index 0000000..36c4768
Binary files /dev/null and b/images/icons/helmet2.webp differ
diff --git a/images/icons/legs1.png b/images/icons/legs1.png
deleted file mode 100644
index 3999674..0000000
Binary files a/images/icons/legs1.png and /dev/null differ
diff --git a/images/icons/legs1.webp b/images/icons/legs1.webp
new file mode 100644
index 0000000..faee447
Binary files /dev/null and b/images/icons/legs1.webp differ
diff --git a/images/icons/legs2.png b/images/icons/legs2.png
deleted file mode 100644
index 9950629..0000000
Binary files a/images/icons/legs2.png and /dev/null differ
diff --git a/images/icons/legs2.webp b/images/icons/legs2.webp
new file mode 100644
index 0000000..2e069db
Binary files /dev/null and b/images/icons/legs2.webp differ
diff --git a/images/icons/ring1.png b/images/icons/ring1.png
deleted file mode 100644
index c06ba5a..0000000
Binary files a/images/icons/ring1.png and /dev/null differ
diff --git a/images/icons/ring1.webp b/images/icons/ring1.webp
new file mode 100644
index 0000000..85318d9
Binary files /dev/null and b/images/icons/ring1.webp differ
diff --git a/images/icons/ring2.png b/images/icons/ring2.png
deleted file mode 100644
index 080b856..0000000
Binary files a/images/icons/ring2.png and /dev/null differ
diff --git a/images/icons/ring2.webp b/images/icons/ring2.webp
new file mode 100644
index 0000000..f0be479
Binary files /dev/null and b/images/icons/ring2.webp differ
diff --git a/images/icons/shield1.png b/images/icons/shield1.png
deleted file mode 100644
index 820e723..0000000
Binary files a/images/icons/shield1.png and /dev/null differ
diff --git a/images/icons/shield1.webp b/images/icons/shield1.webp
new file mode 100644
index 0000000..a6c5bdd
Binary files /dev/null and b/images/icons/shield1.webp differ
diff --git a/images/icons/shield2.png b/images/icons/shield2.png
deleted file mode 100644
index 04332a3..0000000
Binary files a/images/icons/shield2.png and /dev/null differ
diff --git a/images/icons/shield2.webp b/images/icons/shield2.webp
new file mode 100644
index 0000000..f66c5ee
Binary files /dev/null and b/images/icons/shield2.webp differ
diff --git a/images/icons/weapon1.png b/images/icons/weapon1.png
deleted file mode 100644
index a58b9e2..0000000
Binary files a/images/icons/weapon1.png and /dev/null differ
diff --git a/images/icons/weapon1.webp b/images/icons/weapon1.webp
new file mode 100644
index 0000000..15ad3f5
Binary files /dev/null and b/images/icons/weapon1.webp differ
diff --git a/images/icons/weapon2.png b/images/icons/weapon2.png
deleted file mode 100644
index 9b9de03..0000000
Binary files a/images/icons/weapon2.png and /dev/null differ
diff --git a/images/icons/weapon2.webp b/images/icons/weapon2.webp
new file mode 100644
index 0000000..78ec568
Binary files /dev/null and b/images/icons/weapon2.webp differ
diff --git a/modules/avd12-commands.js b/modules/avd12-commands.js
index a0713e2..4999d16 100644
--- a/modules/avd12-commands.js
+++ b/modules/avd12-commands.js
@@ -8,10 +8,10 @@ export class Avd12Commands {
 
   static init() {
     if (!game.system.avd12.commands) {
-      const crucibleCommands = new CrucibleCommands();
+      const avd12Commands = new Avd12Commands();
       //crucibleCommands.registerCommand({ path: ["/char"], func: (content, msg, params) => crucibleCommands.createChar(msg), descr: "Create a new character" });
       //crucibleCommands.registerCommand({ path: ["/pool"], func: (content, msg, params) => crucibleCommands.poolRoll(msg), descr: "Generic Roll Window" });
-      game.system.avd12.commands = crucibleCommands;
+      game.system.avd12.commands = avd12Commands;
     }
   }
   constructor() {
diff --git a/modules/avd12-item-sheet.js b/modules/avd12-item-sheet.js
index c8f9643..e272981 100644
--- a/modules/avd12-item-sheet.js
+++ b/modules/avd12-item-sheet.js
@@ -11,7 +11,7 @@ export class Avd12ItemSheet extends ItemSheet {
 
     return mergeObject(super.defaultOptions, {
       classes: ["fvtt-avd12", "sheet", "item"],
-      template: "systems/fvtt-avd12/templates/item-sheet.html",
+      template: "systems/fvtt-avd12/templates/item-sheet.hbs",
       dragDrop: [{ dragSelector: null, dropSelector: null }],
       width: 620,
       height: 550,
@@ -150,7 +150,7 @@ export class Avd12ItemSheet extends ItemSheet {
   /* -------------------------------------------- */
   get template() {
     let type = this.item.type;
-    return `systems/avd12/templates/items/item-${type}-sheet.html`
+    return `systems/fvtt-avd12/templates/items/item-${type}-sheet.hbs`
   }
 
   /* -------------------------------------------- */
diff --git a/modules/avd12-item.js b/modules/avd12-item.js
index e5d15ab..b327de6 100644
--- a/modules/avd12-item.js
+++ b/modules/avd12-item.js
@@ -1,18 +1,18 @@
 import { Avd12Utility } from "./avd12-utility.js";
 
 export const defaultItemImg = {
-  skill: "systems/fvtt-crucible-rpg/images/icons/icon_skill.webp",
-  armor: "systems/fvtt-crucible-rpg/images/icons/icon_armour.webp",
-  weapon: "systems/fvtt-crucible-rpg/images/icons/icon_weapon.webp",
-  equipment: "systems/fvtt-crucible-rpg/images/icons/icon_equipment.webp",
-  money: "systems/fvtt-crucible-rpg/images/icons/icon_money.webp",
+  skill: "systems/fvtt-avd12/images/icons/icon_skill.webp",
+  armor: "systems/fvtt-avd12/images/icons/icon_armour.webp",
+  weapon: "systems/fvtt-avd12/images/icons/icon_weapon.webp",
+  equipment: "systems/fvtt-avd12/images/icons/icon_equipment.webp",
+  money: "systems/fvtt-avd12/images/icons/icon_money.webp",
 }
 
 /**
  * Extend the basic ItemSheet with some very simple modifications
  * @extends {ItemSheet}
  */
-export class CrucibleItem extends Item {
+export class Avd12Item extends Item {
 
   constructor(data, context) {
     if (!data.img) {
diff --git a/modules/avd12-npc-sheet.js b/modules/avd12-npc-sheet.js
index ef40dc9..7bba8ab 100644
--- a/modules/avd12-npc-sheet.js
+++ b/modules/avd12-npc-sheet.js
@@ -6,7 +6,7 @@
 import { Avd12Utility } from "./avd12-utility.js";
 
 /* -------------------------------------------- */
-export class CrucibleNPCSheet extends ActorSheet {
+export class Avd12NPCSheet extends ActorSheet {
 
   /** @override */
   static get defaultOptions() {
diff --git a/modules/avd12-utility.js b/modules/avd12-utility.js
index 7c558f2..1be6b7e 100644
--- a/modules/avd12-utility.js
+++ b/modules/avd12-utility.js
@@ -17,7 +17,7 @@ export class Avd12Utility {
     this.rollDataStore = {}
     this.defenderStore = {}
 
-    CrucibleCommands.init();
+    Avd12Commands.init();
 
     Handlebars.registerHelper('count', function (list) {
       return list.length;
@@ -98,7 +98,7 @@ export class Avd12Utility {
   static async chatListeners(html) {
 
     html.on("click", '.view-item-from-chat', event => {
-      game.system.crucible.creator.openItemView(event)
+      game.system.avd12.creator.openItemView(event)
     })
     html.on("click", '.roll-defense-melee', event => {
       let rollId = $(event.currentTarget).data("roll-id")
@@ -127,7 +127,9 @@ export class Avd12Utility {
       'systems/fvtt-avd12/templates/actors/editor-notes-gm.hbs',
       'systems/fvtt-avd12/templates/items/partial-item-nav.hbs',
       'systems/fvtt-avd12/templates/items/partial-item-description.hbs',
-      'systems/fvtt-avd12/templates/items/partial-options-weapons-types.hbs'
+      'systems/fvtt-avd12/templates/items/partial-options-weapon-types.hbs',
+      'systems/fvtt-avd12/templates/items/partial-options-weapon-categories.hbs',
+      'systems/fvtt-avd12/templates/items/partial-common-item-fields.hbs'
     ]
     return loadTemplates(templatePaths);
   }
@@ -200,7 +202,7 @@ export class Avd12Utility {
   }
   /* -------------------------------------------- */
   static saveRollData(rollData) {
-    game.socket.emit("system.crucible-rpg", {
+    game.socket.emit("system.fvtt-avd12", {
       name: "msg_update_roll", data: rollData
     }); // Notify all other clients of the roll    
     this.updateRollData(rollData)
@@ -426,7 +428,7 @@ export class Avd12Utility {
   }
 
   /* -------------------------------------------- */
-  static async rollCrucible(rollData) {
+  static async rollAvd12(rollData) {
 
     let actor = game.actors.get(rollData.actorId)
 
diff --git a/system.json b/system.json
index a8d9af7..f2252c5 100644
--- a/system.json
+++ b/system.json
@@ -6,12 +6,6 @@
   "gridDistance": 5,
   "gridUnits": "m",
   "languages": [
-    {
-      "lang": "en",
-      "name": "English",
-      "path": "lang/en.json",
-      "flags": {}
-    }
   ],
   "authors": [
     {
@@ -23,7 +17,7 @@
   "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-avd12/raw/branch/master/system.json",
   "compatibility": {
     "minimum": "10",
-    "verified": "10.288",
+    "verified": "10",
     "maximum": "10"
   },
   "id": "fvtt-avd12",
@@ -36,7 +30,7 @@
     "styles/simple.css"
   ],
   "title": "AnyVenture D12 RPG",
-  "url": "https://www.uberwald.me/data/files/fvtt-avd12",
+  "url": "https://www.uberwald.me/gitea/uberwald/fvtt-avd12",
   "version": "10.0.0",
   "download": "https://www.uberwald.me/gitea/uberwald/fvtt-avd12/archive/fvtt-avd12-v10.0.0.zip",
   "background": "systems/fvtt-avd12/images/ui/avd12_welcome_page.webp"
diff --git a/templates/items/item-weapon-sheet.hbs b/templates/items/item-weapon-sheet.hbs
index 61197e9..ebdf9dc 100644
--- a/templates/items/item-weapon-sheet.hbs
+++ b/templates/items/item-weapon-sheet.hbs
@@ -21,7 +21,7 @@
           <li class="flexrow"><label class="item-field-label-long">Weapon type</label>
             <select class="competence-base flexrow" type="text" name="system.weapontype" value="{{system.weapontype}}" data-dtype="String">
               {{#select system.weapontype}}
-                {{> systems/fvtt-avd12/templates/items/partial-weapon-types.hbs}}
+                {{> systems/fvtt-avd12/templates/items/partial-options-weapon-types.hbs}}
               {{/select}}
             </select> 
           </li>
@@ -29,7 +29,7 @@
           <li class="flexrow"><label class="item-field-label-long">Weapon category</label>
             <select class="competence-base flexrow" type="text" name="system.category" value="{{system.category}}" data-dtype="String">
               {{#select system.category}}
-                {{> systems/fvtt-avd12/templates/items/partial-weapon-categories.hbs}}
+                {{> systems/fvtt-avd12/templates/items/partial-options-weapon-categories.hbs}}
               {{/select}}
             </select> 
           </li>