diff --git a/components/upload-modal.html b/components/upload-modal.html
index bd54e099..c3b448d6 100644
--- a/components/upload-modal.html
+++ b/components/upload-modal.html
@@ -74,6 +74,7 @@
               Share a title plus either a hosted video URL or a magnet link.
               Providing both helps bitvid fall back gracefully.
             </p>
+
             <div class="space-y-2">
               <label
                 for="uploadTitle"
@@ -83,164 +84,6 @@
               <input type="text" id="uploadTitle" required class="input" />
             </div>
 
-            <div
-              class="bg-overlay-black/30 space-y-4 rounded-lg border border-border/70 p-4"
-              id="nip71EventDetails"
-              data-nip71-section="event-details"
-            >
-              <fieldset
-                id="nip71KindFieldset"
-                class="space-y-2"
-                data-nip71-fieldset="kind"
-              >
-                <legend class="text-sm font-semibold text-text">
-                  NIP-71 event type
-                </legend>
-                <p class="text-xs text-muted">
-                  Choose the video format.
-                  <span class="font-medium text-muted-strong">Kind 21</span> is a
-                  full video, while
-                  <span class="font-medium text-muted-strong">Kind 22</span> is a
-                  short.
-                </p>
-                <div
-                  class="form-control"
-                  role="radiogroup"
-                  aria-labelledby="nip71KindFieldset"
-                >
-                  <div
-                    class="menu sm:flex-row sm:flex-wrap sm:py-0"
-                    role="presentation"
-                  >
-                    <label
-                      class="menu__item gap-3 px-0 py-0"
-                      for="nip71KindLong"
-                    >
-                      <input
-                        type="radio"
-                        name="nip71Kind"
-                        id="nip71KindLong"
-                        value="21"
-                        checked
-                        data-nip71-input="kind"
-                        class="h-4 w-4 border-border bg-panel text-info focus:ring-info"
-                      />
-                      <span class="text-sm text-text"
-                        >Normal video (kind 21)</span
-                      >
-                    </label>
-                    <label
-                      class="menu__item gap-3 px-0 py-0"
-                      for="nip71KindShort"
-                    >
-                      <input
-                        type="radio"
-                        name="nip71Kind"
-                        id="nip71KindShort"
-                        value="22"
-                        data-nip71-input="kind"
-                        class="h-4 w-4 border-border bg-panel text-info focus:ring-info"
-                      />
-                      <span class="text-sm text-text"
-                        >Short video (kind 22)</span
-                      >
-                    </label>
-                  </div>
-                </div>
-              </fieldset>
-
-              <div class="grid gap-4 md:grid-cols-2" data-nip71-grid="metadata">
-                <div class="space-y-2">
-                  <label
-                    for="nip71PublishedAt"
-                    class="block text-sm font-medium text-text"
-                    >Published at</label
-                  >
-                  <input
-                    type="datetime-local"
-                    id="nip71PublishedAt"
-                    data-nip71-input="published_at"
-                    class="input"
-                  />
-                  <p class="text-xs text-muted">
-                    Set the canonical publish time for cross-client ordering.
-                  </p>
-                </div>
-                <div class="space-y-2">
-                  <label
-                    for="nip71AltText"
-                    class="block text-sm font-medium text-text"
-                    >Alt text</label
-                  >
-                  <input
-                    type="text"
-                    id="nip71AltText"
-                    data-nip71-input="alt"
-                    placeholder="Describe the visuals for screen readers"
-                    class="input"
-                  />
-                  <p class="text-xs text-muted">
-                    Plain-language fallback shown when the media cannot load.
-                  </p>
-                </div>
-                <div class="space-y-2">
-                  <label
-                    for="nip71Duration"
-                    class="block text-sm font-medium text-text"
-                    >Duration (seconds)</label
-                  >
-                  <input
-                    type="number"
-                    id="nip71Duration"
-                    min="0"
-                    step="0.001"
-                    data-nip71-input="duration"
-                    class="input"
-                  />
-                  <p class="text-xs text-muted">
-                    Optional legacy fallback in seconds (fractions allowed) for clients that
-                    expect a top-level duration.
-                  </p>
-                </div>
-                <div class="space-y-2">
-                  <label
-                    for="nip71ContentWarning"
-                    class="block text-sm font-medium text-text"
-                    >Content warning</label
-                  >
-                  <input
-                    type="text"
-                    id="nip71ContentWarning"
-                    data-nip71-input="content-warning"
-                    placeholder="e.g., Flashing lights"
-                    class="input"
-                  />
-                  <p class="text-xs text-muted">
-                    Leave blank if the video is safe for all audiences.
-                  </p>
-                </div>
-              </div>
-
-              <div class="space-y-2">
-                <label
-                  for="nip71Summary"
-                  class="block text-sm font-medium text-text"
-                  >Summary</label
-                >
-                <textarea
-                  id="nip71Summary"
-                  rows="3"
-                  data-nip71-input="summary"
-                  class="textarea"
-                  placeholder="Short synopsis used as the Nostr content field"
-                ></textarea>
-                <p class="text-xs text-muted">
-                  This becomes the event content. Keep it concise for Nostr
-                  readers.
-                </p>
-              </div>
-            </div>
-
             <!-- Hosted video URL -->
             <div class="form-group space-y-2">
               <label
@@ -260,22 +103,6 @@
               >
             </div>
 
-            <!-- Optional: seed bootstraps for magnet -->
-            <div class="mb-2 grid grid-cols-1 gap-3 text-xs">
-              <input
-                id="uploadWs"
-                type="url"
-                class="input text-xs"
-                placeholder="Web seed (ws=) e.g., https://cdn.example.com/video.mp4"
-              />
-              <input
-                id="uploadXs"
-                type="url"
-                class="input text-xs"
-                placeholder=".torrent URL (xs=) e.g., https://cdn.example.com/video.torrent"
-              />
-            </div>
-
             <div class="space-y-2">
               <label
                 for="uploadMagnet"
@@ -293,6 +120,7 @@
                 cost control.
               </p>
             </div>
+
             <div class="space-y-2">
               <label
                 for="uploadThumbnail"
@@ -306,7 +134,7 @@
               <label
                 for="uploadDescription"
                 class="block text-sm font-medium text-text"
-                >Legacy description (optional)</label
+                >Video description</label
               >
               <textarea
                 id="uploadDescription"
@@ -314,488 +142,13 @@
                 class="textarea"
               ></textarea>
               <p class="text-xs text-muted">
-                Kept for older clients that rely on the legacy description tag.
+                 Description of your video.
               </p>
             </div>
 
-            <fieldset
-              id="nip71TagsFieldset"
-              class="bg-overlay-black/30 space-y-6 rounded-lg border border-border/70 p-4"
-              data-nip71-section="tags"
-            >
-              <legend class="relative text-sm font-semibold text-text">
-                <span class="bg-overlay-black/30 -ml-2 inline-block rounded px-2"
-                  >NIP-71 tags</span
-                >
-              </legend>
-              <p class="text-xs text-muted">
-                Use the controls below to describe media variants, captions,
-                chapters, participants, and references.
-              </p>
-
-              <section
-                class="space-y-4"
-                aria-labelledby="nip71ImetaLabel"
-                data-nip71-repeater="imeta"
-              >
-                <div class="flex items-center justify-between">
-                  <h3
-                    id="nip71ImetaLabel"
-                    class="text-sm font-medium text-text"
-                  >
-                    Image metadata (imeta)
-                  </h3>
-                  <button
-                    type="button"
-                    class="btn-ghost px-3 py-1 text-xs"
-                    data-nip71-add="imeta"
-                    aria-describedby="nip71ImetaHelp"
-                  >
-                    Add variant
-                  </button>
-                </div>
-                <p id="nip71ImetaHelp" class="text-xs text-muted">
-                  Provide dimensions, MIME type, and resource links for each
-                  variant. Nested repeaters let you attach multiple
-                  <code>image</code>, <code>fallback</code>, or
-                  <code>service</code> values.
-                </p>
-                <div
-                  id="nip71ImetaList"
-                  class="space-y-4"
-                  data-nip71-list="imeta"
-                ></div>
-                <template id="nip71ImetaTemplate" data-nip71-template="imeta">
-                  <article
-                    class="space-y-3 rounded-md border border-border/70 bg-surface/60 p-4"
-                    data-nip71-entry="imeta"
-                  >
-                    <div class="grid gap-3 md:grid-cols-2">
-                      <div class="space-y-2">
-                        <label class="block text-xs font-medium text-muted-strong">
-                          MIME type (<code>m</code>)
-                        </label>
-                        <input
-                          type="text"
-                          data-nip71-field="m"
-                          placeholder="video/mp4"
-                          class="input"
-                        />
-                        <p class="text-3xs text-muted">
-                          RFC 2046 media type for this encoding.
-                        </p>
-                      </div>
-                      <div class="space-y-2">
-                        <label class="block text-xs font-medium text-muted-strong">
-                          Pixel dimensions (<code>dim</code>)
-                        </label>
-                        <input
-                          type="text"
-                          data-nip71-field="dim"
-                          placeholder="1920x1080"
-                          class="input"
-                        />
-                        <p class="text-3xs text-muted">
-                          Formatted as widthxheight.
-                        </p>
-                      </div>
-                      <div class="space-y-2">
-                        <label class="block text-xs font-medium text-muted-strong">
-                          Streaming URL (<code>url</code>)
-                        </label>
-                        <input
-                          type="url"
-                          data-nip71-field="url"
-                          placeholder="https://cdn.example.com/variant.m3u8"
-                          class="input"
-                        />
-                        <p class="text-3xs text-muted">
-                          HTTPS variant URL shared across clients.
-                        </p>
-                      </div>
-                    <div class="space-y-2">
-                      <label class="block text-xs font-medium text-muted-strong">
-                        Magnet (<code>x</code>)
-                      </label>
-                      <input
-                        type="text"
-                        data-nip71-field="x"
-                        placeholder="magnet:?xt=urn:btih:..."
-                        class="input"
-                      />
-                      <p class="text-3xs text-muted">
-                        Optional magnet pointer if the variant is seeded via
-                        P2P.
-                      </p>
-                    </div>
-                    <div class="space-y-2">
-                      <label class="block text-xs font-medium text-muted-strong">
-                        Duration seconds (<code>duration</code>)
-                      </label>
-                      <input
-                        type="number"
-                        data-nip71-field="duration"
-                        min="0"
-                        step="0.001"
-                        placeholder="29.97"
-                        class="input"
-                      />
-                      <p class="text-3xs text-muted">
-                        Fractional seconds supported; clients use this for precise timelines.
-                      </p>
-                    </div>
-                    <div class="space-y-2">
-                      <label class="block text-xs font-medium text-muted-strong">
-                        Bitrate bps (<code>bitrate</code>)
-                      </label>
-                      <input
-                        type="number"
-                        data-nip71-field="bitrate"
-                        min="0"
-                        step="1"
-                        placeholder="3500000"
-                        class="input"
-                      />
-                      <p class="text-3xs text-muted">
-                        Average bits per second for this variant.
-                      </p>
-                    </div>
-                  </div>
-
-                    <div class="space-y-3" data-nip71-nested="image">
-                      <div class="flex items-center justify-between">
-                        <h4
-                          class="text-xs font-semibold uppercase tracking-wide text-muted"
-                        >
-                          Image values
-                        </h4>
-                        <button
-                          type="button"
-                          class="btn-ghost px-2 py-1 text-3xs"
-                          data-nip71-nested-add="image"
-                        >
-                          Add image URL
-                        </button>
-                      </div>
-                      <div
-                        class="space-y-2"
-                        data-nip71-nested-list="image"
-                      ></div>
-                      <template data-nip71-nested-template="image">
-                        <div
-                          class="flex items-center gap-2"
-                          data-nip71-nested-entry="image"
-                        >
-                          <input
-                            type="url"
-                            placeholder="https://cdn.example.com/poster.jpg"
-                            data-nip71-nested-field="image"
-                            class="input flex-1"
-                          />
-                          <button
-                            type="button"
-                            class="btn-ghost px-2 py-1 text-3xs text-muted-strong"
-                            data-nip71-remove="nested"
-                            aria-label="Remove image URL"
-                          >
-                            Remove
-                          </button>
-                        </div>
-                      </template>
-                    </div>
-
-                    <div class="space-y-3" data-nip71-nested="fallback">
-                      <div class="flex items-center justify-between">
-                        <h4
-                          class="text-xs font-semibold uppercase tracking-wide text-muted"
-                        >
-                          Fallback URLs
-                        </h4>
-                        <button
-                          type="button"
-                          class="btn-ghost px-2 py-1 text-3xs"
-                          data-nip71-nested-add="fallback"
-                        >
-                          Add fallback
-                        </button>
-                      </div>
-                      <div
-                        class="space-y-2"
-                        data-nip71-nested-list="fallback"
-                      ></div>
-                      <template data-nip71-nested-template="fallback">
-                        <div
-                          class="flex items-center gap-2"
-                          data-nip71-nested-entry="fallback"
-                        >
-                          <input
-                            type="url"
-                            placeholder="https://cdn.backup.net/video.mp4"
-                            data-nip71-nested-field="fallback"
-                            class="input flex-1"
-                          />
-                          <button
-                            type="button"
-                            class="btn-ghost px-2 py-1 text-3xs text-muted-strong"
-                            data-nip71-remove="nested"
-                            aria-label="Remove fallback URL"
-                          >
-                            Remove
-                          </button>
-                        </div>
-                      </template>
-                    </div>
-
-                    <div class="space-y-3" data-nip71-nested="service">
-                      <div class="flex items-center justify-between">
-                        <h4
-                          class="text-xs font-semibold uppercase tracking-wide text-muted"
-                        >
-                          Services
-                        </h4>
-                        <button
-                          type="button"
-                          class="btn-ghost px-2 py-1 text-3xs"
-                          data-nip71-nested-add="service"
-                        >
-                          Add service hint
-                        </button>
-                      </div>
-                      <div
-                        class="space-y-2"
-                        data-nip71-nested-list="service"
-                      ></div>
-                      <template data-nip71-nested-template="service">
-                        <div
-                          class="flex items-center gap-2"
-                          data-nip71-nested-entry="service"
-                        >
-                          <input
-                            type="text"
-                            placeholder="streaming-provider-id"
-                            data-nip71-nested-field="service"
-                            class="input flex-1"
-                          />
-                          <button
-                            type="button"
-                            class="btn-ghost px-2 py-1 text-3xs text-muted-strong"
-                            data-nip71-remove="nested"
-                            aria-label="Remove service hint"
-                          >
-                            Remove
-                          </button>
-                        </div>
-                      </template>
-                    </div>
-
-                    <button
-                      type="button"
-                      class="btn-ghost px-3 py-1 text-xs" data-variant="critical"
-                      data-nip71-remove="imeta"
-                    >
-                      Remove variant
-                    </button>
-                  </article>
-                </template>
-              </section>
-
-              <section
-                class="space-y-4"
-                aria-labelledby="nip71TextTracksLabel"
-                data-nip71-repeater="text-track"
-              >
-                <div class="flex items-center justify-between">
-                  <h3
-                    id="nip71TextTracksLabel"
-                    class="text-sm font-medium text-text"
-                  >
-                    Caption &amp; subtitle tracks (text-track)
-                  </h3>
-                  <button
-                    type="button"
-                    class="btn-ghost px-3 py-1 text-xs"
-                    data-nip71-add="text-track"
-                    aria-describedby="nip71TextTracksHelp"
-                  >
-                    Add track
-                  </button>
-                </div>
-                <p id="nip71TextTracksHelp" class="text-xs text-muted">
-                  Point to VTT/SRT caption files and optionally declare the
-                  language code (BCP-47).
-                </p>
-                <div
-                  id="nip71TextTrackList"
-                  class="space-y-4"
-                  data-nip71-list="text-track"
-                ></div>
-                <template
-                  id="nip71TextTrackTemplate"
-                  data-nip71-template="text-track"
-                >
-                  <article
-                    class="space-y-3 rounded-md border border-border/70 bg-surface/60 p-4"
-                    data-nip71-entry="text-track"
-                  >
-                    <div class="grid gap-3 md:grid-cols-3">
-                      <div class="space-y-2">
-                        <label class="block text-xs font-medium text-muted-strong"
-                          >Resource URL</label
-                        >
-                        <input
-                          type="url"
-                          data-nip71-field="url"
-                          placeholder="https://cdn.example.com/captions.en.vtt"
-                          class="input"
-                        />
-                        <p class="text-3xs text-muted">
-                          Direct link to the caption file.
-                        </p>
-                      </div>
-                      <div class="space-y-2">
-                        <label class="block text-xs font-medium text-muted-strong"
-                          >Track type</label
-                        >
-                        <input
-                          type="text"
-                          data-nip71-field="type"
-                          placeholder="subtitles"
-                          class="input"
-                        />
-                        <p class="text-3xs text-muted">
-                          Use values like captions, subtitles, or descriptions.
-                        </p>
-                      </div>
-                      <div class="space-y-2">
-                        <label class="block text-xs font-medium text-muted-strong"
-                          >Language (optional)</label
-                        >
-                        <input
-                          type="text"
-                          data-nip71-field="language"
-                          placeholder="en-US"
-                          class="input"
-                        />
-                        <p class="text-3xs text-muted">
-                          BCP-47 locale code.
-                        </p>
-                      </div>
-                    </div>
-                    <button
-                      type="button"
-                      class="btn-ghost px-3 py-1 text-xs" data-variant="critical"
-                      data-nip71-remove="text-track"
-                    >
-                      Remove track
-                    </button>
-                  </article>
-                </template>
-              </section>
-
-              <section
-                class="space-y-4"
-                aria-labelledby="nip71SegmentsLabel"
-                data-nip71-repeater="segment"
-              >
-                <div class="flex items-center justify-between">
-                  <h3
-                    id="nip71SegmentsLabel"
-                    class="text-sm font-medium text-text"
-                  >
-                    Chapters &amp; segments (segment)
-                  </h3>
-                  <button
-                    type="button"
-                    class="btn-ghost px-3 py-1 text-xs"
-                    data-nip71-add="segment"
-                    aria-describedby="nip71SegmentsHelp"
-                  >
-                    Add segment
-                  </button>
-                </div>
-                <p id="nip71SegmentsHelp" class="text-xs text-muted">
-                  Outline the timeline using HH:MM:SS timestamps. Thumbnail URLs
-                  are optional.
-                </p>
-                <div
-                  id="nip71SegmentList"
-                  class="space-y-4"
-                  data-nip71-list="segment"
-                ></div>
-                <template
-                  id="nip71SegmentTemplate"
-                  data-nip71-template="segment"
-                >
-                  <article
-                    class="space-y-3 rounded-md border border-border/70 bg-surface/60 p-4"
-                    data-nip71-entry="segment"
-                  >
-                    <div class="grid gap-3 md:grid-cols-4">
-                      <div class="space-y-2">
-                        <label class="block text-xs font-medium text-muted-strong"
-                          >Start</label
-                        >
-                        <input
-                          type="text"
-                          data-nip71-field="start"
-                          placeholder="00:00:00"
-                          class="input"
-                        />
-                        <p class="text-3xs text-muted">HH:MM:SS</p>
-                      </div>
-                      <div class="space-y-2">
-                        <label class="block text-xs font-medium text-muted-strong"
-                          >End</label
-                        >
-                        <input
-                          type="text"
-                          data-nip71-field="end"
-                          placeholder="00:03:30"
-                          class="input"
-                        />
-                        <p class="text-3xs text-muted">
-                          Leave blank for open-ended segments.
-                        </p>
-                      </div>
-                      <div class="space-y-2 md:col-span-2">
-                        <label class="block text-xs font-medium text-muted-strong"
-                          >Chapter title</label
-                        >
-                        <input
-                          type="text"
-                          data-nip71-field="title"
-                          placeholder="Introduction"
-                          class="input"
-                        />
-                      </div>
-                      <div class="space-y-2 md:col-span-2">
-                        <label class="block text-xs font-medium text-muted-strong"
-                          >Thumbnail URL</label
-                        >
-                        <input
-                          type="url"
-                          data-nip71-field="thumbnail"
-                          placeholder="https://cdn.example.com/segment.jpg"
-                          class="input"
-                        />
-                        <p class="text-3xs text-muted">
-                          Optional still image for this moment.
-                        </p>
-                      </div>
-                    </div>
-                    <button
-                      type="button"
-                      class="btn-ghost px-3 py-1 text-xs" data-variant="critical"
-                      data-nip71-remove="segment"
-                    >
-                      Remove segment
-                    </button>
-                  </article>
-                </template>
-              </section>
-
-              <section
-                class="space-y-4"
+            <!-- Hashtags (Visible) -->
+            <section
+                class="space-y-4 rounded-lg border border-border/70 bg-surface/30 p-4"
                 aria-labelledby="nip71HashtagsLabel"
                 data-nip71-repeater="t"
               >
@@ -804,7 +157,7 @@
                     id="nip71HashtagsLabel"
                     class="text-sm font-medium text-text"
                   >
-                    Hashtags (<code>t</code>)
+                    Hashtags
                   </h3>
                   <button
                     type="button"
@@ -814,10 +167,6 @@
                     Add hashtag
                   </button>
                 </div>
-                <p class="text-xs text-muted">
-                  Enter keywords; leading <code>#</code> characters are stripped
-                  automatically when saving.
-                </p>
                 <div
                   id="nip71HashtagList"
                   class="space-y-2"
@@ -841,132 +190,7 @@
                     </button>
                   </div>
                 </template>
-              </section>
-
-              <section
-                class="space-y-4"
-                aria-labelledby="nip71ParticipantsLabel"
-                data-nip71-repeater="p"
-              >
-                <div class="flex items-center justify-between">
-                  <h3
-                    id="nip71ParticipantsLabel"
-                    class="text-sm font-medium text-text"
-                  >
-                    Participants (<code>p</code>)
-                  </h3>
-                  <button
-                    type="button"
-                    class="btn-ghost px-3 py-1 text-xs"
-                    data-nip71-add="p"
-                  >
-                    Add participant
-                  </button>
-                </div>
-                <p class="text-xs text-muted">
-                  Paste the participant npub or hex pubkey. Optionally provide a
-                  preferred relay URL.
-                </p>
-                <div
-                  id="nip71ParticipantList"
-                  class="space-y-3"
-                  data-nip71-list="p"
-                ></div>
-                <template id="nip71ParticipantTemplate" data-nip71-template="p">
-                  <article
-                    class="space-y-3 rounded-md border border-border/70 bg-surface/60 p-4"
-                    data-nip71-entry="p"
-                  >
-                    <div class="grid gap-3 md:grid-cols-2">
-                      <div class="space-y-2">
-                        <label class="block text-xs font-medium text-muted-strong"
-                          >Pubkey</label
-                        >
-                        <input
-                          type="text"
-                          data-nip71-field="pubkey"
-                          placeholder="npub1..."
-                          class="input"
-                        />
-                        <p class="text-3xs text-muted">
-                          Accepts npub or hex.
-                        </p>
-                      </div>
-                      <div class="space-y-2">
-                        <label class="block text-xs font-medium text-muted-strong"
-                          >Relay URL (optional)</label
-                        >
-                        <input
-                          type="url"
-                          data-nip71-field="relay"
-                          placeholder="wss://relay.example.com"
-                          class="input"
-                        />
-                        <p class="text-3xs text-muted">
-                          Relay hint for discovering the participant.
-                        </p>
-                      </div>
-                    </div>
-                    <button
-                      type="button"
-                      class="btn-ghost px-3 py-1 text-xs" data-variant="critical"
-                      data-nip71-remove="p"
-                    >
-                      Remove participant
-                    </button>
-                  </article>
-                </template>
-              </section>
-
-              <section
-                class="space-y-4"
-                aria-labelledby="nip71ReferencesLabel"
-                data-nip71-repeater="r"
-              >
-                <div class="flex items-center justify-between">
-                  <h3
-                    id="nip71ReferencesLabel"
-                    class="text-sm font-medium text-text"
-                  >
-                    Reference links (<code>r</code>)
-                  </h3>
-                  <button
-                    type="button"
-                    class="btn-ghost px-3 py-1 text-xs"
-                    data-nip71-add="r"
-                  >
-                    Add reference
-                  </button>
-                </div>
-                <p class="text-xs text-muted">
-                  Link to transcripts, source repositories, or related
-                  resources.
-                </p>
-                <div
-                  id="nip71ReferenceList"
-                  class="space-y-2"
-                  data-nip71-list="r"
-                ></div>
-                <template id="nip71ReferenceTemplate" data-nip71-template="r">
-                  <div class="flex items-center gap-2" data-nip71-entry="r">
-                    <input
-                      type="url"
-                      data-nip71-field="url"
-                      placeholder="https://example.com/article"
-                      class="input flex-1"
-                    />
-                    <button
-                      type="button"
-                      class="btn-ghost px-2 py-1 text-3xs" data-variant="critical"
-                      data-nip71-remove="r"
-                      aria-label="Remove reference"
-                    >
-                      Remove
-                    </button>
-                  </div>
-                </template>
-              </section>
-            </fieldset>
+            </section>
 
             <div
               class="form-control"
@@ -992,12 +216,12 @@
                     Enable comments
                   </span>
                   <span class="text-xs text-muted">
-                    Keep this on to let viewers discuss the video once comment
-                    threads launch.
+                    Keep this on to let viewers discuss the video.
                   </span>
                 </span>
               </label>
             </div>
+
             <div class="grid gap-3 md:grid-cols-2">
               <div
                 class="form-control"
@@ -1022,8 +246,7 @@
                       Is this content NSFW?
                     </span>
                     <span class="text-xs text-muted">
-                      Flag mature or explicit uploads so clients can warn
-                      viewers before playback.
+                      Flag mature or explicit uploads.
                     </span>
                   </span>
                 </label>
@@ -1051,25 +274,743 @@
                       Is this content created for Kids?
                     </span>
                     <span class="text-xs text-muted">
-                      Mark clearly kid-friendly videos so parental controls and
-                      playlists stay accurate.
+                      Mark clearly kid-friendly videos.
                     </span>
                   </span>
                 </label>
               </div>
             </div>
-            <!--
-            <div class="flex items-center space-x-2">
-              <input
-                type="checkbox"
-                id="uploadIsPrivate"
-                class="checkbox"
-              />
-              <span class="text-sm font-medium text-text"
-                >Private Listing (Hide from shared grids)</span
-              >
+
+            <!-- Advanced Toggle -->
+            <div class="border-t border-border/70 pt-4">
+               <button
+                  type="button"
+                  id="customAdvancedToggle"
+                  class="btn-ghost justify-start gap-2 text-sm text-muted-strong"
+                  aria-expanded="false"
+                  aria-controls="customAdvancedFields"
+                >
+                  <svg
+                    id="customAdvancedToggleIcon"
+                    xmlns="http://www.w3.org/2000/svg"
+                    class="h-4 w-4 transform text-muted-strong transition-transform duration-150"
+                    fill="none"
+                    viewBox="0 0 24 24"
+                    stroke="currentColor"
+                    stroke-width="2"
+                  >
+                    <path
+                      stroke-linecap="round"
+                      stroke-linejoin="round"
+                      d="M9 5l7 7-7 7"
+                    />
+                  </svg>
+                  <span id="customAdvancedToggleLabel">Show advanced options</span>
+                </button>
             </div>
-            -->
+
+            <!-- Advanced Container -->
+            <div id="customAdvancedFields" class="hidden space-y-6 rounded-lg border border-border/70 bg-surface/30 p-4">
+                 <!-- Web Seeds -->
+                 <div class="grid grid-cols-1 gap-3 text-xs">
+                  <input
+                    id="uploadWs"
+                    type="url"
+                    class="input text-xs"
+                    placeholder="Web seed (ws=) e.g., https://cdn.example.com/video.mp4"
+                  />
+                  <input
+                    id="uploadXs"
+                    type="url"
+                    class="input text-xs"
+                    placeholder=".torrent URL (xs=) e.g., https://cdn.example.com/video.torrent"
+                  />
+                  <p class="text-xs text-muted">Advanced P2P seeding options.</p>
+                </div>
+
+                <div
+                  id="nip71EventDetails"
+                  class="space-y-4"
+                  data-nip71-section="event-details"
+                >
+                  <fieldset
+                    id="nip71KindFieldset"
+                    class="space-y-2"
+                    data-nip71-fieldset="kind"
+                  >
+                    <legend class="text-sm font-semibold text-text">
+                      NIP-71 event type
+                    </legend>
+                    <div
+                      class="form-control"
+                      role="radiogroup"
+                      aria-labelledby="nip71KindFieldset"
+                    >
+                      <div
+                        class="menu sm:flex-row sm:flex-wrap sm:py-0"
+                        role="presentation"
+                      >
+                        <label
+                          class="menu__item gap-3 px-0 py-0"
+                          for="nip71KindLong"
+                        >
+                          <input
+                            type="radio"
+                            name="nip71Kind"
+                            id="nip71KindLong"
+                            value="21"
+                            checked
+                            data-nip71-input="kind"
+                            class="h-4 w-4 border-border bg-panel text-info focus:ring-info"
+                          />
+                          <span class="text-sm text-text"
+                            >Normal video (kind 21)</span
+                          >
+                        </label>
+                        <label
+                          class="menu__item gap-3 px-0 py-0"
+                          for="nip71KindShort"
+                        >
+                          <input
+                            type="radio"
+                            name="nip71Kind"
+                            id="nip71KindShort"
+                            value="22"
+                            data-nip71-input="kind"
+                            class="h-4 w-4 border-border bg-panel text-info focus:ring-info"
+                          />
+                          <span class="text-sm text-text"
+                            >Short video (kind 22)</span
+                          >
+                        </label>
+                      </div>
+                    </div>
+                  </fieldset>
+
+                  <div class="grid gap-4 md:grid-cols-2" data-nip71-grid="metadata">
+                    <div class="space-y-2">
+                      <label
+                        for="nip71PublishedAt"
+                        class="block text-sm font-medium text-text"
+                        >Published at</label
+                      >
+                      <input
+                        type="datetime-local"
+                        id="nip71PublishedAt"
+                        data-nip71-input="published_at"
+                        class="input"
+                      />
+                    </div>
+                    <div class="space-y-2">
+                      <label
+                        for="nip71AltText"
+                        class="block text-sm font-medium text-text"
+                        >Alt text</label
+                      >
+                      <input
+                        type="text"
+                        id="nip71AltText"
+                        data-nip71-input="alt"
+                        placeholder="Describe the visuals for screen readers"
+                        class="input"
+                      />
+                    </div>
+                    <div class="space-y-2">
+                      <label
+                        for="nip71Duration"
+                        class="block text-sm font-medium text-text"
+                        >Duration (seconds)</label
+                      >
+                      <input
+                        type="number"
+                        id="nip71Duration"
+                        min="0"
+                        step="0.001"
+                        data-nip71-input="duration"
+                        class="input"
+                      />
+                    </div>
+                    <div class="space-y-2">
+                      <label
+                        for="nip71ContentWarning"
+                        class="block text-sm font-medium text-text"
+                        >Content warning</label
+                      >
+                      <input
+                        type="text"
+                        id="nip71ContentWarning"
+                        data-nip71-input="content-warning"
+                        placeholder="e.g., Flashing lights"
+                        class="input"
+                      />
+                    </div>
+                  </div>
+
+                  <div class="space-y-2">
+                    <div class="flex items-center justify-between">
+                        <label
+                        for="nip71Summary"
+                        class="block text-sm font-medium text-text"
+                        >Summary</label
+                        >
+                        <label class="flex items-center gap-2 text-xs text-muted cursor-pointer select-none">
+                          <input type="checkbox" id="nip71SummaryUnlock" class="checkbox h-3 w-3 rounded-sm border-muted" />
+                          Customize
+                        </label>
+                    </div>
+
+                    <textarea
+                      id="nip71Summary"
+                      rows="3"
+                      data-nip71-input="summary"
+                      class="textarea text-muted-strong"
+                      placeholder="Short synopsis used as the Nostr content field"
+                      readonly
+                    ></textarea>
+                    <p class="text-xs text-muted">
+                      This becomes the event content. By default it mirrors the description.
+                    </p>
+                  </div>
+                </div>
+
+                <fieldset
+                  id="nip71TagsFieldset"
+                  class="space-y-6 pt-4"
+                  data-nip71-section="tags"
+                >
+                  <legend class="relative text-sm font-semibold text-text pb-2 border-b border-border/50 w-full mb-4">
+                     Advanced Tags (IMETA, Tracks, Segments)
+                  </legend>
+
+                  <section
+                    class="space-y-4"
+                    aria-labelledby="nip71ImetaLabel"
+                    data-nip71-repeater="imeta"
+                  >
+                    <div class="flex items-center justify-between">
+                      <h3
+                        id="nip71ImetaLabel"
+                        class="text-sm font-medium text-text"
+                      >
+                        Image metadata (imeta)
+                      </h3>
+                      <button
+                        type="button"
+                        class="btn-ghost px-3 py-1 text-xs"
+                        data-nip71-add="imeta"
+                        aria-describedby="nip71ImetaHelp"
+                      >
+                        Add variant
+                      </button>
+                    </div>
+                    <p id="nip71ImetaHelp" class="text-xs text-muted">
+                      Provide dimensions, MIME type, and resource links for each
+                      variant.
+                    </p>
+                    <div
+                      id="nip71ImetaList"
+                      class="space-y-4"
+                      data-nip71-list="imeta"
+                    ></div>
+                    <template id="nip71ImetaTemplate" data-nip71-template="imeta">
+                      <article
+                        class="space-y-3 rounded-md border border-border/70 bg-surface/60 p-4"
+                        data-nip71-entry="imeta"
+                      >
+                        <div class="grid gap-3 md:grid-cols-2">
+                          <div class="space-y-2">
+                            <label class="block text-xs font-medium text-muted-strong">
+                              MIME type (<code>m</code>)
+                            </label>
+                            <input
+                              type="text"
+                              data-nip71-field="m"
+                              placeholder="video/mp4"
+                              class="input"
+                            />
+                          </div>
+                          <div class="space-y-2">
+                            <label class="block text-xs font-medium text-muted-strong">
+                              Pixel dimensions (<code>dim</code>)
+                            </label>
+                            <input
+                              type="text"
+                              data-nip71-field="dim"
+                              placeholder="1920x1080"
+                              class="input"
+                            />
+                          </div>
+                          <div class="space-y-2">
+                            <label class="block text-xs font-medium text-muted-strong">
+                              Streaming URL (<code>url</code>)
+                            </label>
+                            <input
+                              type="url"
+                              data-nip71-field="url"
+                              placeholder="https://cdn.example.com/variant.m3u8"
+                              class="input"
+                            />
+                          </div>
+                        <div class="space-y-2">
+                          <label class="block text-xs font-medium text-muted-strong">
+                            Magnet (<code>x</code>)
+                          </label>
+                          <input
+                            type="text"
+                            data-nip71-field="x"
+                            placeholder="magnet:?xt=urn:btih:..."
+                            class="input"
+                          />
+                        </div>
+                        <div class="space-y-2">
+                          <label class="block text-xs font-medium text-muted-strong">
+                            Duration seconds (<code>duration</code>)
+                          </label>
+                          <input
+                            type="number"
+                            data-nip71-field="duration"
+                            min="0"
+                            step="0.001"
+                            placeholder="29.97"
+                            class="input"
+                          />
+                        </div>
+                        <div class="space-y-2">
+                          <label class="block text-xs font-medium text-muted-strong">
+                            Bitrate bps (<code>bitrate</code>)
+                          </label>
+                          <input
+                            type="number"
+                            data-nip71-field="bitrate"
+                            min="0"
+                            step="1"
+                            placeholder="3500000"
+                            class="input"
+                          />
+                        </div>
+                      </div>
+
+                        <div class="space-y-3" data-nip71-nested="image">
+                          <div class="flex items-center justify-between">
+                            <h4
+                              class="text-xs font-semibold uppercase tracking-wide text-muted"
+                            >
+                              Image values
+                            </h4>
+                            <button
+                              type="button"
+                              class="btn-ghost px-2 py-1 text-3xs"
+                              data-nip71-nested-add="image"
+                            >
+                              Add image URL
+                            </button>
+                          </div>
+                          <div
+                            class="space-y-2"
+                            data-nip71-nested-list="image"
+                          ></div>
+                          <template data-nip71-nested-template="image">
+                            <div
+                              class="flex items-center gap-2"
+                              data-nip71-nested-entry="image"
+                            >
+                              <input
+                                type="url"
+                                placeholder="https://cdn.example.com/poster.jpg"
+                                data-nip71-nested-field="image"
+                                class="input flex-1"
+                              />
+                              <button
+                                type="button"
+                                class="btn-ghost px-2 py-1 text-3xs text-muted-strong"
+                                data-nip71-remove="nested"
+                                aria-label="Remove image URL"
+                              >
+                                Remove
+                              </button>
+                            </div>
+                          </template>
+                        </div>
+
+                        <div class="space-y-3" data-nip71-nested="fallback">
+                          <div class="flex items-center justify-between">
+                            <h4
+                              class="text-xs font-semibold uppercase tracking-wide text-muted"
+                            >
+                              Fallback URLs
+                            </h4>
+                            <button
+                              type="button"
+                              class="btn-ghost px-2 py-1 text-3xs"
+                              data-nip71-nested-add="fallback"
+                            >
+                              Add fallback
+                            </button>
+                          </div>
+                          <div
+                            class="space-y-2"
+                            data-nip71-nested-list="fallback"
+                          ></div>
+                          <template data-nip71-nested-template="fallback">
+                            <div
+                              class="flex items-center gap-2"
+                              data-nip71-nested-entry="fallback"
+                            >
+                              <input
+                                type="url"
+                                placeholder="https://cdn.backup.net/video.mp4"
+                                data-nip71-nested-field="fallback"
+                                class="input flex-1"
+                              />
+                              <button
+                                type="button"
+                                class="btn-ghost px-2 py-1 text-3xs text-muted-strong"
+                                data-nip71-remove="nested"
+                                aria-label="Remove fallback URL"
+                              >
+                                Remove
+                              </button>
+                            </div>
+                          </template>
+                        </div>
+
+                        <div class="space-y-3" data-nip71-nested="service">
+                          <div class="flex items-center justify-between">
+                            <h4
+                              class="text-xs font-semibold uppercase tracking-wide text-muted"
+                            >
+                              Services
+                            </h4>
+                            <button
+                              type="button"
+                              class="btn-ghost px-2 py-1 text-3xs"
+                              data-nip71-nested-add="service"
+                            >
+                              Add service hint
+                            </button>
+                          </div>
+                          <div
+                            class="space-y-2"
+                            data-nip71-nested-list="service"
+                          ></div>
+                          <template data-nip71-nested-template="service">
+                            <div
+                              class="flex items-center gap-2"
+                              data-nip71-nested-entry="service"
+                            >
+                              <input
+                                type="text"
+                                placeholder="streaming-provider-id"
+                                data-nip71-nested-field="service"
+                                class="input flex-1"
+                              />
+                              <button
+                                type="button"
+                                class="btn-ghost px-2 py-1 text-3xs text-muted-strong"
+                                data-nip71-remove="nested"
+                                aria-label="Remove service hint"
+                              >
+                                Remove
+                              </button>
+                            </div>
+                          </template>
+                        </div>
+
+                        <button
+                          type="button"
+                          class="btn-ghost px-3 py-1 text-xs" data-variant="critical"
+                          data-nip71-remove="imeta"
+                        >
+                          Remove variant
+                        </button>
+                      </article>
+                    </template>
+                  </section>
+
+                  <section
+                    class="space-y-4"
+                    aria-labelledby="nip71TextTracksLabel"
+                    data-nip71-repeater="text-track"
+                  >
+                    <div class="flex items-center justify-between">
+                      <h3
+                        id="nip71TextTracksLabel"
+                        class="text-sm font-medium text-text"
+                      >
+                        Caption &amp; subtitle tracks (text-track)
+                      </h3>
+                      <button
+                        type="button"
+                        class="btn-ghost px-3 py-1 text-xs"
+                        data-nip71-add="text-track"
+                        aria-describedby="nip71TextTracksHelp"
+                      >
+                        Add track
+                      </button>
+                    </div>
+                    <div
+                      id="nip71TextTrackList"
+                      class="space-y-4"
+                      data-nip71-list="text-track"
+                    ></div>
+                    <template
+                      id="nip71TextTrackTemplate"
+                      data-nip71-template="text-track"
+                    >
+                      <article
+                        class="space-y-3 rounded-md border border-border/70 bg-surface/60 p-4"
+                        data-nip71-entry="text-track"
+                      >
+                        <div class="grid gap-3 md:grid-cols-3">
+                          <div class="space-y-2">
+                            <label class="block text-xs font-medium text-muted-strong"
+                              >Resource URL</label
+                            >
+                            <input
+                              type="url"
+                              data-nip71-field="url"
+                              placeholder="https://cdn.example.com/captions.en.vtt"
+                              class="input"
+                            />
+                          </div>
+                          <div class="space-y-2">
+                            <label class="block text-xs font-medium text-muted-strong"
+                              >Track type</label
+                            >
+                            <input
+                              type="text"
+                              data-nip71-field="type"
+                              placeholder="subtitles"
+                              class="input"
+                            />
+                          </div>
+                          <div class="space-y-2">
+                            <label class="block text-xs font-medium text-muted-strong"
+                              >Language (optional)</label
+                            >
+                            <input
+                              type="text"
+                              data-nip71-field="language"
+                              placeholder="en-US"
+                              class="input"
+                            />
+                          </div>
+                        </div>
+                        <button
+                          type="button"
+                          class="btn-ghost px-3 py-1 text-xs" data-variant="critical"
+                          data-nip71-remove="text-track"
+                        >
+                          Remove track
+                        </button>
+                      </article>
+                    </template>
+                  </section>
+
+                  <section
+                    class="space-y-4"
+                    aria-labelledby="nip71SegmentsLabel"
+                    data-nip71-repeater="segment"
+                  >
+                    <div class="flex items-center justify-between">
+                      <h3
+                        id="nip71SegmentsLabel"
+                        class="text-sm font-medium text-text"
+                      >
+                        Chapters &amp; segments (segment)
+                      </h3>
+                      <button
+                        type="button"
+                        class="btn-ghost px-3 py-1 text-xs"
+                        data-nip71-add="segment"
+                        aria-describedby="nip71SegmentsHelp"
+                      >
+                        Add segment
+                      </button>
+                    </div>
+                    <div
+                      id="nip71SegmentList"
+                      class="space-y-4"
+                      data-nip71-list="segment"
+                    ></div>
+                    <template
+                      id="nip71SegmentTemplate"
+                      data-nip71-template="segment"
+                    >
+                      <article
+                        class="space-y-3 rounded-md border border-border/70 bg-surface/60 p-4"
+                        data-nip71-entry="segment"
+                      >
+                        <div class="grid gap-3 md:grid-cols-4">
+                          <div class="space-y-2">
+                            <label class="block text-xs font-medium text-muted-strong"
+                              >Start</label
+                            >
+                            <input
+                              type="text"
+                              data-nip71-field="start"
+                              placeholder="00:00:00"
+                              class="input"
+                            />
+                          </div>
+                          <div class="space-y-2">
+                            <label class="block text-xs font-medium text-muted-strong"
+                              >End</label
+                            >
+                            <input
+                              type="text"
+                              data-nip71-field="end"
+                              placeholder="00:03:30"
+                              class="input"
+                            />
+                          </div>
+                          <div class="space-y-2 md:col-span-2">
+                            <label class="block text-xs font-medium text-muted-strong"
+                              >Chapter title</label
+                            >
+                            <input
+                              type="text"
+                              data-nip71-field="title"
+                              placeholder="Introduction"
+                              class="input"
+                            />
+                          </div>
+                          <div class="space-y-2 md:col-span-2">
+                            <label class="block text-xs font-medium text-muted-strong"
+                              >Thumbnail URL</label
+                            >
+                            <input
+                              type="url"
+                              data-nip71-field="thumbnail"
+                              placeholder="https://cdn.example.com/segment.jpg"
+                              class="input"
+                            />
+                          </div>
+                        </div>
+                        <button
+                          type="button"
+                          class="btn-ghost px-3 py-1 text-xs" data-variant="critical"
+                          data-nip71-remove="segment"
+                        >
+                          Remove segment
+                        </button>
+                      </article>
+                    </template>
+                  </section>
+
+                  <section
+                    class="space-y-4"
+                    aria-labelledby="nip71ParticipantsLabel"
+                    data-nip71-repeater="p"
+                  >
+                    <div class="flex items-center justify-between">
+                      <h3
+                        id="nip71ParticipantsLabel"
+                        class="text-sm font-medium text-text"
+                      >
+                        Participants (<code>p</code>)
+                      </h3>
+                      <button
+                        type="button"
+                        class="btn-ghost px-3 py-1 text-xs"
+                        data-nip71-add="p"
+                      >
+                        Add participant
+                      </button>
+                    </div>
+                    <div
+                      id="nip71ParticipantList"
+                      class="space-y-3"
+                      data-nip71-list="p"
+                    ></div>
+                    <template id="nip71ParticipantTemplate" data-nip71-template="p">
+                      <article
+                        class="space-y-3 rounded-md border border-border/70 bg-surface/60 p-4"
+                        data-nip71-entry="p"
+                      >
+                        <div class="grid gap-3 md:grid-cols-2">
+                          <div class="space-y-2">
+                            <label class="block text-xs font-medium text-muted-strong"
+                              >Pubkey</label
+                            >
+                            <input
+                              type="text"
+                              data-nip71-field="pubkey"
+                              placeholder="npub1..."
+                              class="input"
+                            />
+                          </div>
+                          <div class="space-y-2">
+                            <label class="block text-xs font-medium text-muted-strong"
+                              >Relay URL (optional)</label
+                            >
+                            <input
+                              type="url"
+                              data-nip71-field="relay"
+                              placeholder="wss://relay.example.com"
+                              class="input"
+                            />
+                          </div>
+                        </div>
+                        <button
+                          type="button"
+                          class="btn-ghost px-3 py-1 text-xs" data-variant="critical"
+                          data-nip71-remove="p"
+                        >
+                          Remove participant
+                        </button>
+                      </article>
+                    </template>
+                  </section>
+
+                  <section
+                    class="space-y-4"
+                    aria-labelledby="nip71ReferencesLabel"
+                    data-nip71-repeater="r"
+                  >
+                    <div class="flex items-center justify-between">
+                      <h3
+                        id="nip71ReferencesLabel"
+                        class="text-sm font-medium text-text"
+                      >
+                        Reference links (<code>r</code>)
+                      </h3>
+                      <button
+                        type="button"
+                        class="btn-ghost px-3 py-1 text-xs"
+                        data-nip71-add="r"
+                      >
+                        Add reference
+                      </button>
+                    </div>
+                    <div
+                      id="nip71ReferenceList"
+                      class="space-y-2"
+                      data-nip71-list="r"
+                    ></div>
+                    <template id="nip71ReferenceTemplate" data-nip71-template="r">
+                      <div class="flex items-center gap-2" data-nip71-entry="r">
+                        <input
+                          type="url"
+                          data-nip71-field="url"
+                          placeholder="https://example.com/article"
+                          class="input flex-1"
+                        />
+                        <button
+                          type="button"
+                          class="btn-ghost px-2 py-1 text-3xs" data-variant="critical"
+                          data-nip71-remove="r"
+                          aria-label="Remove reference"
+                        >
+                          Remove
+                        </button>
+                      </div>
+                    </template>
+                  </section>
+                </fieldset>
+            </div>
+            <!-- End Custom Advanced -->
+
             <button
               type="submit"
               class="btn"
@@ -1079,6 +1020,7 @@
           </form>
         </div>
 
+        <!-- CLOUDFLARE SECTION -->
         <div id="cloudflareUploadSection" class="hidden">
           <div class="space-y-8">
             <p
@@ -1292,176 +1234,12 @@
                     class="input"
                   />
                 </div>
-                <div
-                  class="bg-overlay-black/30 space-y-4 rounded-lg border border-border/70 p-4"
-                  id="cloudflareNip71EventDetails"
-                  data-nip71-section="event-details"
-                >
-                  <fieldset
-                    id="cloudflareNip71KindFieldset"
-                    class="space-y-2"
-                    data-nip71-fieldset="kind"
-                  >
-                    <legend class="text-sm font-semibold text-text">
-                      NIP-71 event type
-                    </legend>
-                    <p class="text-xs text-muted">
-                      Choose the video format.
-                      <span class="font-medium text-muted-strong">Kind 21</span> is
-                      a full video, while
-                      <span class="font-medium text-muted-strong">Kind 22</span> is
-                      a short.
-                    </p>
-                    <div
-                      class="form-control"
-                      role="radiogroup"
-                      aria-labelledby="cloudflareNip71KindFieldset"
-                    >
-                      <div
-                        class="menu sm:flex-row sm:flex-wrap sm:py-0"
-                        role="presentation"
-                      >
-                        <label
-                          class="menu__item gap-3 px-0 py-0"
-                          for="cloudflareNip71KindLong"
-                        >
-                          <input
-                            type="radio"
-                            name="cloudflareNip71Kind"
-                            id="cloudflareNip71KindLong"
-                            value="21"
-                            checked
-                            data-nip71-input="kind"
-                            class="h-4 w-4 border-border bg-panel text-info focus:ring-info"
-                          />
-                          <span class="text-sm text-text"
-                            >Normal video (kind 21)</span
-                          >
-                        </label>
-                        <label
-                          class="menu__item gap-3 px-0 py-0"
-                          for="cloudflareNip71KindShort"
-                        >
-                          <input
-                            type="radio"
-                            name="cloudflareNip71Kind"
-                            id="cloudflareNip71KindShort"
-                            value="22"
-                            data-nip71-input="kind"
-                            class="h-4 w-4 border-border bg-panel text-info focus:ring-info"
-                          />
-                          <span class="text-sm text-text"
-                            >Short video (kind 22)</span
-                          >
-                        </label>
-                      </div>
-                    </div>
-                  </fieldset>
 
-                  <div
-                    class="grid gap-4 md:grid-cols-2"
-                    data-nip71-grid="metadata"
-                  >
-                    <div class="space-y-2">
-                      <label
-                        for="cloudflareNip71PublishedAt"
-                        class="block text-sm font-medium text-text"
-                      >
-                        Published at
-                      </label>
-                      <input
-                        type="datetime-local"
-                        id="cloudflareNip71PublishedAt"
-                        data-nip71-input="published_at"
-                        class="input"
-                      />
-                      <p class="text-xs text-muted">
-                        Set the canonical publish time for cross-client
-                        ordering.
-                      </p>
-                    </div>
-                    <div class="space-y-2">
-                      <label
-                        for="cloudflareNip71AltText"
-                        class="block text-sm font-medium text-text"
-                        >Alt text</label
-                      >
-                      <input
-                        type="text"
-                        id="cloudflareNip71AltText"
-                        data-nip71-input="alt"
-                        placeholder="Describe the visuals for screen readers"
-                        class="input"
-                      />
-                      <p class="text-xs text-muted">
-                        Plain-language fallback shown when the media cannot
-                        load.
-                      </p>
-                    </div>
-                    <div class="space-y-2">
-                      <label
-                        for="cloudflareNip71Duration"
-                        class="block text-sm font-medium text-text"
-                      >
-                        Duration (seconds)
-                      </label>
-                      <input
-                        type="number"
-                        id="cloudflareNip71Duration"
-                        min="0"
-                        step="1"
-                        data-nip71-input="duration"
-                        class="input"
-                      />
-                      <p class="text-xs text-muted">
-                        Provide the runtime in whole seconds for timeline
-                        scrubbing.
-                      </p>
-                    </div>
-                    <div class="space-y-2">
-                      <label
-                        for="cloudflareNip71ContentWarning"
-                        class="block text-sm font-medium text-text"
-                      >
-                        Content warning
-                      </label>
-                      <input
-                        type="text"
-                        id="cloudflareNip71ContentWarning"
-                        data-nip71-input="content-warning"
-                        placeholder="e.g., Flashing lights"
-                        class="input"
-                      />
-                      <p class="text-xs text-muted">
-                        Leave blank if the video is safe for all audiences.
-                      </p>
-                    </div>
-                  </div>
-
-                  <div class="space-y-2">
-                    <label
-                      for="cloudflareNip71Summary"
-                      class="block text-sm font-medium text-text"
-                      >Summary</label
-                    >
-                    <textarea
-                      id="cloudflareNip71Summary"
-                      rows="3"
-                      data-nip71-input="summary"
-                      class="textarea"
-                      placeholder="Short synopsis used as the Nostr content field"
-                    ></textarea>
-                    <p class="text-xs text-muted">
-                      This becomes the event content. Keep it concise for Nostr
-                      readers.
-                    </p>
-                  </div>
-                </div>
-                <div class="space-y-2">
+                 <div class="space-y-2">
                   <label
                     for="cloudflareDescription"
                     class="block text-sm font-medium text-text"
-                    >Description (optional)</label
+                    >Video description</label
                   >
                   <textarea
                     id="cloudflareDescription"
@@ -1469,373 +1247,10 @@
                     class="input"
                   ></textarea>
                 </div>
-                <div class="grid gap-3 md:grid-cols-2">
-                  <div class="space-y-2">
-                    <label
-                      for="cloudflareThumbnail"
-                      class="block text-sm font-medium text-text"
-                      >Thumbnail URL (optional)</label
-                    >
-                    <input id="cloudflareThumbnail" type="url" class="input" />
-                  </div>
-                  <div class="space-y-2">
-                    <label
-                      for="cloudflareMagnet"
-                      class="block text-sm font-medium text-text"
-                      >Magnet link (optional)</label
-                    >
-                    <input
-                      id="cloudflareMagnet"
-                      type="text"
-                      placeholder="magnet:?xt=urn:btih:..."
-                      class="input"
-                    />
-                  </div>
-                </div>
-                <div class="grid gap-3 md:grid-cols-2">
-                  <input
-                    id="cloudflareWs"
-                    type="url"
-                    placeholder="Web seed (ws=)"
-                    class="input"
-                  />
-                  <input
-                    id="cloudflareXs"
-                    type="url"
-                    placeholder=".torrent URL (xs=)"
-                    class="input"
-                  />
-                </div>
-                <fieldset
-                  id="cloudflareNip71TagsFieldset"
-                  class="bg-overlay-black/30 space-y-6 rounded-lg border border-border/70 p-4"
-                  data-nip71-section="tags"
-                >
-                  <legend class="text-sm font-semibold text-text">
-                    NIP-71 tags
-                  </legend>
-                  <p class="text-xs text-muted">
-                    Use the controls below to describe media variants, captions,
-                    chapters, participants, and references.
-                  </p>
 
-                  <section
-                    class="space-y-4"
-                    aria-labelledby="cloudflareNip71ImetaLabel"
-                    data-nip71-repeater="imeta"
-                  >
-                    <div class="flex items-center justify-between">
-                      <h3
-                        id="cloudflareNip71ImetaLabel"
-                        class="text-sm font-medium text-text"
-                      >
-                        Image metadata (imeta)
-                      </h3>
-                      <button
-                        type="button"
-                        class="btn-ghost px-3 py-1 text-xs"
-                        data-nip71-add="imeta"
-                        aria-describedby="cloudflareNip71ImetaHelp"
-                      >
-                        Add variant
-                      </button>
-                    </div>
-                    <p
-                      id="cloudflareNip71ImetaHelp"
-                      class="text-xs text-muted"
-                    >
-                      Provide dimensions, MIME type, and resource links for each
-                      variant. Nested repeaters let you attach multiple
-                      <code>image</code>, <code>fallback</code>, or
-                      <code>service</code> values.
-                    </p>
-                    <div
-                      id="cloudflareNip71ImetaList"
-                      class="space-y-4"
-                      data-nip71-list="imeta"
-                    >
-                      <article
-                        class="space-y-3 rounded-md border border-border/70 bg-surface/60 p-4"
-                        data-nip71-entry="imeta"
-                        data-nip71-primary="true"
-                      >
-                        <div class="grid gap-3 md:grid-cols-2">
-                          <div class="space-y-2">
-                            <label
-                              class="block text-xs font-medium text-muted-strong"
-                            >
-                              MIME type (<code>m</code>)
-                            </label>
-                            <input
-                              type="text"
-                              data-nip71-field="m"
-                              placeholder="Auto-filled after upload (e.g., video/mp4)"
-                              class="input"
-                            />
-                            <p class="text-3xs text-muted">
-                              RFC 2046 media type for this encoding.
-                            </p>
-                          </div>
-                          <div class="space-y-2">
-                            <label
-                              class="block text-xs font-medium text-muted-strong"
-                            >
-                              Pixel dimensions (<code>dim</code>)
-                            </label>
-                            <input
-                              type="text"
-                              data-nip71-field="dim"
-                              placeholder="Auto-filled if detected (e.g., 1920x1080)"
-                              class="input"
-                            />
-                            <p class="text-3xs text-muted">
-                              Formatted as widthxheight.
-                            </p>
-                          </div>
-                          <div class="space-y-2">
-                            <label
-                              class="block text-xs font-medium text-muted-strong"
-                            >
-                              Streaming URL (<code>url</code>)
-                            </label>
-                            <input
-                              type="url"
-                              data-nip71-field="url"
-                              placeholder="Auto-filled after upload with the public HTTPS URL"
-                              class="input"
-                            />
-                            <p class="text-3xs text-muted">
-                              HTTPS variant URL shared across clients.
-                            </p>
-                          </div>
-                          <div class="space-y-2">
-                            <label
-                              class="block text-xs font-medium text-muted-strong"
-                            >
-                              Magnet (<code>x</code>)
-                            </label>
-                            <input
-                              type="text"
-                              data-nip71-field="x"
-                              placeholder="Optional magnet pointer if seeding via P2P"
-                              class="input"
-                            />
-                            <p class="text-3xs text-muted">
-                              Optional magnet pointer if the variant is seeded
-                              via P2P.
-                            </p>
-                          </div>
-                        </div>
-
-                        <div class="space-y-3" data-nip71-nested="image">
-                          <div class="flex items-center justify-between">
-                            <h4
-                              class="text-xs font-semibold uppercase tracking-wide text-muted"
-                            >
-                              Image values
-                            </h4>
-                            <button
-                              type="button"
-                              class="btn-ghost px-2 py-1 text-3xs"
-                              data-nip71-nested-add="image"
-                            >
-                              Add image URL
-                            </button>
-                          </div>
-                          <div
-                            class="space-y-2"
-                            data-nip71-nested-list="image"
-                          ></div>
-                          <template data-nip71-nested-template="image">
-                            <div
-                              class="flex items-center gap-2"
-                              data-nip71-nested-entry="image"
-                            >
-                              <input
-                                type="url"
-                                placeholder="https://cdn.example.com/poster.jpg"
-                                data-nip71-nested-field="image"
-                                class="input flex-1"
-                              />
-                              <button
-                                type="button"
-                                class="btn-ghost px-2 py-1 text-3xs text-muted-strong"
-                                data-nip71-remove="nested"
-                                aria-label="Remove image URL"
-                              >
-                                Remove
-                              </button>
-                            </div>
-                          </template>
-                        </div>
-
-                        <div class="space-y-3" data-nip71-nested="fallback">
-                          <div class="flex items-center justify-between">
-                            <h4
-                              class="text-xs font-semibold uppercase tracking-wide text-muted"
-                            >
-                              Fallback URLs
-                            </h4>
-                            <button
-                              type="button"
-                              class="btn-ghost px-2 py-1 text-3xs"
-                              data-nip71-nested-add="fallback"
-                            >
-                              Add fallback
-                            </button>
-                          </div>
-                          <div
-                            class="space-y-2"
-                            data-nip71-nested-list="fallback"
-                          ></div>
-                          <template data-nip71-nested-template="fallback">
-                            <div
-                              class="flex items-center gap-2"
-                              data-nip71-nested-entry="fallback"
-                            >
-                              <input
-                                type="url"
-                                placeholder="https://cdn.backup.net/video.mp4"
-                                data-nip71-nested-field="fallback"
-                                class="input flex-1"
-                              />
-                              <button
-                                type="button"
-                                class="btn-ghost px-2 py-1 text-3xs text-muted-strong"
-                                data-nip71-remove="nested"
-                                aria-label="Remove fallback URL"
-                              >
-                                Remove
-                              </button>
-                            </div>
-                          </template>
-                        </div>
-
-                        <div class="space-y-3" data-nip71-nested="service">
-                          <div class="flex items-center justify-between">
-                            <h4
-                              class="text-xs font-semibold uppercase tracking-wide text-muted"
-                            >
-                              Services
-                            </h4>
-                            <button
-                              type="button"
-                              class="btn-ghost px-2 py-1 text-3xs"
-                              data-nip71-nested-add="service"
-                            >
-                              Add service hint
-                            </button>
-                          </div>
-                          <div
-                            class="space-y-2"
-                            data-nip71-nested-list="service"
-                          ></div>
-                          <template data-nip71-nested-template="service">
-                            <div
-                              class="flex items-center gap-2"
-                              data-nip71-nested-entry="service"
-                            >
-                              <input
-                                type="text"
-                                placeholder="streaming-provider-id"
-                                data-nip71-nested-field="service"
-                                class="input flex-1"
-                              />
-                              <button
-                                type="button"
-                                class="btn-ghost px-2 py-1 text-3xs text-muted-strong"
-                                data-nip71-remove="nested"
-                                aria-label="Remove service hint"
-                              >
-                                Remove
-                              </button>
-                            </div>
-                          </template>
-                        </div>
-
-                        <button
-                          type="button"
-                          class="btn-ghost px-3 py-1 text-xs" data-variant="critical"
-                          data-nip71-remove="imeta"
-                        >
-                          Remove variant
-                        </button>
-                      </article>
-                    </div>
-                  </section>
-
-                  <section
-                    class="space-y-4"
-                    aria-labelledby="cloudflareNip71TextTracksLabel"
-                    data-nip71-repeater="text-track"
-                  >
-                    <div class="flex items-center justify-between">
-                      <h3
-                        id="cloudflareNip71TextTracksLabel"
-                        class="text-sm font-medium text-text"
-                      >
-                        Caption &amp; subtitle tracks (text-track)
-                      </h3>
-                      <button
-                        type="button"
-                        class="btn-ghost px-3 py-1 text-xs"
-                        data-nip71-add="text-track"
-                        aria-describedby="cloudflareNip71TextTracksHelp"
-                      >
-                        Add track
-                      </button>
-                    </div>
-                    <p
-                      id="cloudflareNip71TextTracksHelp"
-                      class="text-xs text-muted"
-                    >
-                      Point to VTT/SRT caption files and optionally declare the
-                      language code (BCP-47).
-                    </p>
-                    <div
-                      id="cloudflareNip71TextTrackList"
-                      class="space-y-4"
-                      data-nip71-list="text-track"
-                    ></div>
-                  </section>
-
-                  <section
-                    class="space-y-4"
-                    aria-labelledby="cloudflareNip71SegmentsLabel"
-                    data-nip71-repeater="segment"
-                  >
-                    <div class="flex items-center justify-between">
-                      <h3
-                        id="cloudflareNip71SegmentsLabel"
-                        class="text-sm font-medium text-text"
-                      >
-                        Timeline segments (segment)
-                      </h3>
-                      <button
-                        type="button"
-                        class="btn-ghost px-3 py-1 text-xs"
-                        data-nip71-add="segment"
-                        aria-describedby="cloudflareNip71SegmentsHelp"
-                      >
-                        Add chapter
-                      </button>
-                    </div>
-                    <p
-                      id="cloudflareNip71SegmentsHelp"
-                      class="text-xs text-muted"
-                    >
-                      Define chapters by timestamp so clients can build jump
-                      lists.
-                    </p>
-                    <div
-                      id="cloudflareNip71SegmentList"
-                      class="space-y-4"
-                      data-nip71-list="segment"
-                    ></div>
-                  </section>
-
-                  <section
-                    class="space-y-4"
+                <!-- Hashtags Visible -->
+                <section
+                    class="space-y-4 rounded-lg border border-border/70 bg-surface/30 p-4"
                     aria-labelledby="cloudflareNip71HashtagsLabel"
                     data-nip71-repeater="t"
                   >
@@ -1844,7 +1259,7 @@
                         id="cloudflareNip71HashtagsLabel"
                         class="text-sm font-medium text-text"
                       >
-                        Hashtags (t)
+                        Hashtags
                       </h3>
                       <button
                         type="button"
@@ -1855,90 +1270,13 @@
                         Add hashtag
                       </button>
                     </div>
-                    <p
-                      id="cloudflareNip71HashtagsHelp"
-                      class="text-xs text-muted"
-                    >
-                      Label the video with keywords to boost discovery across
-                      clients.
-                    </p>
                     <div
                       id="cloudflareNip71HashtagList"
                       class="space-y-2"
                       data-nip71-list="t"
                     ></div>
-                  </section>
+                </section>
 
-                  <section
-                    class="space-y-4"
-                    aria-labelledby="cloudflareNip71ParticipantsLabel"
-                    data-nip71-repeater="p"
-                  >
-                    <div class="flex items-center justify-between">
-                      <h3
-                        id="cloudflareNip71ParticipantsLabel"
-                        class="text-sm font-medium text-text"
-                      >
-                        Participants (p)
-                      </h3>
-                      <button
-                        type="button"
-                        class="btn-ghost px-3 py-1 text-xs"
-                        data-nip71-add="p"
-                        aria-describedby="cloudflareNip71ParticipantsHelp"
-                      >
-                        Add participant
-                      </button>
-                    </div>
-                    <p
-                      id="cloudflareNip71ParticipantsHelp"
-                      class="text-xs text-muted"
-                    >
-                      Credit guests, hosts, or collaborators with their npubs
-                      and preferred relay hints.
-                    </p>
-                    <div
-                      id="cloudflareNip71ParticipantList"
-                      class="space-y-3"
-                      data-nip71-list="p"
-                    ></div>
-                  </section>
-
-                  <section
-                    class="space-y-4"
-                    aria-labelledby="cloudflareNip71ReferencesLabel"
-                    data-nip71-repeater="r"
-                  >
-                    <div class="flex items-center justify-between">
-                      <h3
-                        id="cloudflareNip71ReferencesLabel"
-                        class="text-sm font-medium text-text"
-                      >
-                        References (r)
-                      </h3>
-                      <button
-                        type="button"
-                        class="btn-ghost px-3 py-1 text-xs"
-                        data-nip71-add="r"
-                        aria-describedby="cloudflareNip71ReferencesHelp"
-                      >
-                        Add reference
-                      </button>
-                    </div>
-                    <p
-                      id="cloudflareNip71ReferencesHelp"
-                      class="text-xs text-muted"
-                    >
-                      Link to companion articles, source material, or
-                      announcements that contextualize the upload.
-                    </p>
-                    <div
-                      id="cloudflareNip71ReferenceList"
-                      class="space-y-2"
-                      data-nip71-list="r"
-                    ></div>
-                  </section>
-                </fieldset>
                 <div
                   class="form-control"
                   role="group"
@@ -1963,12 +1301,12 @@
                         Enable comments
                       </span>
                       <span class="text-xs text-muted">
-                        Publish with comments switched on. Toggle off to quietly
-                        disable replies on this video.
+                        Publish with comments switched on.
                       </span>
                     </span>
                   </label>
                 </div>
+
                 <div class="grid gap-3 md:grid-cols-2">
                   <div
                     class="form-control"
@@ -1993,8 +1331,7 @@
                           Is this content NSFW?
                         </span>
                         <span class="text-xs text-muted">
-                          Turn this on to signal mature or explicit material to
-                          downstream clients.
+                          Turn this on to signal mature or explicit material.
                         </span>
                       </span>
                     </label>
@@ -2022,13 +1359,13 @@
                           Is this content created for Kids?
                         </span>
                         <span class="text-xs text-muted">
-                          Highlight family-safe uploads so moderation tooling
-                          and filters stay accurate.
+                          Highlight family-safe uploads.
                         </span>
                       </span>
                     </label>
                   </div>
                 </div>
+
                 <div class="space-y-2">
                   <label
                     for="cloudflareFile"
@@ -2043,7 +1380,6 @@
                     required
                   />
                   <p class="text-xs text-muted">
-                    We use multipart uploads with automatic bucket creation.
                     Large files are supported.
                   </p>
                 </div>
@@ -2058,6 +1394,31 @@
                     >
                   </p>
                 </div>
+
+                 <div class="grid gap-3 md:grid-cols-2">
+                  <div class="space-y-2">
+                    <label
+                      for="cloudflareThumbnail"
+                      class="block text-sm font-medium text-text"
+                      >Thumbnail URL (optional)</label
+                    >
+                    <input id="cloudflareThumbnail" type="url" class="input" />
+                  </div>
+                  <div class="space-y-2">
+                    <label
+                      for="cloudflareMagnet"
+                      class="block text-sm font-medium text-text"
+                      >Magnet link (optional)</label
+                    >
+                    <input
+                      id="cloudflareMagnet"
+                      type="text"
+                      placeholder="magnet:?xt=urn:btih:..."
+                      class="input"
+                    />
+                  </div>
+                </div>
+
                 <div class="space-y-2">
                   <progress
                     id="cloudflareProgress"
@@ -2080,6 +1441,343 @@
                     role="status"
                   ></p>
                 </div>
+
+                <!-- Cloudflare Advanced Toggle -->
+                <div class="border-t border-border/70 pt-4">
+                  <button
+                    type="button"
+                    id="cloudflareUploadAdvancedToggle"
+                    class="btn-ghost justify-start gap-2 text-sm text-muted-strong"
+                    aria-expanded="false"
+                    aria-controls="cloudflareUploadAdvancedFields"
+                  >
+                    <svg
+                      id="cloudflareUploadAdvancedToggleIcon"
+                      xmlns="http://www.w3.org/2000/svg"
+                      class="h-4 w-4 transform text-muted-strong transition-transform duration-150"
+                      fill="none"
+                      viewBox="0 0 24 24"
+                      stroke="currentColor"
+                      stroke-width="2"
+                    >
+                      <path
+                        stroke-linecap="round"
+                        stroke-linejoin="round"
+                        d="M9 5l7 7-7 7"
+                      />
+                    </svg>
+                    <span id="cloudflareUploadAdvancedToggleLabel"
+                      >Show advanced options</span
+                    >
+                  </button>
+                </div>
+
+                <div
+                    id="cloudflareUploadAdvancedFields"
+                    class="hidden space-y-6 rounded-lg border border-border/70 bg-surface/30 p-4"
+                >
+                    <div class="grid gap-3 md:grid-cols-2">
+                      <input
+                        id="cloudflareWs"
+                        type="url"
+                        placeholder="Web seed (ws=)"
+                        class="input"
+                      />
+                      <input
+                        id="cloudflareXs"
+                        type="url"
+                        placeholder=".torrent URL (xs=)"
+                        class="input"
+                      />
+                    </div>
+
+                    <div
+                      class="space-y-4"
+                      id="cloudflareNip71EventDetails"
+                      data-nip71-section="event-details"
+                    >
+                      <fieldset
+                        id="cloudflareNip71KindFieldset"
+                        class="space-y-2"
+                        data-nip71-fieldset="kind"
+                      >
+                        <legend class="text-sm font-semibold text-text">
+                          NIP-71 event type
+                        </legend>
+                        <div
+                          class="form-control"
+                          role="radiogroup"
+                          aria-labelledby="cloudflareNip71KindFieldset"
+                        >
+                          <div
+                            class="menu sm:flex-row sm:flex-wrap sm:py-0"
+                            role="presentation"
+                          >
+                            <label
+                              class="menu__item gap-3 px-0 py-0"
+                              for="cloudflareNip71KindLong"
+                            >
+                              <input
+                                type="radio"
+                                name="cloudflareNip71Kind"
+                                id="cloudflareNip71KindLong"
+                                value="21"
+                                checked
+                                data-nip71-input="kind"
+                                class="h-4 w-4 border-border bg-panel text-info focus:ring-info"
+                              />
+                              <span class="text-sm text-text"
+                                >Normal video (kind 21)</span
+                              >
+                            </label>
+                            <label
+                              class="menu__item gap-3 px-0 py-0"
+                              for="cloudflareNip71KindShort"
+                            >
+                              <input
+                                type="radio"
+                                name="cloudflareNip71Kind"
+                                id="cloudflareNip71KindShort"
+                                value="22"
+                                data-nip71-input="kind"
+                                class="h-4 w-4 border-border bg-panel text-info focus:ring-info"
+                              />
+                              <span class="text-sm text-text"
+                                >Short video (kind 22)</span
+                              >
+                            </label>
+                          </div>
+                        </div>
+                      </fieldset>
+
+                      <div
+                        class="grid gap-4 md:grid-cols-2"
+                        data-nip71-grid="metadata"
+                      >
+                        <div class="space-y-2">
+                          <label
+                            for="cloudflareNip71PublishedAt"
+                            class="block text-sm font-medium text-text"
+                          >
+                            Published at
+                          </label>
+                          <input
+                            type="datetime-local"
+                            id="cloudflareNip71PublishedAt"
+                            data-nip71-input="published_at"
+                            class="input"
+                          />
+                        </div>
+                        <div class="space-y-2">
+                          <label
+                            for="cloudflareNip71AltText"
+                            class="block text-sm font-medium text-text"
+                            >Alt text</label
+                          >
+                          <input
+                            type="text"
+                            id="cloudflareNip71AltText"
+                            data-nip71-input="alt"
+                            placeholder="Describe the visuals for screen readers"
+                            class="input"
+                          />
+                        </div>
+                        <div class="space-y-2">
+                          <label
+                            for="cloudflareNip71Duration"
+                            class="block text-sm font-medium text-text"
+                          >
+                            Duration (seconds)
+                          </label>
+                          <input
+                            type="number"
+                            id="cloudflareNip71Duration"
+                            min="0"
+                            step="1"
+                            data-nip71-input="duration"
+                            class="input"
+                          />
+                        </div>
+                        <div class="space-y-2">
+                          <label
+                            for="cloudflareNip71ContentWarning"
+                            class="block text-sm font-medium text-text"
+                          >
+                            Content warning
+                          </label>
+                          <input
+                            type="text"
+                            id="cloudflareNip71ContentWarning"
+                            data-nip71-input="content-warning"
+                            placeholder="e.g., Flashing lights"
+                            class="input"
+                          />
+                        </div>
+                      </div>
+
+                      <div class="space-y-2">
+                        <div class="flex items-center justify-between">
+                            <label
+                            for="cloudflareNip71Summary"
+                            class="block text-sm font-medium text-text"
+                            >Summary</label
+                            >
+                            <label class="flex items-center gap-2 text-xs text-muted cursor-pointer select-none">
+                              <input type="checkbox" id="cloudflareNip71SummaryUnlock" class="checkbox h-3 w-3 rounded-sm border-muted" />
+                              Customize
+                            </label>
+                        </div>
+                        <textarea
+                          id="cloudflareNip71Summary"
+                          rows="3"
+                          data-nip71-input="summary"
+                          class="textarea text-muted-strong"
+                          placeholder="Short synopsis used as the Nostr content field"
+                          readonly
+                        ></textarea>
+                         <p class="text-xs text-muted">
+                          This becomes the event content. By default it mirrors the description.
+                        </p>
+                      </div>
+                    </div>
+
+                    <fieldset
+                      id="cloudflareNip71TagsFieldset"
+                      class="space-y-6 pt-4"
+                      data-nip71-section="tags"
+                    >
+                      <legend class="relative text-sm font-semibold text-text pb-2 border-b border-border/50 w-full mb-4">
+                        Advanced Tags (IMETA, Tracks, Segments)
+                      </legend>
+
+                      <section
+                        class="space-y-4"
+                        aria-labelledby="cloudflareNip71ImetaLabel"
+                        data-nip71-repeater="imeta"
+                      >
+                        <div class="flex items-center justify-between">
+                          <h3
+                            id="cloudflareNip71ImetaLabel"
+                            class="text-sm font-medium text-text"
+                          >
+                            Image metadata (imeta)
+                          </h3>
+                          <button
+                            type="button"
+                            class="btn-ghost px-3 py-1 text-xs"
+                            data-nip71-add="imeta"
+                            aria-describedby="cloudflareNip71ImetaHelp"
+                          >
+                            Add variant
+                          </button>
+                        </div>
+                        <div
+                          id="cloudflareNip71ImetaList"
+                          class="space-y-4"
+                          data-nip71-list="imeta"
+                        >
+                          <!-- Primary variant automatically added by JS, keeping template structure here -->
+                          <article
+                            class="space-y-3 rounded-md border border-border/70 bg-surface/60 p-4"
+                            data-nip71-entry="imeta"
+                            data-nip71-primary="true"
+                          >
+                           <!-- Content mirrored from original but simplified for brevity in this plan as it's standard -->
+                            <div class="grid gap-3 md:grid-cols-2">
+                              <div class="space-y-2">
+                                <label class="block text-xs font-medium text-muted-strong">MIME type (<code>m</code>)</label>
+                                <input type="text" data-nip71-field="m" placeholder="Auto-filled" class="input" />
+                              </div>
+                              <div class="space-y-2">
+                                <label class="block text-xs font-medium text-muted-strong">Pixel dimensions (<code>dim</code>)</label>
+                                <input type="text" data-nip71-field="dim" placeholder="Auto-filled" class="input" />
+                              </div>
+                              <div class="space-y-2">
+                                <label class="block text-xs font-medium text-muted-strong">Streaming URL (<code>url</code>)</label>
+                                <input type="url" data-nip71-field="url" placeholder="Auto-filled" class="input" />
+                              </div>
+                              <div class="space-y-2">
+                                <label class="block text-xs font-medium text-muted-strong">Magnet (<code>x</code>)</label>
+                                <input type="text" data-nip71-field="x" placeholder="Optional" class="input" />
+                              </div>
+                            </div>
+                            <div class="space-y-3" data-nip71-nested="image">
+                                <div class="flex items-center justify-between">
+                                    <h4 class="text-xs font-semibold uppercase tracking-wide text-muted">Image values</h4>
+                                    <button type="button" class="btn-ghost px-2 py-1 text-3xs" data-nip71-nested-add="image">Add image</button>
+                                </div>
+                                <div class="space-y-2" data-nip71-nested-list="image"></div>
+                            </div>
+                            <div class="space-y-3" data-nip71-nested="fallback">
+                                <div class="flex items-center justify-between">
+                                    <h4 class="text-xs font-semibold uppercase tracking-wide text-muted">Fallback URLs</h4>
+                                    <button type="button" class="btn-ghost px-2 py-1 text-3xs" data-nip71-nested-add="fallback">Add fallback</button>
+                                </div>
+                                <div class="space-y-2" data-nip71-nested-list="fallback"></div>
+                            </div>
+                             <div class="space-y-3" data-nip71-nested="service">
+                                <div class="flex items-center justify-between">
+                                    <h4 class="text-xs font-semibold uppercase tracking-wide text-muted">Services</h4>
+                                    <button type="button" class="btn-ghost px-2 py-1 text-3xs" data-nip71-nested-add="service">Add service</button>
+                                </div>
+                                <div class="space-y-2" data-nip71-nested-list="service"></div>
+                            </div>
+
+                             <button type="button" class="btn-ghost px-3 py-1 text-xs" data-variant="critical" data-nip71-remove="imeta">Remove variant</button>
+                          </article>
+                        </div>
+                      </section>
+
+                      <section
+                        class="space-y-4"
+                        aria-labelledby="cloudflareNip71TextTracksLabel"
+                        data-nip71-repeater="text-track"
+                      >
+                         <div class="flex items-center justify-between">
+                          <h3 id="cloudflareNip71TextTracksLabel" class="text-sm font-medium text-text">Caption &amp; subtitle tracks</h3>
+                          <button type="button" class="btn-ghost px-3 py-1 text-xs" data-nip71-add="text-track">Add track</button>
+                        </div>
+                        <div id="cloudflareNip71TextTrackList" class="space-y-4" data-nip71-list="text-track"></div>
+                      </section>
+
+                      <section
+                        class="space-y-4"
+                        aria-labelledby="cloudflareNip71SegmentsLabel"
+                        data-nip71-repeater="segment"
+                      >
+                        <div class="flex items-center justify-between">
+                          <h3 id="cloudflareNip71SegmentsLabel" class="text-sm font-medium text-text">Timeline segments</h3>
+                          <button type="button" class="btn-ghost px-3 py-1 text-xs" data-nip71-add="segment">Add chapter</button>
+                        </div>
+                        <div id="cloudflareNip71SegmentList" class="space-y-4" data-nip71-list="segment"></div>
+                      </section>
+
+                      <section
+                        class="space-y-4"
+                        aria-labelledby="cloudflareNip71ParticipantsLabel"
+                        data-nip71-repeater="p"
+                      >
+                         <div class="flex items-center justify-between">
+                          <h3 id="cloudflareNip71ParticipantsLabel" class="text-sm font-medium text-text">Participants</h3>
+                          <button type="button" class="btn-ghost px-3 py-1 text-xs" data-nip71-add="p">Add participant</button>
+                        </div>
+                        <div id="cloudflareNip71ParticipantList" class="space-y-3" data-nip71-list="p"></div>
+                      </section>
+
+                      <section
+                        class="space-y-4"
+                        aria-labelledby="cloudflareNip71ReferencesLabel"
+                        data-nip71-repeater="r"
+                      >
+                         <div class="flex items-center justify-between">
+                          <h3 id="cloudflareNip71ReferencesLabel" class="text-sm font-medium text-text">References</h3>
+                          <button type="button" class="btn-ghost px-3 py-1 text-xs" data-nip71-add="r">Add reference</button>
+                        </div>
+                        <div id="cloudflareNip71ReferenceList" class="space-y-2" data-nip71-list="r"></div>
+                      </section>
+
+                    </fieldset>
+                </div>
                 <button
                   type="submit"
                   id="cloudflareUploadButton"
diff --git a/js/ui/components/UploadModal.js b/js/ui/components/UploadModal.js
index 7ecd1990..25f9fc19 100644
--- a/js/ui/components/UploadModal.js
+++ b/js/ui/components/UploadModal.js
@@ -66,6 +66,9 @@ export class UploadModal {
     this.customSubmitCooldownTimer = null;
     this.customSubmitCooldownMs = 60000;
 
+    this.customAdvancedToggle = null;
+    this.customAdvancedFields = null;
+
     this.cloudflareSettingsForm = null;
     this.cloudflareClearSettingsButton = null;
     this.cloudflareSettingsStatus = null;
@@ -89,6 +92,8 @@ export class UploadModal {
     this.cloudflareAdvancedToggleLabel = null;
     this.cloudflareAdvancedToggleIcon = null;
     this.cloudflareAdvancedFields = null;
+    this.cloudflareUploadAdvancedToggle = null;
+    this.cloudflareUploadAdvancedFields = null;
     this.r2AccountIdInput = null;
     this.r2AccessKeyIdInput = null;
     this.r2SecretAccessKeyInput = null;
@@ -103,6 +108,12 @@ export class UploadModal {
     this.modalPanel = null;
     this.loadPromise = null;
     this.eventsBound = false;
+
+    // Automation State
+    this.customSummaryLocked = true;
+    this.cloudflareSummaryLocked = true;
+    this.customWsDirty = false;
+    this.cloudflareWsDirty = false;
   }
 
   addEventListener(type, listener, options) {
@@ -241,9 +252,16 @@ export class UploadModal {
       enableComments: context.querySelector("#uploadEnableComments") || null,
       isNsfw: context.querySelector("#uploadIsNsfw") || null,
       isForKids: context.querySelector("#uploadIsForKids") || null,
-      isPrivate: context.querySelector("#uploadIsPrivate") || null
+      isPrivate: context.querySelector("#uploadIsPrivate") || null,
+      // NIP-71 specific inputs located by form manager usually, but we need direct access for automation
+      summary: this.customSection?.querySelector("#nip71Summary") || null,
+      summaryUnlock: this.customSection?.querySelector("#nip71SummaryUnlock") || null,
+      contentWarning: this.customSection?.querySelector("#nip71ContentWarning") || null,
     };
 
+    this.customAdvancedToggle = this.customSection?.querySelector("#customAdvancedToggle") || null;
+    this.customAdvancedFields = this.customSection?.querySelector("#customAdvancedFields") || null;
+
     this.customSubmitButton =
       this.customForm?.querySelector?.('button[type="submit"]') || null;
     if (this.customSubmitButton && !this.customSubmitButtonDefaultLabel) {
@@ -290,6 +308,13 @@ export class UploadModal {
       context.querySelector("#cloudflareIsNsfw") || null;
     this.cloudflareIsForKidsInput =
       context.querySelector("#cloudflareIsForKids") || null;
+    this.cloudflareSummaryInput =
+        this.cloudflareSection?.querySelector("#cloudflareNip71Summary") || null;
+    this.cloudflareSummaryUnlock =
+        this.cloudflareSection?.querySelector("#cloudflareNip71SummaryUnlock") || null;
+    this.cloudflareContentWarningInput =
+        this.cloudflareSection?.querySelector("#cloudflareNip71ContentWarning") || null;
+
     this.cloudflareAdvancedToggle =
       context.querySelector("#cloudflareAdvancedToggle") || null;
     this.cloudflareAdvancedToggleLabel =
@@ -298,6 +323,12 @@ export class UploadModal {
       context.querySelector("#cloudflareAdvancedToggleIcon") || null;
     this.cloudflareAdvancedFields =
       context.querySelector("#cloudflareAdvancedFields") || null;
+
+    this.cloudflareUploadAdvancedToggle =
+      context.querySelector("#cloudflareUploadAdvancedToggle") || null;
+    this.cloudflareUploadAdvancedFields =
+      context.querySelector("#cloudflareUploadAdvancedFields") || null;
+
     this.r2AccountIdInput = context.querySelector("#r2AccountId") || null;
     this.r2AccessKeyIdInput = context.querySelector("#r2AccessKeyId") || null;
     this.r2SecretAccessKeyInput =
@@ -363,6 +394,104 @@ export class UploadModal {
     });
   }
 
+  // New Automation Helpers
+  setupDescriptionToSummaryMirror(descriptionInput, summaryInput, unlockCheckbox, isCustom) {
+      if (!descriptionInput || !summaryInput) return;
+
+      const handleDescriptionInput = () => {
+          const locked = isCustom ? this.customSummaryLocked : this.cloudflareSummaryLocked;
+          if (locked) {
+              summaryInput.value = descriptionInput.value;
+          }
+      };
+
+      descriptionInput.addEventListener('input', handleDescriptionInput);
+      this.cleanupHandlers.push(() => descriptionInput.removeEventListener('input', handleDescriptionInput));
+
+      if (unlockCheckbox) {
+          unlockCheckbox.addEventListener('change', () => {
+             const unlocked = unlockCheckbox.checked;
+             if (isCustom) {
+                 this.customSummaryLocked = !unlocked;
+             } else {
+                 this.cloudflareSummaryLocked = !unlocked;
+             }
+
+             summaryInput.readOnly = !unlocked;
+             if (unlocked) {
+                 summaryInput.classList.remove('text-muted-strong');
+                 summaryInput.classList.remove('bg-surface-alt'); // if applicable
+             } else {
+                 summaryInput.classList.add('text-muted-strong');
+                 // re-sync if locking back
+                 summaryInput.value = descriptionInput.value;
+             }
+          });
+      }
+  }
+
+  setupUrlToWsMirror(urlInput, wsInput, isCustom) {
+      if (!urlInput || !wsInput) return;
+
+      const handleUrlInput = () => {
+          const dirty = isCustom ? this.customWsDirty : this.cloudflareWsDirty;
+          if (!dirty) {
+              wsInput.value = urlInput.value;
+          }
+      };
+
+      const handleWsInput = () => {
+          if (isCustom) this.customWsDirty = true;
+          else this.cloudflareWsDirty = true;
+      };
+
+      urlInput.addEventListener('input', handleUrlInput);
+      wsInput.addEventListener('input', handleWsInput);
+
+      this.cleanupHandlers.push(() => {
+          urlInput.removeEventListener('input', handleUrlInput);
+          wsInput.removeEventListener('input', handleWsInput);
+      });
+  }
+
+  setupNsfwToContentWarning(nsfwInput, contentWarningInput) {
+      if (!nsfwInput || !contentWarningInput) return;
+
+      const handleNsfwChange = () => {
+          if (nsfwInput.checked) {
+              if (!contentWarningInput.value.trim()) {
+                  contentWarningInput.value = "NSFW";
+              }
+          } else {
+              if (contentWarningInput.value.trim().toUpperCase() === "NSFW") {
+                  contentWarningInput.value = "";
+              }
+          }
+      };
+
+      nsfwInput.addEventListener('change', handleNsfwChange);
+      this.cleanupHandlers.push(() => nsfwInput.removeEventListener('change', handleNsfwChange));
+  }
+
+  setupAdvancedToggle(toggleButton, container, icon) {
+      if (!toggleButton || !container) return;
+
+      toggleButton.addEventListener('click', () => {
+         const isHidden = container.classList.contains('hidden');
+         if (isHidden) {
+             container.classList.remove('hidden');
+             toggleButton.setAttribute('aria-expanded', 'true');
+             if (toggleButton.querySelector('span')) toggleButton.querySelector('span').textContent = "Hide advanced options";
+             if (icon) icon.classList.add('rotate-90');
+         } else {
+             container.classList.add('hidden');
+             toggleButton.setAttribute('aria-expanded', 'false');
+             if (toggleButton.querySelector('span')) toggleButton.querySelector('span').textContent = "Show advanced options";
+             if (icon) icon.classList.remove('rotate-90');
+         }
+      });
+  }
+
   buildAutoGeneratedImetaVariant(file) {
     if (!file) {
       return null;
@@ -461,6 +590,59 @@ export class UploadModal {
       );
     }
 
+    // Bind Automation Logic - Custom
+    this.setupDescriptionToSummaryMirror(
+        this.customFormInputs.description,
+        this.customFormInputs.summary,
+        this.customFormInputs.summaryUnlock,
+        true
+    );
+    this.setupUrlToWsMirror(
+        this.customFormInputs.url,
+        this.customFormInputs.ws,
+        true
+    );
+    this.setupNsfwToContentWarning(
+        this.customFormInputs.isNsfw,
+        this.customFormInputs.contentWarning
+    );
+    this.setupAdvancedToggle(
+        this.customAdvancedToggle,
+        this.customAdvancedFields,
+        this.customSection?.querySelector("#customAdvancedToggleIcon")
+    );
+
+    // Bind Automation Logic - Cloudflare
+    this.setupDescriptionToSummaryMirror(
+        this.cloudflareDescriptionInput,
+        this.cloudflareSummaryInput,
+        this.cloudflareSummaryUnlock,
+        false
+    );
+    // Cloudflare WS is mainly for manual entry or populated via upload logic,
+    // but if user types a URL (unlikely in CF mode as it uploads), we could mirror.
+    // However, in CF mode the URL is usually auto-filled after upload.
+    // If user manually types it, we can mirror.
+    // Actually, Cloudflare form doesn't have a "Hosted URL" input that the user types before upload?
+    // Wait, let's check HTML.
+    // The "Cloudflare" form has a file input. It does NOT have a "Hosted video URL" input for the user to type.
+    // The "Hosted URL" in IMETA is auto-filled.
+    // So setupUrlToWsMirror is irrelevant for Cloudflare mode's main flow,
+    // BUT there is a `cloudflareWs` input in advanced settings.
+    // If the user *manually* fills the WS, they can. But there's no source URL input to mirror *from*.
+    // So we skip setupUrlToWsMirror for Cloudflare mode.
+
+    this.setupNsfwToContentWarning(
+        this.cloudflareIsNsfwInput,
+        this.cloudflareContentWarningInput
+    );
+    this.setupAdvancedToggle(
+        this.cloudflareUploadAdvancedToggle,
+        this.cloudflareUploadAdvancedFields,
+        this.cloudflareSection?.querySelector("#cloudflareUploadAdvancedToggleIcon")
+    );
+
+
     this.nip71FormManager.bindSection("custom");
     this.nip71FormManager.bindSection("cloudflare");
   }
@@ -974,6 +1156,20 @@ export class UploadModal {
     if (this.cloudflareIsForKidsInput)
       this.resetCheckbox(this.cloudflareIsForKidsInput, false);
     if (this.cloudflareFileInput) this.cloudflareFileInput.value = "";
+
+    // Reset Automation State
+    this.cloudflareSummaryLocked = true;
+    this.cloudflareWsDirty = false;
+
+    // Reset inputs we automated or tracked
+    if (this.cloudflareSummaryInput) {
+        this.cloudflareSummaryInput.value = "";
+        this.cloudflareSummaryInput.readOnly = true;
+        this.cloudflareSummaryInput.classList.add('text-muted-strong');
+    }
+    if (this.cloudflareSummaryUnlock) this.cloudflareSummaryUnlock.checked = false;
+    if (this.cloudflareContentWarningInput) this.cloudflareContentWarningInput.value = "";
+
     this.nip71FormManager.resetSection("cloudflare");
     this.updateCloudflareProgress(Number.NaN);
   }
@@ -996,6 +1192,20 @@ export class UploadModal {
       this.resetCheckbox(this.customFormInputs.isForKids, false);
     if (this.customFormInputs.isPrivate)
       this.resetCheckbox(this.customFormInputs.isPrivate, false);
+
+    // Reset Automation State
+    this.customSummaryLocked = true;
+    this.customWsDirty = false;
+
+    // Reset automated inputs
+    if (this.customFormInputs.summary) {
+        this.customFormInputs.summary.value = "";
+        this.customFormInputs.summary.readOnly = true;
+        this.customFormInputs.summary.classList.add('text-muted-strong');
+    }
+    if (this.customFormInputs.summaryUnlock) this.customFormInputs.summaryUnlock.checked = false;
+    if (this.customFormInputs.contentWarning) this.customFormInputs.contentWarning.value = "";
+
     this.nip71FormManager.resetSection("custom");
   }