diff --git a/css/fvtt-hellborn.css b/css/fvtt-hellborn.css
index 4f5540b..4068865 100644
--- a/css/fvtt-hellborn.css
+++ b/css/fvtt-hellborn.css
@@ -563,8 +563,8 @@ i.fvtt-hellborn {
   max-width: 4.5rem;
 }
 .fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .ammoQuantity {
-  min-width: 3rem;
-  max-width: 3rem;
+  min-width: 4.2rem;
+  max-width: 4.2rem;
 }
 .fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .type {
   min-width: 3rem;
@@ -2470,6 +2470,9 @@ i.fvtt-hellborn {
 .item-to-chat ul li p {
   margin: 0;
 }
+.item-to-chat .tarot-item-img {
+  margin-top: 0.5rem;
+}
 .flavor-text-damage {
   font-family: var(--font-secondary);
   font-size: calc(var(--font-size-standard) * 1.2);
diff --git a/packs-system/hellborn-quickstart/000012.log b/packs-system/hellborn-quickstart/000017.log
similarity index 100%
rename from packs-system/hellborn-quickstart/000012.log
rename to packs-system/hellborn-quickstart/000017.log
diff --git a/packs-system/hellborn-quickstart/CURRENT b/packs-system/hellborn-quickstart/CURRENT
index 3051f81..42c62b6 100644
--- a/packs-system/hellborn-quickstart/CURRENT
+++ b/packs-system/hellborn-quickstart/CURRENT
@@ -1 +1 @@
-MANIFEST-000010
+MANIFEST-000015
diff --git a/packs-system/hellborn-quickstart/LOG b/packs-system/hellborn-quickstart/LOG
index 2a1a824..50e242d 100644
--- a/packs-system/hellborn-quickstart/LOG
+++ b/packs-system/hellborn-quickstart/LOG
@@ -1,15 +1,8 @@
-2025/06/30-20:37:58.108400 7f0798bfa6c0 Recovering log #8
-2025/06/30-20:37:58.118139 7f0798bfa6c0 Delete type=3 #6
-2025/06/30-20:37:58.118202 7f0798bfa6c0 Delete type=0 #8
-2025/06/30-21:11:07.629621 7f07923ff6c0 Level-0 table #13: started
-2025/06/30-21:11:07.632961 7f07923ff6c0 Level-0 table #13: 19920 bytes OK
-2025/06/30-21:11:07.639130 7f07923ff6c0 Delete type=0 #11
-2025/06/30-21:11:07.658870 7f07923ff6c0 Manual compaction at level-0 from '!folders!0d8PWsAGxiRfOlkP' @ 72057594037927935 : 1 .. '!items!zCOHBP3SYlGAY6zI' @ 0 : 0; will stop at (end)
-2025/06/30-21:11:07.675316 7f07923ff6c0 Manual compaction at level-1 from '!folders!0d8PWsAGxiRfOlkP' @ 72057594037927935 : 1 .. '!items!zCOHBP3SYlGAY6zI' @ 0 : 0; will stop at '!items!xiuPJDuvpdMEtiPe' @ 284 : 1
-2025/06/30-21:11:07.675323 7f07923ff6c0 Compacting 1@1 + 1@2 files
-2025/06/30-21:11:07.680513 7f07923ff6c0 Generated table #14@1: 267 keys, 115927 bytes
-2025/06/30-21:11:07.680536 7f07923ff6c0 Compacted 1@1 + 1@2 files => 115927 bytes
-2025/06/30-21:11:07.686716 7f07923ff6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
-2025/06/30-21:11:07.686840 7f07923ff6c0 Delete type=2 #5
-2025/06/30-21:11:07.686988 7f07923ff6c0 Delete type=2 #13
-2025/06/30-21:11:07.693807 7f07923ff6c0 Manual compaction at level-1 from '!items!xiuPJDuvpdMEtiPe' @ 284 : 1 .. '!items!zCOHBP3SYlGAY6zI' @ 0 : 0; will stop at (end)
+2025/06/30-22:25:13.089120 7f07937fe6c0 Recovering log #12
+2025/06/30-22:25:13.141380 7f07937fe6c0 Delete type=3 #10
+2025/06/30-22:25:13.141434 7f07937fe6c0 Delete type=0 #12
+2025/06/30-22:34:15.665682 7f07923ff6c0 Level-0 table #18: started
+2025/06/30-22:34:15.665712 7f07923ff6c0 Level-0 table #18: 0 bytes OK
+2025/06/30-22:34:15.671514 7f07923ff6c0 Delete type=0 #16
+2025/06/30-22:34:15.696997 7f07923ff6c0 Manual compaction at level-0 from '!folders!0d8PWsAGxiRfOlkP' @ 72057594037927935 : 1 .. '!items!zCOHBP3SYlGAY6zI' @ 0 : 0; will stop at (end)
+2025/06/30-22:34:15.707753 7f07923ff6c0 Manual compaction at level-1 from '!folders!0d8PWsAGxiRfOlkP' @ 72057594037927935 : 1 .. '!items!zCOHBP3SYlGAY6zI' @ 0 : 0; will stop at (end)
diff --git a/packs-system/hellborn-quickstart/LOG.old b/packs-system/hellborn-quickstart/LOG.old
index 0459c39..2a1a824 100644
--- a/packs-system/hellborn-quickstart/LOG.old
+++ b/packs-system/hellborn-quickstart/LOG.old
@@ -1,8 +1,15 @@
-2025/06/30-19:11:32.088394 7f0792ffd6c0 Recovering log #4
-2025/06/30-19:11:32.165054 7f0792ffd6c0 Delete type=3 #2
-2025/06/30-19:11:32.165125 7f0792ffd6c0 Delete type=0 #4
-2025/06/30-19:18:30.163563 7f07923ff6c0 Level-0 table #9: started
-2025/06/30-19:18:30.163654 7f07923ff6c0 Level-0 table #9: 0 bytes OK
-2025/06/30-19:18:30.170671 7f07923ff6c0 Delete type=0 #7
-2025/06/30-19:18:30.184576 7f07923ff6c0 Manual compaction at level-0 from '!folders!0d8PWsAGxiRfOlkP' @ 72057594037927935 : 1 .. '!items!zCOHBP3SYlGAY6zI' @ 0 : 0; will stop at (end)
-2025/06/30-19:18:30.184606 7f07923ff6c0 Manual compaction at level-1 from '!folders!0d8PWsAGxiRfOlkP' @ 72057594037927935 : 1 .. '!items!zCOHBP3SYlGAY6zI' @ 0 : 0; will stop at (end)
+2025/06/30-20:37:58.108400 7f0798bfa6c0 Recovering log #8
+2025/06/30-20:37:58.118139 7f0798bfa6c0 Delete type=3 #6
+2025/06/30-20:37:58.118202 7f0798bfa6c0 Delete type=0 #8
+2025/06/30-21:11:07.629621 7f07923ff6c0 Level-0 table #13: started
+2025/06/30-21:11:07.632961 7f07923ff6c0 Level-0 table #13: 19920 bytes OK
+2025/06/30-21:11:07.639130 7f07923ff6c0 Delete type=0 #11
+2025/06/30-21:11:07.658870 7f07923ff6c0 Manual compaction at level-0 from '!folders!0d8PWsAGxiRfOlkP' @ 72057594037927935 : 1 .. '!items!zCOHBP3SYlGAY6zI' @ 0 : 0; will stop at (end)
+2025/06/30-21:11:07.675316 7f07923ff6c0 Manual compaction at level-1 from '!folders!0d8PWsAGxiRfOlkP' @ 72057594037927935 : 1 .. '!items!zCOHBP3SYlGAY6zI' @ 0 : 0; will stop at '!items!xiuPJDuvpdMEtiPe' @ 284 : 1
+2025/06/30-21:11:07.675323 7f07923ff6c0 Compacting 1@1 + 1@2 files
+2025/06/30-21:11:07.680513 7f07923ff6c0 Generated table #14@1: 267 keys, 115927 bytes
+2025/06/30-21:11:07.680536 7f07923ff6c0 Compacted 1@1 + 1@2 files => 115927 bytes
+2025/06/30-21:11:07.686716 7f07923ff6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2025/06/30-21:11:07.686840 7f07923ff6c0 Delete type=2 #5
+2025/06/30-21:11:07.686988 7f07923ff6c0 Delete type=2 #13
+2025/06/30-21:11:07.693807 7f07923ff6c0 Manual compaction at level-1 from '!items!xiuPJDuvpdMEtiPe' @ 284 : 1 .. '!items!zCOHBP3SYlGAY6zI' @ 0 : 0; will stop at (end)
diff --git a/packs-system/hellborn-quickstart/MANIFEST-000010 b/packs-system/hellborn-quickstart/MANIFEST-000010
deleted file mode 100644
index c93503c..0000000
Binary files a/packs-system/hellborn-quickstart/MANIFEST-000010 and /dev/null differ
diff --git a/packs-system/hellborn-quickstart/MANIFEST-000015 b/packs-system/hellborn-quickstart/MANIFEST-000015
new file mode 100644
index 0000000..285c21c
Binary files /dev/null and b/packs-system/hellborn-quickstart/MANIFEST-000015 differ
diff --git a/styles/character.less b/styles/character.less
index cf7009f..e84f5ed 100644
--- a/styles/character.less
+++ b/styles/character.less
@@ -439,8 +439,8 @@
         max-width: 4.5rem;
       }
       .ammoQuantity {
-        min-width: 3rem;
-        max-width: 3rem;
+        min-width: 4.2rem;
+        max-width: 4.2rem;
       }
       .type {
         min-width: 3rem;
diff --git a/styles/roll.less b/styles/roll.less
index de00611..a4f1867 100644
--- a/styles/roll.less
+++ b/styles/roll.less
@@ -81,6 +81,9 @@
       }
     }
   }
+  .tarot-item-img {
+    margin-top: 0.5rem;
+  }
 }
 
 .flavor-text-damage {
@@ -94,7 +97,7 @@
     display: flex;
     justify-content: center;
     align-items: center;
-    margin-bottom:0.5rem;
+    margin-bottom: 0.5rem;
   }
   h2 {
     text-align: center;
diff --git a/templates/character-equipment.hbs b/templates/character-equipment.hbs
index 0395524..388c1c0 100644
--- a/templates/character-equipment.hbs
+++ b/templates/character-equipment.hbs
@@ -18,12 +18,19 @@
           <!-- <span class="type" data-tooltip="Type">{{upperFirst item.system.weaponType}}</span> -->
           <span class="properties" data-tooltip="Properties">{{upperFirst item.system.properties}}</span>
           <span class="range" data-tooltip="Range">{{upperFirst item.system.range}}</span>
-          <span class="ammo" data-tooltip="Ammo">{{upperFirst item.system.ammo}}</span>
+
+          {{#if (eq item.system.weaponType "melee")}}
+          <span class="ammoQuantity" > </span>
+          <span class="ammo" ></span>
+
+          {{else}}
           <span class="ammoQuantity" data-tooltip="ammoQuantity">
             <i class="fa-solid fa-octagon-plus" data-action="modifyAmmo" data-quantity="1" data-item-id="{{item.id}}"></i>
             {{item.system.ammoQuantity}}
             <i class="fa-solid fa-octagon-minus" data-action="modifyAmmo" data-quantity="-1" data-item-id="{{item.id}}"></i>
           </span>
+          <span class="ammo" data-tooltip="Ammo">{{upperFirst item.system.ammo}}</span>
+          {{/if}}
 
           <a class="damage rollable" data-tooltip="Damage" data-item-id="{{item.id}}" data-action="roll"
             data-roll-type="damage" data-roll-value="{{item.system.damageFormula}}">
diff --git a/templates/chat-tarot.hbs b/templates/chat-tarot.hbs
index f41c819..55e26b0 100644
--- a/templates/chat-tarot.hbs
+++ b/templates/chat-tarot.hbs
@@ -24,7 +24,7 @@
       <li class="tarot-spacing"><strong>Negative Effect : </strong>{{{system.negativeEffect}}}</li>
     {{/if}}
     </ul>
-    <img class="item-img" src="{{system.image}}" />
+    <img class="tarot-item-img" src="{{system.image}}" />
   </div>
 
 </div>
\ No newline at end of file
diff --git a/templates/weapon.hbs b/templates/weapon.hbs
index 3faf6e0..423e02c 100644
--- a/templates/weapon.hbs
+++ b/templates/weapon.hbs
@@ -10,8 +10,8 @@
     {{#if (eq system.weaponType "ranged")}}
       {{formField systemFields.subType value=system.subType localize=true}}
       {{formField systemFields.range value=system.range localize=true}}
-      {{formField systemFields.ammo value=system.ammo localize=true}}
       {{formField systemFields.ammoQuantity value=system.ammoQuantity localize=true}}
+      {{formField systemFields.ammo value=system.ammo localize=true}}
     {{/if}}
 
     {{formField systemFields.properties value=system.properties classes="long-input"}}