diff --git a/modules/avd12-actor.js b/modules/avd12-actor.js
index 3a20925..f097d0c 100644
--- a/modules/avd12-actor.js
+++ b/modules/avd12-actor.js
@@ -242,8 +242,8 @@ export class Avd12Actor extends Actor {
   }
   /* -------------------------------------------- */
   prepareWeapon(weapon) {
-    console.log(weapon)
-    weapon.attackBonus = this.system.bonus.weapon.attack + this.system.bonus[weapon.system.weapontype].attack
+    //console.log(weapon)
+    weapon.attackBonus = this.system.bonus.weapon.attack + weapon.system.attackbonus + this.system.bonus[weapon.system.weapontype].attack
     let bonusDamage = this.system.bonus.weapon.damage + this.system.bonus[weapon.system.weapontype].damage
     this.addDamages(weapon.system.damages.primary, bonusDamage)
     bonusDamage = this.system.bonus.weapon.damage + this.system.bonus[weapon.system.weapontype].crits
diff --git a/system.json b/system.json
index 36f4e1d..602380c 100644
--- a/system.json
+++ b/system.json
@@ -64,7 +64,7 @@
   ],
   "title": "AnyVenture D12 RPG",
   "url": "https://www.uberwald.me/gitea/public/fvtt-avd12",
-  "version": "10.0.21",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-avd12/archive/fvtt-avd12-v10.0.21.zip",
+  "version": "10.0.22",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-avd12/archive/fvtt-avd12-v10.0.22.zip",
   "background": "systems/fvtt-avd12/images/ui/avd12_welcome_page.webp"
 }
\ No newline at end of file
diff --git a/template.json b/template.json
index 001ede3..d910ffc 100644
--- a/template.json
+++ b/template.json
@@ -492,6 +492,7 @@
       "templates": [
         "commonitem"
       ],
+      "attackbonus": 0,
       "minrange": 0,
       "maxrange": 0,
       "throwrange": 0,
diff --git a/templates/dialogs/roll-dialog-generic.hbs b/templates/dialogs/roll-dialog-generic.hbs
index f210e35..8daa712 100644
--- a/templates/dialogs/roll-dialog-generic.hbs
+++ b/templates/dialogs/roll-dialog-generic.hbs
@@ -54,7 +54,7 @@
         </select>        
       </div>
 
-      {{#if spell}} 
+      {{#if (or spell weapon)}} 
 
       {{else}}
       <div class="flexrow">
diff --git a/templates/items/partial-common-item-fields.hbs b/templates/items/partial-common-item-fields.hbs
index 5940617..b7229c0 100644
--- a/templates/items/partial-common-item-fields.hbs
+++ b/templates/items/partial-common-item-fields.hbs
@@ -1,43 +1,3 @@
-<li class='flexrow'>
-  <label class='item-field-label-long'>
-    Focus Points Bonus
-  </label>
-  <input
-    type='text'
-    class='item-field-label-short'
-    name='system.focuspointsbonus'
-    value="{{system.focuspointsbonus}}"
-    data-dtype='Number'
-  />
-
-  <label class='item-field-label-short'>
-    &nbsp;
-  </label>
-
-  <label class='item-field-label-long'>
-    Focus Regen Bonus
-  </label>
-  <input
-    type='text'
-    class='item-field-label-short'
-    name='system.focusregenbonus'
-    value="{{system.focusregenbonus}}"
-    data-dtype='Number'
-  />
-</li>
-
-<li class='flexrow'>
-  <label class='item-field-label-long'>
-    Burn Chance Bonus
-  </label>
-  <input
-    type='text'
-    class='item-field-label-short'
-    name='system.burnchancebonus'
-    value="{{system.burnchancebonus}}"
-    data-dtype='Number'
-  />
-</li>
 
 <li class='flexrow'>
   <h3 class='item-field-label-long'>
@@ -91,6 +51,26 @@
   {{/each}}
 </li>
 
+{{#if (eq type "weapon")}}
+  <li class='flexrow'>
+      <div>
+        <label class='item-field-label-short'>
+          Attack Bonus
+        </label>
+        <input
+          type='text'
+          class='item-field-label-short padd-right'
+          name="system.attackbonus"
+          value="{{system.attackbonus}}"
+          data-dtype='Number'
+        />
+        <label>
+          &nbsp;
+        </label>
+      </div>
+  </li>
+{{/if}}
+
 <li class='flexrow'>
   <h3 class='item-field-label-long'>
     Focus
@@ -126,6 +106,46 @@
         <span>Spell Damage Bonus : {{focusData.spellDamageBonus}} </span>
       </li>
   {{/if}}
+<li class='flexrow'>
+  <label class='item-field-label-long'>
+    Focus Points Bonus
+  </label>
+  <input
+    type='text'
+    class='item-field-label-short'
+    name='system.focuspointsbonus'
+    value="{{system.focuspointsbonus}}"
+    data-dtype='Number'
+  />
+
+  <label class='item-field-label-short'>
+    &nbsp;
+  </label>
+
+  <label class='item-field-label-long'>
+    Focus Regen Bonus
+  </label>
+  <input
+    type='text'
+    class='item-field-label-short'
+    name='system.focusregenbonus'
+    value="{{system.focusregenbonus}}"
+    data-dtype='Number'
+  />
+</li>
+
+<li class='flexrow'>
+  <label class='item-field-label-long'>
+    Burn Chance Bonus
+  </label>
+  <input
+    type='text'
+    class='item-field-label-short'
+    name='system.burnchancebonus'
+    value="{{system.burnchancebonus}}"
+    data-dtype='Number'
+  />
+</li>
 
 <li class='flexrow'>
   <h3 class='item-field-label-long'>