diff --git a/components/video-modal.html b/components/video-modal.html
index d7b160bb..8415c649 100644
--- a/components/video-modal.html
+++ b/components/video-modal.html
@@ -3,45 +3,55 @@
   <div class="bv-modal-backdrop" data-dismiss></div>
   <div class="bv-modal__panel" tabindex="-1">
     <div class="player-modal__container">
-      <div class="player-modal__content">
+      <div class="player-modal__content grid gap-6">
         <!-- Navigation bar - sliding at top -->
         <div
           id="modalNav"
           class="modal-nav sticky top-0 z-60 transition-transform duration-150"
         >
-          <div class="flex items-center px-6 py-4">
-            <button
-              id="closeModal"
-              class="back-button flex items-center justify-center w-10 h-10 rounded-full bg-black/50 hover:bg-black/70 transition-all duration-200 backdrop-blur focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-black focus:ring-blue-500"
-            >
-              <svg
-                xmlns="http://www.w3.org/2000/svg"
-                width="24"
-                height="24"
-                viewBox="0 0 24 24"
-                fill="none"
-                stroke="currentColor"
-                stroke-width="2"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-                class="w-6 h-6 text-gray-300"
+          <div
+            class="card flex w-full items-center justify-between gap-4 px-4 py-3"
+          >
+            <div class="flex items-center gap-3">
+              <button
+                id="closeModal"
+                type="button"
+                class="focus-ring inline-flex h-10 w-10 items-center justify-center rounded-full bg-panel text-text transition duration-200 ease-out hover:bg-panel-hover"
+              >
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  width="24"
+                  height="24"
+                  viewBox="0 0 24 24"
+                  fill="none"
+                  stroke="currentColor"
+                  stroke-width="2"
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  class="h-5 w-5"
+                >
+                  <path d="M15 18l-6-6 6-6" />
+                </svg>
+              </button>
+            </div>
+            <div class="flex items-center gap-2">
+              <button
+                id="copyMagnetBtn"
+                type="button"
+                class="btn-ghost focus-ring h-10 w-10 rounded-full p-0"
+                aria-label="Copy magnet"
               >
-                <path d="M15 18l-6-6 6-6" />
-              </svg>
-            </button>
-            <div class="modal-actions">
-              <button id="copyMagnetBtn" class="icon-button">
                 <img
                   src="assets/svg/copy-magnet.svg"
                   alt="Copy Magnet"
-                  class="icon-image"
+                  class="h-5 w-5"
                 />
               </button>
               <div class="relative" data-modal-zap-wrapper>
                 <button
                   id="modalZapBtn"
                   type="button"
-                  class="icon-button"
+                  class="btn-ghost focus-ring h-10 w-10 rounded-full p-0"
                   aria-label="Send a zap"
                   aria-haspopup="dialog"
                   aria-expanded="false"
@@ -50,7 +60,7 @@
                   <img
                     src="assets/svg/lightning-bolt.svg"
                     alt="Zap"
-                    class="icon-image"
+                    class="h-5 w-5"
                   />
                 </button>
                 <div
@@ -60,18 +70,18 @@
                   aria-hidden="true"
                 >
                   <div
-                    class="zap-popover__content w-72 max-w-[calc(100vw-2rem)] rounded-lg p-4 shadow-lg"
+                    class="zap-popover__content card w-72 max-w-[calc(100vw-2rem)] px-5 py-4"
                   >
-                    <div class="mb-3 flex items-center justify-between gap-4">
+                    <div class="mb-4 flex items-center justify-between gap-4">
                       <h3
-                        class="text-xs font-semibold uppercase tracking-wide text-gray-300"
+                        class="text-xs font-semibold uppercase tracking-wide text-muted"
                       >
                         Send a zap
                       </h3>
                       <button
                         type="button"
                         id="modalZapCloseBtn"
-                        class="text-gray-400 transition-colors hover:text-gray-200"
+                        class="focus-ring inline-flex h-8 w-8 items-center justify-center rounded-full text-muted transition hover:text-text"
                         aria-label="Close zap dialog"
                       >
                         ✕
@@ -79,24 +89,24 @@
                     </div>
                     <p
                       id="modalZapWalletPrompt"
-                      class="mb-3 hidden text-sm text-gray-200"
+                      class="mb-3 hidden text-sm text-muted"
                       aria-hidden="true"
                     >
                       Connect a wallet in
                       <button
                         type="button"
                         id="modalZapWalletLink"
-                        class="font-semibold text-blue-300 underline decoration-dotted transition-colors hover:text-blue-200"
+                        class="focus-ring inline-flex items-center gap-1 text-sm font-semibold text-info underline decoration-dotted underline-offset-2 hover:text-info-strong"
                       >
                         Wallet Connect settings
                       </button>
                       to send zaps.
                     </p>
-                    <form id="modalZapForm" class="space-y-3">
-                      <div>
+                    <form id="modalZapForm" class="space-y-4">
+                      <div class="space-y-2">
                         <label
                           for="modalZapAmountInput"
-                          class="mb-2 block text-xs font-semibold uppercase tracking-wide text-gray-300"
+                          class="text-xs font-semibold uppercase tracking-wide text-muted"
                         >
                           Zap amount (sats)
                         </label>
@@ -106,14 +116,14 @@
                           min="1"
                           step="1"
                           inputmode="numeric"
-                          class="w-full rounded border border-gray-600 bg-gray-800 px-3 py-2 text-sm text-gray-100 focus:border-blue-400 focus:outline-none focus:ring-1 focus:ring-blue-400"
+                          class="input"
                           placeholder="Enter sats"
                         />
                       </div>
-                      <div>
+                      <div class="space-y-2">
                         <label
                           for="modalZapCommentInput"
-                          class="mb-2 block text-xs font-semibold uppercase tracking-wide text-gray-300"
+                          class="text-xs font-semibold uppercase tracking-wide text-muted"
                         >
                           Comment (optional)
                         </label>
@@ -121,32 +131,32 @@
                           id="modalZapCommentInput"
                           rows="2"
                           maxlength="280"
-                          class="w-full resize-y rounded border border-gray-600 bg-gray-800 px-3 py-2 text-sm text-gray-100 focus:border-blue-400 focus:outline-none focus:ring-1 focus:ring-blue-400"
+                          class="input resize-y"
                           placeholder="Include a note with your zap"
                         ></textarea>
                       </div>
                       <p
                         id="modalZapSplitSummary"
-                        class="text-sm text-gray-300"
+                        class="text-sm text-muted"
                         aria-live="polite"
                       >
                         Enter an amount to view the split.
                       </p>
                       <p
                         id="modalZapStatus"
-                        class="text-xs text-gray-400"
+                        class="text-xs text-muted"
                         role="status"
                         aria-live="polite"
                       ></p>
                       <ul
                         id="modalZapReceipts"
-                        class="space-y-2 text-xs text-gray-300"
+                        class="space-y-2 text-xs text-muted"
                       ></ul>
                       <div class="flex items-center justify-end gap-2">
                         <button
                           type="submit"
                           id="modalZapSendBtn"
-                          class="rounded bg-blue-500 px-4 py-2 text-sm font-semibold text-white transition-colors hover:bg-blue-600 focus:outline-none focus:ring-2 focus:ring-blue-400 focus:ring-offset-2 focus:ring-offset-gray-900"
+                          class="btn"
                         >
                           Send
                         </button>
@@ -155,170 +165,182 @@
                   </div>
                 </div>
               </div>
-              <button id="shareBtn" class="icon-button">
+              <button
+                id="shareBtn"
+                type="button"
+                class="btn-ghost focus-ring h-10 w-10 rounded-full p-0"
+                aria-label="Share video"
+              >
                 <img
                   src="assets/svg/share-video.svg"
                   alt="Share Video"
-                  class="icon-image"
+                  class="h-5 w-5"
                 />
               </button>
-              <div
-                class="modal-actions__overflow"
-                data-more-menu-wrapper="true"
-              >
+              <div class="relative" data-more-menu-wrapper="true">
                 <button
                   id="modalMoreBtn"
                   type="button"
-                  class="icon-button"
+                  class="btn-ghost focus-ring h-10 w-10 rounded-full p-0"
                   aria-haspopup="true"
                   aria-expanded="false"
                   aria-label="More"
                   data-more-dropdown="modal"
                 >
-                  <img src="assets/svg/ellipsis.svg" alt="More" class="w-5 h-5" />
+                  <img src="assets/svg/ellipsis.svg" alt="More" class="h-5 w-5" />
                 </button>
                 <div
                   id="moreDropdown-modal"
-                  class="hidden absolute right-0 top-14 w-44 rounded-md shadow-lg bg-gray-800 ring-1 ring-black ring-opacity-5 z-50"
+                  class="absolute right-0 top-14 hidden w-48 rounded-lg border border-border bg-surface-alt py-2 text-left text-sm text-text shadow-lg"
                   role="menu"
                   data-more-menu="true"
                 >
-                  <div class="py-1">
-                    <button
-                      class="block w-full text-left px-4 py-2 text-sm text-gray-100 hover:bg-gray-700"
-                      data-action="open-channel"
-                      data-context="modal"
-                    >
-                      Open channel
-                    </button>
-                    <button
-                      class="block w-full text-left px-4 py-2 text-sm text-gray-100 hover:bg-gray-700"
-                      data-action="copy-link"
-                      data-context="modal"
-                    >
-                      Copy link
-                    </button>
-                    <div
-                      class="px-4 pt-2 pb-1 text-xs font-semibold uppercase tracking-wide text-gray-400"
-                    >
-                      Boost on Nostr…
-                    </div>
-                    <button
-                      class="block w-full text-left px-4 py-2 text-sm text-gray-100 hover:bg-gray-700"
-                      data-action="repost-event"
-                      data-context="modal"
-                    >
-                      Repost (kind 6)
-                    </button>
-                    <button
-                      class="block w-full text-left px-4 py-2 text-sm text-gray-100 hover:bg-gray-700"
-                      data-action="mirror-video"
-                      data-context="modal"
-                    >
-                      Mirror (kind 1063)
-                    </button>
-                    <button
-                      class="block w-full text-left px-4 py-2 text-sm text-gray-100 hover:bg-gray-700"
-                      data-action="ensure-presence"
-                      data-context="modal"
-                    >
-                      Rebroadcast
-                    </button>
-                    <div class="my-1 border-t border-gray-700 opacity-70"></div>
-                    <button
-                      class="block w-full text-left px-4 py-2 text-sm text-red-400 hover:bg-red-700 hover:text-white"
-                      data-action="blacklist-author"
-                      data-context="modal"
-                      data-blacklist-menu="true"
-                    >
-                      Blacklist creator
-                    </button>
-                    <button
-                      class="block w-full text-left px-4 py-2 text-sm text-red-400 hover:bg-red-700 hover:text-white"
-                      data-action="block-author"
-                      data-context="modal"
-                    >
-                      Block creator
-                    </button>
-                    <button
-                      class="block w-full text-left px-4 py-2 text-sm text-gray-100 hover:bg-gray-700"
-                      data-action="report"
-                      data-context="modal"
-                    >
-                      Report
-                    </button>
+                  <button
+                    class="focus-ring block w-full px-4 py-2 text-left transition hover:bg-panel-hover"
+                    data-action="open-channel"
+                    data-context="modal"
+                  >
+                    Open channel
+                  </button>
+                  <button
+                    class="focus-ring block w-full px-4 py-2 text-left transition hover:bg-panel-hover"
+                    data-action="copy-link"
+                    data-context="modal"
+                  >
+                    Copy link
+                  </button>
+                  <div class="px-4 pb-1 pt-3 text-xs font-semibold uppercase tracking-wide text-muted">
+                    Boost on Nostr…
                   </div>
+                  <button
+                    class="focus-ring block w-full px-4 py-2 text-left transition hover:bg-panel-hover"
+                    data-action="repost-event"
+                    data-context="modal"
+                  >
+                    Repost (kind 6)
+                  </button>
+                  <button
+                    class="focus-ring block w-full px-4 py-2 text-left transition hover:bg-panel-hover"
+                    data-action="mirror-video"
+                    data-context="modal"
+                  >
+                    Mirror (kind 1063)
+                  </button>
+                  <button
+                    class="focus-ring block w-full px-4 py-2 text-left transition hover:bg-panel-hover"
+                    data-action="ensure-presence"
+                    data-context="modal"
+                  >
+                    Rebroadcast
+                  </button>
+                  <div class="my-2 border-t border-border/40"></div>
+                  <button
+                    class="focus-ring block w-full px-4 py-2 text-left font-semibold text-critical transition hover:bg-critical hover:text-white"
+                    data-action="blacklist-author"
+                    data-context="modal"
+                    data-blacklist-menu="true"
+                  >
+                    Blacklist creator
+                  </button>
+                  <button
+                    class="focus-ring block w-full px-4 py-2 text-left font-semibold text-critical transition hover:bg-critical hover:text-white"
+                    data-action="block-author"
+                    data-context="modal"
+                  >
+                    Block creator
+                  </button>
+                  <button
+                    class="focus-ring block w-full px-4 py-2 text-left transition hover:bg-panel-hover"
+                    data-action="report"
+                    data-context="modal"
+                  >
+                    Report
+                  </button>
                 </div>
               </div>
             </div>
           </div>
         </div>
 
-        <div class="player-modal__video modal-video-shell">
-          <video id="modalVideo" class="w-full aspect-video" controls></video>
-        </div>
-
-        <div class="player-modal__info modal-info-panel">
-          <!-- Title and icons row -->
-          <div class="flex items-center justify-between mb-2">
-            <h2 id="videoTitle" class="text-2xl font-bold text-white"></h2>
-          </div>
-
-          <!-- Video Timestamp -->
-          <div
-            class="flex items-start justify-between text-sm text-gray-400 mb-4"
-          >
-            <div class="flex flex-wrap items-center gap-2 modal-meta">
-              <span id="videoTimestamp">Posted just now</span>
-              <span
-                id="videoEditedTimestamp"
-                class="hidden"
-              >Last edited just now</span>
-              <span id="videoViewCount" class="modal-view-count">– views</span>
-            </div>
-            <div id="modalStatus" class="text-gray-300">
-              Initializing... Just give it a sec.
+        <div
+          class="player-modal__body grid gap-6 lg:grid-cols-[minmax(0,1.4fr)_minmax(0,1fr)]"
+        >
+          <div class="player-modal__video modal-video-shell">
+            <div class="card overflow-hidden p-0 lg:sticky lg:top-24">
+              <video
+                id="modalVideo"
+                class="aspect-video w-full bg-black"
+                controls
+              ></video>
             </div>
           </div>
 
-          <!-- Creator info -->
-          <div class="flex items-center mb-4 p-4 bg-gray-800/50 rounded-lg">
-            <div class="w-12 h-12 rounded-full bg-gray-700 overflow-hidden">
-              <img
-                id="creatorAvatar"
-                src=""
-                alt="Creator"
-                class="w-full h-full object-cover"
-              />
+          <div class="player-modal__info modal-info-panel grid gap-4">
+            <div class="card flex flex-col gap-4 px-6 py-5">
+              <div class="flex items-start justify-between gap-4">
+                <h2
+                  id="videoTitle"
+                  class="text-2xl font-semibold leading-tight text-white"
+                ></h2>
+                <div
+                  id="modalStatus"
+                  class="text-right text-sm text-muted"
+                >
+                  Initializing... Just give it a sec.
+                </div>
+              </div>
+              <div class="flex flex-wrap items-center gap-3 text-sm text-muted">
+                <span id="videoTimestamp">Posted just now</span>
+                <span
+                  id="videoEditedTimestamp"
+                  class="hidden"
+                >Last edited just now</span>
+                <span id="videoViewCount" class="modal-view-count">– views</span>
+              </div>
             </div>
-            <div class="ml-4">
-              <h3 id="creatorName" class="font-medium text-lg text-white">
-                Creator Name
-              </h3>
-              <p id="creatorNpub" class="text-sm text-gray-400">npub...</p>
-            </div>
-          </div>
 
-          <!-- Video Description -->
-          <div class="bg-gray-800/50 rounded-lg p-4 mb-4">
-            <p id="videoDescription" class="text-gray-300 whitespace-pre-wrap">
-              No description available.
-            </p>
-          </div>
-
-          <!-- Torrent stats -->
-          <div class="bg-gray-800/50 rounded-lg p-4">
-            <div class="w-full bg-gray-700 rounded-full h-2 mb-2">
-              <div
-                class="bg-blue-500 h-2 rounded-full"
-                id="modalProgress"
-                style="width: 0%"
-              ></div>
+            <div class="card flex items-center gap-4 px-6 py-5">
+              <div class="h-14 w-14 overflow-hidden rounded-full bg-border-subtle">
+                <img
+                  id="creatorAvatar"
+                  src=""
+                  alt="Creator"
+                  class="h-full w-full object-cover"
+                />
+              </div>
+              <div class="flex flex-col gap-1">
+                <h3
+                  id="creatorName"
+                  class="text-lg font-semibold text-white"
+                >
+                  Creator Name
+                </h3>
+                <p id="creatorNpub" class="text-sm text-muted">npub...</p>
+              </div>
             </div>
-            <div class="flex justify-between text-sm text-gray-400">
-              <span id="modalPeers">Peers: 0</span>
-              <span id="modalSpeed">Speed: 0 KB/s</span>
-              <span id="modalDownloaded">Downloaded: 0 MB / 0 MB</span>
+
+            <div class="card px-6 py-5">
+              <p
+                id="videoDescription"
+                class="whitespace-pre-wrap text-sm leading-relaxed text-text"
+              >
+                No description available.
+              </p>
+            </div>
+
+            <div class="card space-y-4 px-6 py-5">
+              <div class="h-2 w-full overflow-hidden rounded-full bg-border-subtle">
+                <div
+                  id="modalProgress"
+                  class="h-full w-[0%] rounded-full bg-info"
+                  style="width: 0%"
+                ></div>
+              </div>
+              <div class="flex flex-wrap items-center justify-between gap-3 text-sm text-muted">
+                <span id="modalPeers">Peers: 0</span>
+                <span id="modalSpeed">Speed: 0 KB/s</span>
+                <span id="modalDownloaded">Downloaded: 0 MB / 0 MB</span>
+              </div>
             </div>
           </div>
         </div>