diff --git a/css/fvtt-lethal-fantasy.css b/css/fvtt-lethal-fantasy.css
index da5516d..939b6a3 100644
--- a/css/fvtt-lethal-fantasy.css
+++ b/css/fvtt-lethal-fantasy.css
@@ -2027,9 +2027,12 @@ i.lethalfantasy {
   background: #4a4940 !important;
   color: #ffffff !important;
 }
+.lethalfantasy .grit-luck-dialog {
+  color: var(--color-text-dark-primary, #191813);
+}
 .lethalfantasy .grit-luck-dialog .combat-status {
   padding: 12px;
-  background: linear-gradient(to bottom, rgba(42, 41, 32, 0.8) 0%, rgba(26, 25, 16, 0.9) 100%);
+  background: linear-gradient(to bottom, rgba(42, 41, 32, 0.88) 0%, rgba(26, 25, 16, 0.95) 100%);
   border: 1px solid rgba(212, 175, 55, 0.5);
   border-radius: 6px;
   margin-bottom: 16px;
@@ -2049,11 +2052,25 @@ i.lethalfantasy {
   margin-top: 8px;
 }
 .lethalfantasy .grit-luck-dialog .offer-text {
-  color: #f0e6d2;
+  color: var(--color-text-dark-primary, #191813);
   font-size: calc(var(--font-size-standard) * 1);
   text-align: center;
   font-weight: 600;
+  margin: 0 0 8px 0;
+}
+.lethalfantasy .grit-luck-dialog .shield-warning {
+  color: #7a4000;
+  background: rgba(255, 160, 0, 0.12);
+  border: 1px solid rgba(255, 160, 0, 0.4);
+  border-radius: 5px;
+  font-size: calc(var(--font-size-standard) * 0.88);
+  padding: 6px 10px;
   margin: 0;
+  text-align: center;
+}
+.lethalfantasy .grit-luck-dialog .shield-warning i {
+  color: #c07000;
+  margin-right: 5px;
 }
 .lethalfantasy .attack-result {
   padding: 16px;
@@ -2145,16 +2162,19 @@ i.lethalfantasy {
 }
 .lethalfantasy .attack-result .attack-result-damage {
   display: flex;
-  gap: 8px;
+  flex-wrap: wrap;
+  gap: 6px;
   justify-content: center;
 }
 .lethalfantasy .attack-result .attack-result-damage .roll-damage-btn {
-  padding: 10px 16px;
+  padding: 8px 10px;
   background: linear-gradient(to bottom, #8b0000 0%, #660000 100%);
   border: 1px solid #ff0000;
   border-radius: 6px;
   color: #f0e6d2;
   font-weight: 600;
+  font-size: calc(var(--font-size-standard) * 0.9);
+  white-space: nowrap;
   cursor: pointer;
   transition: all 0.2s ease;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
diff --git a/lethal-fantasy.mjs b/lethal-fantasy.mjs
index 9e08ba2..8549006 100644
--- a/lethal-fantasy.mjs
+++ b/lethal-fantasy.mjs
@@ -230,9 +230,15 @@ Hooks.on("renderChatMessageHTML", (message, html, data) => {
       const weaponName = message.rolls[0]?.rollName || "weapon"
       const attackRoll = message.rolls[0]?.rollTotal || 0
       const defenderName = combatant.name
-      const attackWeaponId = message.rolls[0]?.rollTarget?.weapon?.id || message.rolls[0]?.rollTarget?.weapon?._id
       const attackRollType = message.rolls[0]?.type
-      const attackRollKey = message.rolls[0]?.rollTarget?.rollKey
+      const rollTargetData = message.rolls[0]?.rollTarget
+      // For spell/miracle attacks, rollTarget IS the spell item (serialised as its data object).
+      // For weapon attacks, rollTarget is a plain skill+weapon object and weapon.id is the weapon.
+      const isSpellMiracleAttack = attackRollType === "spell-attack" || attackRollType === "miracle-attack"
+      const attackWeaponId = isSpellMiracleAttack
+        ? (rollTargetData?._id || rollTargetData?.id)
+        : (rollTargetData?.weapon?.id || rollTargetData?.weapon?._id)
+      const attackRollKey = rollTargetData?.rollKey
       console.log(`[LF] request-defense-btn | attackRollType=${attackRollType} defender=${defenderName} defenderType=${combatant.actor?.type}`)
       const attackD30result = message.rolls[0]?.options?.D30result || null
       const attackD30message = message.rolls[0]?.options?.D30message || null
diff --git a/module/utils.mjs b/module/utils.mjs
index eb2bcc9..d61f975 100644
--- a/module/utils.mjs
+++ b/module/utils.mjs
@@ -324,7 +324,7 @@ export default class LethalFantasyUtils {
             <p>Attack roll: <strong>${attackRoll}</strong></p>
           </div>
           <div class="weapon-selection">
-            <label for="defense-attack">Choose your defense attack:</label>
+            <label for="defense-attack">Choose your defense weapon:</label>
             <select id="defense-attack" name="attackKey" style="width: 100%; margin-top: 8px;">
               ${attacksHTML}
             </select>
@@ -711,6 +711,7 @@ export default class LethalFantasyUtils {
             ${totalBonus > 0 ? `<p class="bonus-info">Bonus already added: +${totalBonus}</p>` : ''}
           </div>
           <p class="offer-text">You are losing! Spend Grit or Luck to add 1D6 to your defense?</p>
+          <p class="shield-warning"><i class="fa-solid fa-triangle-exclamation"></i> If you intend to use a shield, you must spend Grit or Luck <strong>first</strong> — the shield roll comes after.</p>
         </div>
       `
 
@@ -861,7 +862,7 @@ export default class LethalFantasyUtils {
         `
       } else if (data.attackRollType === "spell-attack" || data.attackRollType === "miracle-attack") {
         const attacker = game.actors.get(data.attackerId)
-        const spell = attacker?.items.get(data.attackWeaponId)
+        const spell = attacker?.items.get(data.attackWeaponId || data.attackRollKey)
         const tiers = [
           { formula: spell?.system?.damageDice, label: "Standard" },
           { formula: spell?.system?.damageDiceOverpowered, label: "Overpowered" },
diff --git a/packs-system/lf-equipment/000601.log b/packs-system/lf-equipment/000605.log
similarity index 100%
rename from packs-system/lf-equipment/000601.log
rename to packs-system/lf-equipment/000605.log
diff --git a/packs-system/lf-equipment/CURRENT b/packs-system/lf-equipment/CURRENT
index 4569ef0..5882c5f 100644
--- a/packs-system/lf-equipment/CURRENT
+++ b/packs-system/lf-equipment/CURRENT
@@ -1 +1 @@
-MANIFEST-000599
+MANIFEST-000603
diff --git a/packs-system/lf-equipment/LOG b/packs-system/lf-equipment/LOG
index 1f3ea5c..47bb3e7 100644
--- a/packs-system/lf-equipment/LOG
+++ b/packs-system/lf-equipment/LOG
@@ -1,8 +1,8 @@
-2026/05/18-17:40:11.769288 7f5a477fe6c0 Recovering log #597
-2026/05/18-17:40:11.780605 7f5a477fe6c0 Delete type=3 #595
-2026/05/18-17:40:11.780699 7f5a477fe6c0 Delete type=0 #597
-2026/05/18-20:25:54.228818 7f5a467fc6c0 Level-0 table #602: started
-2026/05/18-20:25:54.230037 7f5a467fc6c0 Level-0 table #602: 0 bytes OK
-2026/05/18-20:25:54.236369 7f5a467fc6c0 Delete type=0 #600
-2026/05/18-20:25:54.251050 7f5a467fc6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
-2026/05/18-20:25:54.251106 7f5a467fc6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/05/19-10:50:35.862031 7f5a477fe6c0 Recovering log #601
+2026/05/19-10:50:35.923479 7f5a477fe6c0 Delete type=3 #599
+2026/05/19-10:50:35.923537 7f5a477fe6c0 Delete type=0 #601
+2026/05/19-10:51:28.990207 7f5a467fc6c0 Level-0 table #606: started
+2026/05/19-10:51:28.990237 7f5a467fc6c0 Level-0 table #606: 0 bytes OK
+2026/05/19-10:51:28.997402 7f5a467fc6c0 Delete type=0 #604
+2026/05/19-10:51:28.997604 7f5a467fc6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/05/19-10:51:28.997650 7f5a467fc6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-equipment/LOG.old b/packs-system/lf-equipment/LOG.old
index ce9cf9c..1f3ea5c 100644
--- a/packs-system/lf-equipment/LOG.old
+++ b/packs-system/lf-equipment/LOG.old
@@ -1,8 +1,8 @@
-2026/05/18-07:32:52.671725 7f5a94bff6c0 Recovering log #593
-2026/05/18-07:32:52.684619 7f5a94bff6c0 Delete type=3 #591
-2026/05/18-07:32:52.684760 7f5a94bff6c0 Delete type=0 #593
-2026/05/18-07:58:12.225439 7f5a467fc6c0 Level-0 table #598: started
-2026/05/18-07:58:12.225593 7f5a467fc6c0 Level-0 table #598: 0 bytes OK
-2026/05/18-07:58:12.232817 7f5a467fc6c0 Delete type=0 #596
-2026/05/18-07:58:12.252837 7f5a467fc6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
-2026/05/18-07:58:12.252955 7f5a467fc6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/05/18-17:40:11.769288 7f5a477fe6c0 Recovering log #597
+2026/05/18-17:40:11.780605 7f5a477fe6c0 Delete type=3 #595
+2026/05/18-17:40:11.780699 7f5a477fe6c0 Delete type=0 #597
+2026/05/18-20:25:54.228818 7f5a467fc6c0 Level-0 table #602: started
+2026/05/18-20:25:54.230037 7f5a467fc6c0 Level-0 table #602: 0 bytes OK
+2026/05/18-20:25:54.236369 7f5a467fc6c0 Delete type=0 #600
+2026/05/18-20:25:54.251050 7f5a467fc6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
+2026/05/18-20:25:54.251106 7f5a467fc6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-equipment/MANIFEST-000599 b/packs-system/lf-equipment/MANIFEST-000603
similarity index 71%
rename from packs-system/lf-equipment/MANIFEST-000599
rename to packs-system/lf-equipment/MANIFEST-000603
index 8dd20da..49b3498 100644
Binary files a/packs-system/lf-equipment/MANIFEST-000599 and b/packs-system/lf-equipment/MANIFEST-000603 differ
diff --git a/packs-system/lf-gifts/000598.log b/packs-system/lf-gifts/000602.log
similarity index 100%
rename from packs-system/lf-gifts/000598.log
rename to packs-system/lf-gifts/000602.log
diff --git a/packs-system/lf-gifts/CURRENT b/packs-system/lf-gifts/CURRENT
index 86fbd4e..0b446e5 100644
--- a/packs-system/lf-gifts/CURRENT
+++ b/packs-system/lf-gifts/CURRENT
@@ -1 +1 @@
-MANIFEST-000596
+MANIFEST-000600
diff --git a/packs-system/lf-gifts/LOG b/packs-system/lf-gifts/LOG
index f780df8..dad88da 100644
--- a/packs-system/lf-gifts/LOG
+++ b/packs-system/lf-gifts/LOG
@@ -1,8 +1,8 @@
-2026/05/18-17:40:11.793894 7f5a94bff6c0 Recovering log #594
-2026/05/18-17:40:11.804447 7f5a94bff6c0 Delete type=3 #592
-2026/05/18-17:40:11.804549 7f5a94bff6c0 Delete type=0 #594
-2026/05/18-20:25:54.236611 7f5a467fc6c0 Level-0 table #599: started
-2026/05/18-20:25:54.236652 7f5a467fc6c0 Level-0 table #599: 0 bytes OK
-2026/05/18-20:25:54.243997 7f5a467fc6c0 Delete type=0 #597
-2026/05/18-20:25:54.251069 7f5a467fc6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
-2026/05/18-20:25:54.264439 7f5a467fc6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/05/19-10:50:35.962917 7f5a46ffd6c0 Recovering log #598
+2026/05/19-10:50:36.018914 7f5a46ffd6c0 Delete type=3 #596
+2026/05/19-10:50:36.018977 7f5a46ffd6c0 Delete type=0 #598
+2026/05/19-10:51:28.983427 7f5a467fc6c0 Level-0 table #603: started
+2026/05/19-10:51:28.983464 7f5a467fc6c0 Level-0 table #603: 0 bytes OK
+2026/05/19-10:51:28.990020 7f5a467fc6c0 Delete type=0 #601
+2026/05/19-10:51:28.997591 7f5a467fc6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/05/19-10:51:28.997639 7f5a467fc6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-gifts/LOG.old b/packs-system/lf-gifts/LOG.old
index ea55386..f780df8 100644
--- a/packs-system/lf-gifts/LOG.old
+++ b/packs-system/lf-gifts/LOG.old
@@ -1,8 +1,8 @@
-2026/05/18-07:32:52.700651 7f5a477fe6c0 Recovering log #590
-2026/05/18-07:32:52.712680 7f5a477fe6c0 Delete type=3 #588
-2026/05/18-07:32:52.712814 7f5a477fe6c0 Delete type=0 #590
-2026/05/18-07:58:12.232998 7f5a467fc6c0 Level-0 table #595: started
-2026/05/18-07:58:12.233130 7f5a467fc6c0 Level-0 table #595: 0 bytes OK
-2026/05/18-07:58:12.244133 7f5a467fc6c0 Delete type=0 #593
-2026/05/18-07:58:12.252873 7f5a467fc6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
-2026/05/18-07:58:12.252977 7f5a467fc6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/05/18-17:40:11.793894 7f5a94bff6c0 Recovering log #594
+2026/05/18-17:40:11.804447 7f5a94bff6c0 Delete type=3 #592
+2026/05/18-17:40:11.804549 7f5a94bff6c0 Delete type=0 #594
+2026/05/18-20:25:54.236611 7f5a467fc6c0 Level-0 table #599: started
+2026/05/18-20:25:54.236652 7f5a467fc6c0 Level-0 table #599: 0 bytes OK
+2026/05/18-20:25:54.243997 7f5a467fc6c0 Delete type=0 #597
+2026/05/18-20:25:54.251069 7f5a467fc6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
+2026/05/18-20:25:54.264439 7f5a467fc6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!x5gLtqlW4sdDmHTd' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-gifts/MANIFEST-000596 b/packs-system/lf-gifts/MANIFEST-000600
similarity index 77%
rename from packs-system/lf-gifts/MANIFEST-000596
rename to packs-system/lf-gifts/MANIFEST-000600
index 6933bcd..5422bc9 100644
Binary files a/packs-system/lf-gifts/MANIFEST-000596 and b/packs-system/lf-gifts/MANIFEST-000600 differ
diff --git a/packs-system/lf-skills/000603.log b/packs-system/lf-skills/000607.log
similarity index 100%
rename from packs-system/lf-skills/000603.log
rename to packs-system/lf-skills/000607.log
diff --git a/packs-system/lf-skills/CURRENT b/packs-system/lf-skills/CURRENT
index 4a4c8ce..7139744 100644
--- a/packs-system/lf-skills/CURRENT
+++ b/packs-system/lf-skills/CURRENT
@@ -1 +1 @@
-MANIFEST-000601
+MANIFEST-000605
diff --git a/packs-system/lf-skills/LOG b/packs-system/lf-skills/LOG
index 23ee6e0..409b56c 100644
--- a/packs-system/lf-skills/LOG
+++ b/packs-system/lf-skills/LOG
@@ -1,8 +1,8 @@
-2026/05/18-17:40:11.749971 7f5a46ffd6c0 Recovering log #599
-2026/05/18-17:40:11.761423 7f5a46ffd6c0 Delete type=3 #597
-2026/05/18-17:40:11.761520 7f5a46ffd6c0 Delete type=0 #599
-2026/05/18-20:25:54.219239 7f5a467fc6c0 Level-0 table #604: started
-2026/05/18-20:25:54.219522 7f5a467fc6c0 Level-0 table #604: 0 bytes OK
-2026/05/18-20:25:54.228610 7f5a467fc6c0 Delete type=0 #602
-2026/05/18-20:25:54.251028 7f5a467fc6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
-2026/05/18-20:25:54.251085 7f5a467fc6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/05/19-10:50:35.772455 7f5a46ffd6c0 Recovering log #603
+2026/05/19-10:50:35.837426 7f5a46ffd6c0 Delete type=3 #601
+2026/05/19-10:50:35.837512 7f5a46ffd6c0 Delete type=0 #603
+2026/05/19-10:51:28.969686 7f5a467fc6c0 Level-0 table #608: started
+2026/05/19-10:51:28.969769 7f5a467fc6c0 Level-0 table #608: 0 bytes OK
+2026/05/19-10:51:28.976467 7f5a467fc6c0 Delete type=0 #606
+2026/05/19-10:51:28.997558 7f5a467fc6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/05/19-10:51:28.997616 7f5a467fc6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-skills/LOG.old b/packs-system/lf-skills/LOG.old
index b19bc74..23ee6e0 100644
--- a/packs-system/lf-skills/LOG.old
+++ b/packs-system/lf-skills/LOG.old
@@ -1,8 +1,8 @@
-2026/05/18-07:32:52.650924 7f5a47fff6c0 Recovering log #595
-2026/05/18-07:32:52.662191 7f5a47fff6c0 Delete type=3 #593
-2026/05/18-07:32:52.662331 7f5a47fff6c0 Delete type=0 #595
-2026/05/18-07:58:12.218060 7f5a467fc6c0 Level-0 table #600: started
-2026/05/18-07:58:12.218402 7f5a467fc6c0 Level-0 table #600: 0 bytes OK
-2026/05/18-07:58:12.225237 7f5a467fc6c0 Delete type=0 #598
-2026/05/18-07:58:12.244392 7f5a467fc6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
-2026/05/18-07:58:12.252899 7f5a467fc6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/05/18-17:40:11.749971 7f5a46ffd6c0 Recovering log #599
+2026/05/18-17:40:11.761423 7f5a46ffd6c0 Delete type=3 #597
+2026/05/18-17:40:11.761520 7f5a46ffd6c0 Delete type=0 #599
+2026/05/18-20:25:54.219239 7f5a467fc6c0 Level-0 table #604: started
+2026/05/18-20:25:54.219522 7f5a467fc6c0 Level-0 table #604: 0 bytes OK
+2026/05/18-20:25:54.228610 7f5a467fc6c0 Delete type=0 #602
+2026/05/18-20:25:54.251028 7f5a467fc6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
+2026/05/18-20:25:54.251085 7f5a467fc6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-skills/MANIFEST-000601 b/packs-system/lf-skills/MANIFEST-000605
similarity index 71%
rename from packs-system/lf-skills/MANIFEST-000601
rename to packs-system/lf-skills/MANIFEST-000605
index f6cfaf0..7058802 100644
Binary files a/packs-system/lf-skills/MANIFEST-000601 and b/packs-system/lf-skills/MANIFEST-000605 differ
diff --git a/packs-system/lf-spells-miracles/000298.log b/packs-system/lf-spells-miracles/000302.log
similarity index 100%
rename from packs-system/lf-spells-miracles/000298.log
rename to packs-system/lf-spells-miracles/000302.log
diff --git a/packs-system/lf-spells-miracles/CURRENT b/packs-system/lf-spells-miracles/CURRENT
index dc5e7f3..16abe4a 100644
--- a/packs-system/lf-spells-miracles/CURRENT
+++ b/packs-system/lf-spells-miracles/CURRENT
@@ -1 +1 @@
-MANIFEST-000296
+MANIFEST-000300
diff --git a/packs-system/lf-spells-miracles/LOG b/packs-system/lf-spells-miracles/LOG
index 64fbc4f..737fb18 100644
--- a/packs-system/lf-spells-miracles/LOG
+++ b/packs-system/lf-spells-miracles/LOG
@@ -1,8 +1,8 @@
-2026/05/18-17:40:11.831491 7f5a94bff6c0 Recovering log #294
-2026/05/18-17:40:11.842913 7f5a94bff6c0 Delete type=3 #292
-2026/05/18-17:40:11.843005 7f5a94bff6c0 Delete type=0 #294
-2026/05/18-20:25:54.257813 7f5a467fc6c0 Level-0 table #299: started
-2026/05/18-20:25:54.257869 7f5a467fc6c0 Level-0 table #299: 0 bytes OK
-2026/05/18-20:25:54.264186 7f5a467fc6c0 Delete type=0 #297
-2026/05/18-20:25:54.267118 7f5a467fc6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
-2026/05/18-20:25:54.296812 7f5a467fc6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/05/19-10:50:36.147771 7f5a46ffd6c0 Recovering log #298
+2026/05/19-10:50:36.209801 7f5a46ffd6c0 Delete type=3 #296
+2026/05/19-10:50:36.209908 7f5a46ffd6c0 Delete type=0 #298
+2026/05/19-10:51:29.021338 7f5a467fc6c0 Level-0 table #303: started
+2026/05/19-10:51:29.021378 7f5a467fc6c0 Level-0 table #303: 0 bytes OK
+2026/05/19-10:51:29.027529 7f5a467fc6c0 Delete type=0 #301
+2026/05/19-10:51:29.027761 7f5a467fc6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/05/19-10:51:29.027787 7f5a467fc6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-spells-miracles/LOG.old b/packs-system/lf-spells-miracles/LOG.old
index b619089..64fbc4f 100644
--- a/packs-system/lf-spells-miracles/LOG.old
+++ b/packs-system/lf-spells-miracles/LOG.old
@@ -1,8 +1,8 @@
-2026/05/18-07:32:52.738234 7f5a477fe6c0 Recovering log #290
-2026/05/18-07:32:52.749839 7f5a477fe6c0 Delete type=3 #288
-2026/05/18-07:32:52.749970 7f5a477fe6c0 Delete type=0 #290
-2026/05/18-07:58:12.253340 7f5a467fc6c0 Level-0 table #295: started
-2026/05/18-07:58:12.253449 7f5a467fc6c0 Level-0 table #295: 0 bytes OK
-2026/05/18-07:58:12.261029 7f5a467fc6c0 Delete type=0 #293
-2026/05/18-07:58:12.286385 7f5a467fc6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
-2026/05/18-07:58:12.286487 7f5a467fc6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/05/18-17:40:11.831491 7f5a94bff6c0 Recovering log #294
+2026/05/18-17:40:11.842913 7f5a94bff6c0 Delete type=3 #292
+2026/05/18-17:40:11.843005 7f5a94bff6c0 Delete type=0 #294
+2026/05/18-20:25:54.257813 7f5a467fc6c0 Level-0 table #299: started
+2026/05/18-20:25:54.257869 7f5a467fc6c0 Level-0 table #299: 0 bytes OK
+2026/05/18-20:25:54.264186 7f5a467fc6c0 Delete type=0 #297
+2026/05/18-20:25:54.267118 7f5a467fc6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
+2026/05/18-20:25:54.296812 7f5a467fc6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-spells-miracles/MANIFEST-000296 b/packs-system/lf-spells-miracles/MANIFEST-000300
similarity index 72%
rename from packs-system/lf-spells-miracles/MANIFEST-000296
rename to packs-system/lf-spells-miracles/MANIFEST-000300
index f9eeda4..d6f520e 100644
Binary files a/packs-system/lf-spells-miracles/MANIFEST-000296 and b/packs-system/lf-spells-miracles/MANIFEST-000300 differ
diff --git a/packs-system/lf-vulnerabilities/000597.log b/packs-system/lf-vulnerabilities/000601.log
similarity index 100%
rename from packs-system/lf-vulnerabilities/000597.log
rename to packs-system/lf-vulnerabilities/000601.log
diff --git a/packs-system/lf-vulnerabilities/CURRENT b/packs-system/lf-vulnerabilities/CURRENT
index 23755cb..4569ef0 100644
--- a/packs-system/lf-vulnerabilities/CURRENT
+++ b/packs-system/lf-vulnerabilities/CURRENT
@@ -1 +1 @@
-MANIFEST-000595
+MANIFEST-000599
diff --git a/packs-system/lf-vulnerabilities/LOG b/packs-system/lf-vulnerabilities/LOG
index 81e9341..a6891da 100644
--- a/packs-system/lf-vulnerabilities/LOG
+++ b/packs-system/lf-vulnerabilities/LOG
@@ -1,8 +1,8 @@
-2026/05/18-17:40:11.812004 7f5a47fff6c0 Recovering log #593
-2026/05/18-17:40:11.823277 7f5a47fff6c0 Delete type=3 #591
-2026/05/18-17:40:11.823388 7f5a47fff6c0 Delete type=0 #593
-2026/05/18-20:25:54.244177 7f5a467fc6c0 Level-0 table #598: started
-2026/05/18-20:25:54.244222 7f5a467fc6c0 Level-0 table #598: 0 bytes OK
-2026/05/18-20:25:54.250810 7f5a467fc6c0 Delete type=0 #596
-2026/05/18-20:25:54.251096 7f5a467fc6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
-2026/05/18-20:25:54.264461 7f5a467fc6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/05/19-10:50:36.056028 7f5a47fff6c0 Recovering log #597
+2026/05/19-10:50:36.115465 7f5a47fff6c0 Delete type=3 #595
+2026/05/19-10:50:36.115585 7f5a47fff6c0 Delete type=0 #597
+2026/05/19-10:51:28.976707 7f5a467fc6c0 Level-0 table #602: started
+2026/05/19-10:51:28.976754 7f5a467fc6c0 Level-0 table #602: 0 bytes OK
+2026/05/19-10:51:28.983222 7f5a467fc6c0 Delete type=0 #600
+2026/05/19-10:51:28.997577 7f5a467fc6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/05/19-10:51:28.997627 7f5a467fc6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-vulnerabilities/LOG.old b/packs-system/lf-vulnerabilities/LOG.old
index bd4dddf..81e9341 100644
--- a/packs-system/lf-vulnerabilities/LOG.old
+++ b/packs-system/lf-vulnerabilities/LOG.old
@@ -1,8 +1,8 @@
-2026/05/18-07:32:52.720162 7f5a94bff6c0 Recovering log #589
-2026/05/18-07:32:52.731519 7f5a94bff6c0 Delete type=3 #587
-2026/05/18-07:32:52.731690 7f5a94bff6c0 Delete type=0 #589
-2026/05/18-07:58:12.244424 7f5a467fc6c0 Level-0 table #594: started
-2026/05/18-07:58:12.244618 7f5a467fc6c0 Level-0 table #594: 0 bytes OK
-2026/05/18-07:58:12.252579 7f5a467fc6c0 Delete type=0 #592
-2026/05/18-07:58:12.252922 7f5a467fc6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
-2026/05/18-07:58:12.252996 7f5a467fc6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/05/18-17:40:11.812004 7f5a47fff6c0 Recovering log #593
+2026/05/18-17:40:11.823277 7f5a47fff6c0 Delete type=3 #591
+2026/05/18-17:40:11.823388 7f5a47fff6c0 Delete type=0 #593
+2026/05/18-20:25:54.244177 7f5a467fc6c0 Level-0 table #598: started
+2026/05/18-20:25:54.244222 7f5a467fc6c0 Level-0 table #598: 0 bytes OK
+2026/05/18-20:25:54.250810 7f5a467fc6c0 Delete type=0 #596
+2026/05/18-20:25:54.251096 7f5a467fc6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
+2026/05/18-20:25:54.264461 7f5a467fc6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-vulnerabilities/MANIFEST-000595 b/packs-system/lf-vulnerabilities/MANIFEST-000599
similarity index 72%
rename from packs-system/lf-vulnerabilities/MANIFEST-000595
rename to packs-system/lf-vulnerabilities/MANIFEST-000599
index dd41442..79595ad 100644
Binary files a/packs-system/lf-vulnerabilities/MANIFEST-000595 and b/packs-system/lf-vulnerabilities/MANIFEST-000599 differ
diff --git a/styles/chat.less b/styles/chat.less
index ecb7abb..6435059 100644
--- a/styles/chat.less
+++ b/styles/chat.less
@@ -145,9 +145,11 @@
 }
 
 .grit-luck-dialog {
+  color: var(--color-text-dark-primary, #191813);
+
   .combat-status {
     padding: 12px;
-    background: linear-gradient(to bottom, rgba(42, 41, 32, 0.8) 0%, rgba(26, 25, 16, 0.9) 100%);
+    background: linear-gradient(to bottom, rgba(42, 41, 32, 0.88) 0%, rgba(26, 25, 16, 0.95) 100%);
     border: 1px solid rgba(212, 175, 55, 0.5);
     border-radius: 6px;
     margin-bottom: 16px;
@@ -171,11 +173,27 @@
   }
 
   .offer-text {
-    color: #f0e6d2;
+    color: var(--color-text-dark-primary, #191813);
     font-size: calc(var(--font-size-standard) * 1);
     text-align: center;
     font-weight: 600;
+    margin: 0 0 8px 0;
+  }
+
+  .shield-warning {
+    color: #7a4000;
+    background: rgba(255, 160, 0, 0.12);
+    border: 1px solid rgba(255, 160, 0, 0.4);
+    border-radius: 5px;
+    font-size: calc(var(--font-size-standard) * 0.88);
+    padding: 6px 10px;
     margin: 0;
+    text-align: center;
+
+    i {
+      color: #c07000;
+      margin-right: 5px;
+    }
   }
 }
 
@@ -284,16 +302,19 @@
 
   .attack-result-damage {
     display: flex;
-    gap: 8px;
+    flex-wrap: wrap;
+    gap: 6px;
     justify-content: center;
 
     .roll-damage-btn {
-      padding: 10px 16px;
+      padding: 8px 10px;
       background: linear-gradient(to bottom, #8b0000 0%, #660000 100%);
       border: 1px solid #ff0000;
       border-radius: 6px;
       color: #f0e6d2;
       font-weight: 600;
+      font-size: calc(var(--font-size-standard) * 0.9);
+      white-space: nowrap;
       cursor: pointer;
       transition: all 0.2s ease;
       box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);